[Checkins] SVN: megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/ Corrected for the latest grok

Souheil CHELFOUH souheil at chelfouh.com
Thu Sep 24 16:02:31 EDT 2009


Log message for revision 104510:
  Corrected for the latest grok
  

Changed:
  U   megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/composedform.py
  A   megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/configure.zcml
  A   megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/templates/composedtemplate.pt
  D   megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/templates/z3cform.pt

-=-
Modified: megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/composedform.py
===================================================================
--- megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/composedform.py	2009-09-24 19:37:07 UTC (rev 104509)
+++ megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/composedform.py	2009-09-24 20:02:31 UTC (rev 104510)
@@ -1,22 +1,22 @@
 # -*- coding: utf-8 -*-
 
-import grokcore.viewlet
+import grokcore.viewlet as grok
 import zope.component as component
+import megrok.pagetemplate as pt
 from megrok.z3cform.base import PageForm
 from z3c.form.interfaces import ISubForm
 
+grok.templatedir("templates")
 
 class ComposedForm(PageForm):
     """A more generic form which can be composed of many others.
     """
-    grokcore.viewlet.baseclass()
+    grok.baseclass()
 
-    template = grokcore.viewlet.PageTemplateFile('templates/composedform.pt')
-
     def updateSubForms(self):
         subforms = map(lambda x: x[1], component.getAdapters(
             (self.context, self.request,  self), ISubForm))
-        subforms = grokcore.viewlet.util.sort_components(subforms)
+        subforms = grok.util.sort_components(subforms)
         self.subforms = []
         # Update form
         for subform in subforms:
@@ -29,3 +29,9 @@
     def updateForm(self):
         self.updateSubForms()
         super(PageForm, self).updateForm()
+
+
+class ComposedTemplate(pt.PageTemplate):
+    """A template rendering a composed form.
+    """
+    grok.view(ComposedForm)

Added: megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/configure.zcml
===================================================================
--- megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/configure.zcml	                        (rev 0)
+++ megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/configure.zcml	2009-09-24 20:02:31 UTC (rev 104510)
@@ -0,0 +1,8 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:grok="http://namespaces.zope.org/grok">
+ 
+  <include package="megrok.pagetemplate" file="meta.zcml" />
+  <grok:grok package="." />
+
+</configure>

Added: megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/templates/composedtemplate.pt
===================================================================
--- megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/templates/composedtemplate.pt	                        (rev 0)
+++ megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/templates/composedtemplate.pt	2009-09-24 20:02:31 UTC (rev 104510)
@@ -0,0 +1,3 @@
+<tal:repeat tal:repeat="form view/subforms"
+	    tal:replace="structure form/render">
+</tal:repeat>

Deleted: megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/templates/z3cform.pt
===================================================================
--- megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/templates/z3cform.pt	2009-09-24 19:37:07 UTC (rev 104509)
+++ megrok.z3cform.composed/trunk/src/megrok/z3cform/composed/templates/z3cform.pt	2009-09-24 20:02:31 UTC (rev 104510)
@@ -1,74 +0,0 @@
- <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      i18n:domain="silva"
-      tal:omit-tag="">
-
-   <form action="." method="post">
-
-     <table class="listing">
-
-       <tbody>
-
-         <metal:label metal:define-macro="label">
-           <tal:label tal:define="label view/label | nothing"
-                      tal:condition="label">
-             <tr class="top-controls">
-               <td colspan="2">
-                 <h3 tal:content="label">Label</h3>
-               </td>
-             </tr>
-           </tal:label>
-         </metal:label>
-
-         <metal:widgets metal:define-macro="widgets">
-           <tal:repeat tal:repeat="widget view/widgets/values">
-             <tr class="#"
-                 tal:define="widget_odd   repeat/widget/odd;
-                             description  widget/field/description;
-                             error        widget/error;
-                             idx          repeat/widget/index"
-                 tal:attributes="class python:widget_odd and ('odd' + ' row' + str(idx))
-                                 or ('even' + ' row' + str(idx)) + (error and ' field-error' or '')">
-               <td class="designator"
-                   style="width:25%">
-                 <label tal:attributes="for widget/id"
-                        tal:content="widget/label">
-                   Field Name
-                 </label><span class="warning"
-                   tal:condition="widget/required">*</span>
-                 <p tal:condition="description" tal:content="description">
-                   Description
-                 </p>
-               </td>
-               <td class="field">
-                 <tal:error tal:condition="error"
-                            tal:content="structure error/render">
-                   Validation error.
-                 </tal:error>
-                 <tal:widget tal:content="structure widget/render">
-                   Widget.
-                 </tal:widget>
-               </td>
-             </tr>
-           </tal:repeat>
-         </metal:widgets>
-       </tbody>
-
-       <tfoot>
-         <metal:actions metal:define-macro="actions">
-           <tr class="controls" tal:condition="view/actions">
-             <td class="align-right" colspan="2">
-               <input tal:repeat="action view/actions/values | nothing"
-                      tal:replace="structure action/render" />
-             </td>
-           </tr>
-         </metal:actions>
-       </tfoot>
-
-     </table>
-
-   </form>
-
- </html>



More information about the checkins mailing list