[Checkins] SVN: z3ext.layoutform/trunk/ Added group support

[Nikolay Kim]

Log message for revision 90698:
  Added group support

Changed:
  U   z3ext.layoutform/trunk/CHANGES.txt
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/form.pt
  A   z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt

-=-
Modified: z3ext.layoutform/trunk/CHANGES.txt
===================================================================
--- z3ext.layoutform/trunk/CHANGES.txt	2008-09-02 12:33:06 UTC (rev 90697)
+++ z3ext.layoutform/trunk/CHANGES.txt	2008-09-02 12:38:36 UTC (rev 90698)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.1.2 (2008-08-??)
+------------------
+
+- Added group support
+
+
 1.1.1 (2008-08-05)
 ------------------
 

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml	2008-09-02 12:33:06 UTC (rev 90697)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml	2008-09-02 12:38:36 UTC (rev 90698)
@@ -52,6 +52,11 @@
      for="z3c.form.interfaces.ISubForm"
      layer="..interfaces.ILayoutFormLayer" />
 
+  <z3c:template
+     template="formgroup.pt"
+     for="z3c.form.group.Group"
+     layer="..interfaces.ILayoutFormLayer" />
+
   <!-- Error View -->
   <z3c:template
      for="z3c.form.interfaces.IErrorViewSnippet"
@@ -66,21 +71,21 @@
      layer="..interfaces.ILayoutFormLayer" />
 
   <z3c:macro
-     view="..interfaces.IPageletForm"
+     view="z3c.form.interfaces.IForm"
      name="form-header"
      macro="header"
      template="form.pt"
      layer="..interfaces.ILayoutFormLayer" />
 
   <z3c:macro
-     view="..interfaces.IPageletForm"
+     view="z3c.form.interfaces.IForm"
      name="widget-rows"
      macro="widget-rows"
      template="form.pt"
      layer="..interfaces.ILayoutFormLayer" />
 
   <z3c:macro
-     view="..interfaces.IPageletForm"
+     view="z3c.form.interfaces.IForm"
      name="widget-row"
      macro="widget-row"
      template="form.pt"

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/form.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/form.pt	2008-09-02 12:33:06 UTC (rev 90697)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/form.pt	2008-09-02 12:38:36 UTC (rev 90698)
@@ -49,6 +49,11 @@
 		</div>
 	      </div>
 	    </tal:block>
+	    
+	    <tal:block tal:repeat="group view/groups|python:[]">
+	      <tal:block tal:content="structure python:group.render()" />
+	    </tal:block>
+
 	    <metal:block metal:define-slot="extra-bottom" />
 	  </metal:block>
 	</div>
@@ -58,9 +63,9 @@
 
     <metal:block define-slot="buttons">
       <div class="z-form-controls" metal:define-macro="buttons">
-	<hr />
 	<span tal:condition="view/actions/values"
 	      metal:define-slot="bottom_buttons">
+	  <hr />
 	  <input tal:repeat="action view/actions/values"
 		 tal:replace="structure action/render" />
 	</span>

Added: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt	                        (rev 0)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt	2008-09-02 12:38:36 UTC (rev 90698)
@@ -0,0 +1,8 @@
+<fieldset>
+  <legend tal:content="view/label"></legend>
+  <div class="pageDescription" tal:content="view/description|nothing"></div>
+
+  <tal:block tal:repeat="widget view/widgets/values">
+    <metal:block use-macro="macro:widget-row" />
+  </tal:block>
+</fieldset>