[Checkins] SVN: plone.z3cform/trunk/ Do not display h1 element if there is no label on view.

Tue Jul 19 08:53:38 EDT 2011

Log message for revision 122288:
  Do not display h1 element if there is no label on view.

Changed:
  U   plone.z3cform/trunk/docs/HISTORY.txt
  U   plone.z3cform/trunk/plone/z3cform/templates/form.pt

-=-
Modified: plone.z3cform/trunk/docs/HISTORY.txt
===================================================================

--- plone.z3cform/trunk/docs/HISTORY.txt	2011-07-19 05:38:52 UTC (rev 122287)
+++ plone.z3cform/trunk/docs/HISTORY.txt	2011-07-19 12:53:38 UTC (rev 122288)
@@ -4,6 +4,9 @@
 0.7.8 - unreleased
 ------------------
 
+* Do not display h1 element if there is no label on view.
+  [thomasdesvenain]
+
 * Add Chinese translation.
   [jianaijun]
 
@@ -115,7 +118,7 @@
 * Fixed tests in Plone 4
   [optilude]
 
-* Made it possible to distinguish wrapped and unwrapped forms via the 
+* Made it possible to distinguish wrapped and unwrapped forms via the
   IWrappedForm marker interface.
   [optilude]
 
@@ -145,7 +148,7 @@
 
 * Don't do the rendering if there is a redirection, use the update/render
   pattern for that.
-  See http://dev.plone.org/plone/ticket/10022 for an example how 
+  See http://dev.plone.org/plone/ticket/10022 for an example how
   to adapt your code, in particular if you used FormWrapper with ViewletBase.
   [vincentfretin]
 
@@ -162,13 +165,13 @@
   because macros.pt from plone.app.z3cform uses plone.z3cform translations.
   Added French translation and fixed German and Dutch translations
   for label_required and title_required messages.
-  [vincentfretin] 
+  [vincentfretin]
 
 0.5.5 - 2009-07-26
 ------------------
 
 * Removed explicit <includeOverrides /> call from configure.zcml. This causes
-  race condition type errors in ZCML loading when overrides are included 
+  race condition type errors in ZCML loading when overrides are included
   later.
   [optilude]
 

Modified: plone.z3cform/trunk/plone/z3cform/templates/form.pt
===================================================================
--- plone.z3cform/trunk/plone/z3cform/templates/form.pt	2011-07-19 05:38:52 UTC (rev 122287)
+++ plone.z3cform/trunk/plone/z3cform/templates/form.pt	2011-07-19 12:53:38 UTC (rev 122288)
@@ -7,7 +7,9 @@
 
     <body metal:fill-slot="body">
 
-        <h1 tal:content="view/label | nothing" />
+        <h1 tal:define="label view/label|nothing"
+            tal:omit-tag="not:label"
+            tal:content="label" />
 
         <div class="description"
            tal:condition="view/description | nothing"

