Mercurial > hg > MPIWGWeb

changeset 152:1f0db83b61c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning up MPIWGTemplate
author casties
date Mon, 03 Jun 2013 19:54:57 +0200
parents 6bdf54b67fca
children c115a18dbbe1
files MPIWGTemplate.py zpt/AddMPIWGTemplate.zpt zpt/MPIWGTemplateChangeWeight.zpt zpt/MPIWG_standardPage_template_standard.zpt zpt/template/default_template_standardPage.zpt zpt/template/manage_add_MPIWGTemplate.zpt zpt/template/manage_change_weight.zpt
diffstat 7 files changed, 82 insertions(+), 96 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- a/zpt/AddMPIWGTemplate.zpt	Mon Jun 03 15:22:26 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<html>
-<body>
-<h2>Generate Templates for MPIWGWeb</h2>
-
-
-
-<form method="post" action="manage_addMPIWGTemplate">
-<table>
-<tr>
-	<td><b>ID</b></td>
-	<td><input type="text" size="40" name="id"></td>
-</tr>
-<tr>
-	<td><i>Title</i></td>
-	<td><input type="text" size="40" name="title"></td>
-</tr>
-<tr>
-	<td><i>Weight</i></td>
-	<td><input type="text" size="40" name="weight"></td>
-</tr>
-
-</table>
-<h2>Type</h2>
-<input type="radio" checked name="MPIWGType" value="standardPage">Standard Page<br>
-
-
-
-<input type="submit" value="create">
-
-</form>
-</body>
-</html>
--- a/zpt/MPIWGTemplateChangeWeight.zpt	Mon Jun 03 15:22:26 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<html>
-<h2>Change Weight</h2>
-<form action="changeWeight" method="pro">
-<input tal:attributes="value here/weight|string:0" name="weight"><br>
-<input type="submit">
-</form>
-</html>
--- a/zpt/MPIWG_standardPage_template_standard.zpt	Mon Jun 03 15:22:26 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
-<html metal:use-macro="here/main_template/macros/page">
- <tal:block metal:fill-slot="body">
-    <!-- Insert here the main text -->
-
-
-    
-    <!-- Don't change from here -->
-  </tal:block>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/template/default_template_standardPage.zpt	Mon Jun 03 19:54:57 2013 +0200
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      metal:use-macro="here/main_template/macros/page">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+</head>
+<body>
+  <div class="center" metal:fill-slot="center">
+    <!-- Insert here the main text -->
+
+
+    
+    <!-- Don't change from here -->
+  </div>
+  
+  <!-- optional sidebar -->
+  <!-- 
+  <div class="sidebar" metal:fill-slot="sidebar">
+    <div class="sideblock">
+      <h2>Sideblock Head</h2>
+      <div class="item">
+        Sideblock item 
+      </div>
+    </div>
+  </div>
+   -->
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/template/manage_add_MPIWGTemplate.zpt	Mon Jun 03 19:54:57 2013 +0200
@@ -0,0 +1,32 @@
+<html>
+<body>
+  <div tal:replace="structure here/manage_page_header"/>
+  <h2>Create template for MPIWGWeb</h2>
+
+<form method="post" action="manage_addMPIWGTemplate">
+<table>
+<tr>
+	<td><b>ID</b></td>
+	<td><input type="text" size="40" name="id"></td>
+</tr>
+<tr>
+	<td><i>Title</i></td>
+	<td><input type="text" size="40" name="title"></td>
+</tr>
+<tr>
+	<td><i>Weight</i></td>
+	<td><input type="text" size="40" name="weight"></td>
+</tr>
+<tr>
+  <td><i>Type</i></td>
+  <td>
+    <input type="radio" checked="true" name="MPIWGType" value="standardPage"/>Standard Page
+  </td>
+</tr>
+</table>
+<p>
+<input type="submit" value="create"/>
+</p>
+</form>
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/template/manage_change_weight.zpt	Mon Jun 03 19:54:57 2013 +0200
@@ -0,0 +1,7 @@
+<html>
+<h2>Change Weight</h2>
+<form action="changeWeight" method="pro">
+<input tal:attributes="value here/weight|string:0" name="weight"><br>
+<input type="submit">
+</form>
+</html>