[Checkins] SVN: plone.z3cform/trunk/plone/z3cform/templates/macros.pt go back to one field slot wrapping the field macro. fieldtop and fieldbottom weren't flexible enough

[David Glick]

Log message for revision 110037:
  go back to one field slot wrapping the field macro.  fieldtop and fieldbottom weren't flexible enough

Changed:
  U   plone.z3cform/trunk/plone/z3cform/templates/macros.pt

-=-
Modified: plone.z3cform/trunk/plone/z3cform/templates/macros.pt
===================================================================
--- plone.z3cform/trunk/plone/z3cform/templates/macros.pt	2010-03-17 20:32:01 UTC (rev 110036)
+++ plone.z3cform/trunk/plone/z3cform/templates/macros.pt	2010-03-17 21:13:23 UTC (rev 110037)
@@ -35,43 +35,43 @@
                    tal:define="hidden python:widget.mode == 'hidden'"
                    tal:omit-tag="hidden">
 
-                <metal:field define-macro="field">
-                  <metal:field-slot define-slot="fieldtop" />
-                  <div class="field"
-                       tal:define="error widget/error"
-                       tal:attributes="class python:'field' + (error and ' error' or '')">
-                    <label for=""
-                           tal:attributes="for widget/id"
-                           tal:condition="not:hidden">
-                      <span i18n:translate=""
-                            tal:content="widget/label">label</span>
-                    </label>
+                <metal:field-slot define-slot="field">
+                  <metal:field define-macro="field">
+                    <div class="field"
+                         tal:define="error widget/error"
+                         tal:attributes="class python:'field' + (error and ' error' or '')">
+                      <label for=""
+                             tal:attributes="for widget/id"
+                             tal:condition="not:hidden">
+                        <span i18n:translate=""
+                              tal:content="widget/label">label</span>
+                      </label>
 
-                    <span class="fieldRequired" title="Required"
-                          tal:condition="python:widget.required and not hidden"
-                          i18n:translate="label_required"
-                          i18n:attributes="title title_required;">
-                      (Required)
-                    </span>
+                      <span class="fieldRequired" title="Required"
+                            tal:condition="python:widget.required and not hidden"
+                            i18n:translate="label_required"
+                            i18n:attributes="title title_required;">
+                        (Required)
+                      </span>
 
-                    <div class="formHelp"
-                         tal:define="description widget/field/description"
-                         i18n:translate=""
-                         tal:content="description"
-                         tal:condition="python:description and not hidden"
-                         >field description</div>
+                      <div class="formHelp"
+                           tal:define="description widget/field/description"
+                           i18n:translate=""
+                           tal:content="description"
+                           tal:condition="python:description and not hidden"
+                           >field description</div>
 
-                    <div tal:condition="error"
-                         tal:content="structure error/render">
-                      Error
-                    </div>
+                      <div tal:condition="error"
+                           tal:content="structure error/render">
+                        Error
+                      </div>
 
-                    <div class="widget">
-                      <input type="text" tal:replace="structure widget/render" />
+                      <div class="widget">
+                        <input type="text" tal:replace="structure widget/render" />
+                      </div>
                     </div>
-                  </div>
-                  <metal:field-slot define-slot="fieldbottom" />
-                </metal:field>
+                  </metal:field>
+                </metal:field-slot>
 
               </div>
             </tal:widgets>