[Archetypes-checkins] r9266 - in Products.Archetypes/trunk/Products/Archetypes: . skins/archetypes

[Wichert A. <svn...@pl...>]

Author: wichert
Date: Tue Jan 29 18:04:37 2008
New Revision: 9266

Modified:
   Products.Archetypes/trunk/Products/Archetypes/HISTORY.txt
   Products.Archetypes/trunk/Products/Archetypes/skins/archetypes/base.pt
Log:
Show the plone.abovecontentbody viewlets once per body instead of once per field.

Modified: Products.Archetypes/trunk/Products/Archetypes/HISTORY.txt
==============================================================================
--- Products.Archetypes/trunk/Products/Archetypes/HISTORY.txt	(original)
+++ Products.Archetypes/trunk/Products/Archetypes/HISTORY.txt	Tue Jan 29 18:04:37 2008
@@ -1,7 +1,10 @@
 1.6 - trunk - unreleased
 ========================
 
-=======
+  * Show the plone.abovecontentbody viewlets once per body instead of once per
+    field.
+    [wichert]
+
   * Add checkbox in updateSchemaForm to remove the instance schemas.
     This is possibly needed when going from Archetypes 1.5.1 or
     earlier to a newer version.  Should be safe unless you know that

Modified: Products.Archetypes/trunk/Products/Archetypes/skins/archetypes/base.pt
==============================================================================
--- Products.Archetypes/trunk/Products/Archetypes/skins/archetypes/base.pt	(original)
+++ Products.Archetypes/trunk/Products/Archetypes/skins/archetypes/base.pt	Tue Jan 29 18:04:37 2008
@@ -30,22 +30,22 @@
                tal:on-error="nothing"/>
         </metal:header_macro>
 
-        <metal:body_macro metal:define-macro="body"
-                          tal:define="field_macro field_macro | here/widgets/field/macros/view"
-                          tal:repeat="field python:here.Schema().filterFields(isMetadata=0)">
-
+        <metal:body_macro metal:define-macro="body">
           <div tal:replace="structure provider:plone.abovecontentbody"
                tal:on-error="nothing"/>
 
-          <tal:if_visible define="purl nocall:here/portal_url;
-                                  portal purl/getPortalObject;
-                                  mode string:view;
-                                  visState python:field.widget.isVisible(here, mode);
-                                  visCondition python:field.widget.testCondition(context.aq_inner.aq_parent, portal, context);"
-                          condition="python:visState == 'visible' and visCondition">
-            <metal:use_field use-macro="field_macro" />
-          </tal:if_visible>
+          <tal:fields tal:define="field_macro field_macro | here/widgets/field/macros/view"
+                      tal:repeat="field python:here.Schema().filterFields(isMetadata=0)">
 
+            <tal:if_visible define="purl nocall:here/portal_url;
+                                    portal purl/getPortalObject;
+                                    mode string:view;
+                                    visState python:field.widget.isVisible(here, mode);
+                                    visCondition python:field.widget.testCondition(context.aq_inner.aq_parent, portal, context);"
+                            condition="python:visState == 'visible' and visCondition">
+              <metal:use_field use-macro="field_macro" />
+            </tal:if_visible>
+          </tal:fields>
         </metal:body_macro>
 
         <metal:folderlisting_macro metal:define-macro="folderlisting"