[Checkins] SVN: z3ext.layoutform/trunk/

[Nikolay Kim]

Log message for revision 94242:
  

Changed:
  U   z3ext.layoutform/trunk/buildout.cfg
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/error.pt
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formdisp.pt
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/interfaces.py
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/form.py

-=-
Modified: z3ext.layoutform/trunk/buildout.cfg
===================================================================
--- z3ext.layoutform/trunk/buildout.cfg	2008-12-22 12:29:12 UTC (rev 94241)
+++ z3ext.layoutform/trunk/buildout.cfg	2008-12-22 12:40:01 UTC (rev 94242)
@@ -1,5 +1,6 @@
 [buildout]
 develop = .
+    externals/z3ext.layout
 parts = test coverage-test coverage-report i18n i18nall i18ncheck i18ndude
 
 [test]

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml	2008-12-22 12:29:12 UTC (rev 94241)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml	2008-12-22 12:40:01 UTC (rev 94242)
@@ -33,48 +33,51 @@
 
   <!-- templates -->
   <z3ext:pagelet
+     type="form"
      template="form.pt"
      for="..interfaces.IPageletForm"
-     layer="..interfaces.ILayoutFormLayer"
-     provides="..interfaces.IPageletFormView"
-     permission="zope.Public" />
+     layer="..interfaces.ILayoutFormLayer" />
 
   <z3ext:pagelet
+     type="form"
      template="formadd.pt"
      for="..interfaces.IPageletAddForm"
-     layer="..interfaces.ILayoutFormLayer"
-     name="form" />
+     layer="..interfaces.ILayoutFormLayer" />
 
   <z3ext:pagelet
+     type="form"
      template="formedit.pt"
      for="..interfaces.IPageletEditForm"
-     layer="..interfaces.ILayoutFormLayer"
-     type="form" />
+     layer="..interfaces.ILayoutFormLayer" />
 
   <z3ext:pagelet
+     type="form"
      template="formdisp.pt"
      for="..interfaces.IPageletDisplayForm"
-     layer="..interfaces.ILayoutFormLayer"
-     type="form" />
+     layer="..interfaces.ILayoutFormLayer" />
 
   <z3ext:pagelet
+     type="form"
      template="subform.pt"
      for="z3c.form.interfaces.ISubForm"
-     layer="..interfaces.ILayoutFormLayer"
-     type="form" />
+     layer="..interfaces.ILayoutFormLayer" />
 
   <z3ext:pagelet
+     type="form"
      template="formgroup.pt"
      for="z3c.form.group.Group"
-     layer="..interfaces.ILayoutFormLayer"
-     type="form" />
+     layer="..interfaces.ILayoutFormLayer" />
 
   <!-- Error View -->
+  <z3ext:pageletType
+     name="form.errorView"
+     interface=".interfaces.IErrorView" />
+
   <z3ext:pagelet
      for="z3c.form.interfaces.IErrorViewSnippet"
      template="error.pt"
      layer="..interfaces.ILayoutFormLayer"
-     permission="zope.Public" />
+     type="form.errorView" />
 
   <!-- form view -->
   <z3ext:pageletType

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/error.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/error.pt	2008-12-22 12:29:12 UTC (rev 94241)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/error.pt	2008-12-22 12:40:01 UTC (rev 94242)
@@ -1 +1 @@
-<div tal:content="view/message">Error</div>
+<div class="error" tal:content="context/message">Error</div>

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formdisp.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formdisp.pt	2008-12-22 12:29:12 UTC (rev 94241)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formdisp.pt	2008-12-22 12:40:01 UTC (rev 94242)
@@ -1,3 +1,9 @@
 <div class="z-form-display"
      tal:content="structure pagelet:form.view">
 </div>
+
+<tal:block tal:repeat="context context/forms"
+	   tal:content="structure pagelet:form" />
+
+<tal:block tal:repeat="context context/views"
+	   tal:content="structure context/render" />

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/interfaces.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/interfaces.py	2008-12-22 12:29:12 UTC (rev 94241)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/interfaces.py	2008-12-22 12:40:01 UTC (rev 94242)
@@ -16,6 +16,7 @@
 $Id:  2007-12-12 12:27:02Z fafhrd $
 """
 from zope import interface
+from zope.pagetemplate.interfaces import IPageTemplate
 
 
 class IForm(interface.Interface):
@@ -36,3 +37,7 @@
 
 class IFormButtons(interface.Interface):
     """ form buttons """
+
+
+class IErrorView(IPageTemplate):
+    """ Error view snippet view """

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/form.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/form.py	2008-12-22 12:29:12 UTC (rev 94241)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/form.py	2008-12-22 12:40:01 UTC (rev 94242)
@@ -142,8 +142,8 @@
         self.actions.execute()
 
 
-class PageletDisplayForm(PageletBaseForm, form.DisplayForm):
+class PageletDisplayForm(PageletForm, form.DisplayForm):
     interface.implements(IPageletDisplayForm)
 
-    render = PageletBaseForm.render
-    __call__ = PageletBaseForm.__call__
+    render = PageletForm.render
+    __call__ = PageletForm.__call__