--- ECHO_content/__init__.py	2006/10/18 15:16:23	1.30
+++ ECHO_content/__init__.py	2011/10/13 07:48:27	1.33.2.1
@@ -1,8 +1,11 @@
 import ECHO_collection
+import ECHO_resource
+
 import ECHO_Nav
 import ECHO_xslt
 import VLPExtension
 import ECHO_movie
+#import ECHO_mediathek
 try:
 	import ECHO_language
 except:
@@ -129,10 +132,10 @@ def initialize(context):
         )
     
     context.registerClass(
-        ECHO_collection.ECHO_resource,
+        ECHO_resource.ECHO_resource,
         constructors = (
-          ECHO_collection.manage_addECHO_resourceForm,
-          ECHO_collection.manage_addECHO_resource
+          ECHO_resource.manage_addECHO_resourceForm,
+          ECHO_resource.manage_addECHO_resource
           ),
          icon = 'ECHO_ressource.gif'
         )
@@ -213,47 +216,6 @@ def initialize(context):
           )
         )
 
-    context.registerClass(
-        VLPExtension.VLP_resource,
-        constructors = (
-          VLPExtension.manage_addVLP_resourceForm,
-          VLPExtension.manage_addVLP_resource
-          ),
-         icon = 'ECHO_ressource.gif'
-        )
-    
-    context.registerClass(
-        VLPExtension.VLP_collection,
-        constructors = (
-          VLPExtension.manage_addVLP_collectionForm,
-          VLPExtension.manage_addVLP_collection
-          ),
-         icon = 'ECHO_collection.gif'
-        )
-    
-    context.registerClass(
-        VLPExtension.VLP_essay,
-        constructors = (
-          VLPExtension.manage_addVLP_essayForm,
-          VLPExtension.manage_addVLP_essay
-          )
-        )
-    
-    context.registerClass(
-        VLPExtension.VLP_encyclopaedia,
-        constructors = (
-          VLPExtension.manage_addVLP_encycForm,
-          VLPExtension.manage_addVLP_encyc
-          )
-        )
-    
-    context.registerClass(
-        VLPExtension.sendMailForm,
-        constructors = (
-          VLPExtension.manage_addSendMailFormForm,
-          VLPExtension.manage_addSendMailForm
-          )
-        )
 
     context.registerClass(
         ECHO_movie.ECHO_movie,
@@ -280,6 +242,8 @@ def initialize(context):
 	    )
         )
 
+
+
     try:
      context.registerClass(
         ECHO_language.ECHO_linkCreator,