--- a/MPIWGTemplate.py	Mon Jun 03 15:22:26 2013 +0200
+++ b/MPIWGTemplate.py	Mon Jun 03 19:54:57 2013 +0200
@@ -1,15 +1,9 @@
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Globals import package_home
-import string
-import re
 import os
 import logging
-from OFS.Folder import Folder
-from AccessControl import ClassSecurityInfo
-from MPIWGHelper import *
-from ZODB import FileStorage, DB
-import transaction
+import MPIWGHelper
 
 # dummy definitions for backwards compatibility
 import MPIWGFeature
@@ -33,10 +27,8 @@
         {'label':'Change Weight','action':'changeWeightForm'},
         )
 
-    def changeWeightForm(self):
-        """change weight form"""
-        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGTemplateChangeWeight.zpt')).__of__(self)
-        return pt()
+    changeWeightForm = PageTemplateFile('zpt/template/manage_change_weight', globals())
+
 
     def changeWeight(self,weight,RESPONSE=None):
         """change weight"""
@@ -47,11 +39,11 @@
         
     def __init__(self, id, text=None, content_type="text/html",MPIWGType=None):
         self.id = str(id)
-        self.ZBindings_edit(self._default_bindings)
+        #self.ZBindings_edit(self._default_bindings)
         if text is None:
-            self._default_content_fn = os.path.join(package_home(globals()),
-                                               'zpt/MPIWG_%s_template_standard.zpt'%MPIWGType)
+            self._default_content_fn = os.path.join(package_home(globals()), 'zpt/template/default_template_%s.zpt'%MPIWGType)
             text = open(self._default_content_fn).read()
+            
         self.pt_edit(text, content_type)
 
     
@@ -62,42 +54,18 @@
         else:
             return ""
     
-    getBreadcrumbs = getBreadcrumbs
-    getSection = getSection
-    getSubSection = getSubSection
+    getBreadcrumbs = MPIWGHelper.getBreadcrumbs
+    getSection = MPIWGHelper.getSection
+    getSubSection = MPIWGHelper.getSubSection
     
-    def harvest_page(self,mode="normal"):
-        """harvest main"""
-        
-       
-
-        # Ensure that a 'userdb' key is present
-        # in the root
-       
-        templates = self.en.getHarvestCache()
-        #templates = getattr(self,'getHarvestCache',self.en.getHarvestCache)()
-        try:
-            rendered = self.pt_render()
-            templates[self.absolute_url()]=rendered
-            logging.debug("harvest:"+self.absolute_url())
-            transaction.commit()
-            return rendered
-        except:
-            logging.error("cannot harvest: %s"%self.absolute_url())
-        
-        
-       
-        
-        
-                     
+                             
 def manage_addMPIWGTemplateForm(self):
     """Form for adding"""
-    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddMPIWGTemplate.zpt')).__of__(self)
+    pt=PageTemplateFile('zpt/template/manage_add_MPIWGTemplate', globals()).__of__(self)
     return pt()
 
 
-
-def manage_addMPIWGTemplate(self, MPIWGType,id, text="",title=None,weight=0,REQUEST=None):
+def manage_addMPIWGTemplate(self, MPIWGType, id, text="",title=None,weight=0,REQUEST=None):
     "Add a Page Template with optional file content."
     if isinstance(MPIWGType, str):
         MPIWGTypes=[MPIWGType]
@@ -106,14 +74,14 @@
         
     for singleType in MPIWGTypes:
 
-
         if REQUEST is None:
-            self._setObject(id, MPIWGTemplate(id, text,EchoType=singleType))
+            self._setObject(id, MPIWGTemplate(id, text=text, MPIWGType=singleType))
             ob = getattr(self, id)
             
             if title:
                 ob.pt_setTitle(title)
             return ob
+        
         else:
             file = REQUEST.form.get('file')
             headers = getattr(file, 'headers', None)