[Checkins] SVN: z3c.form/trunk/ Fix div with class=error generated twice in multi_input and remove error div in multi_display

Thu Sep 24 11:13:54 EDT 2009

Log message for revision 104487:
  Fix div with class=error generated twice in multi_input and remove error div in multi_display

Changed:
  U   z3c.form/trunk/CHANGES.txt
  U   z3c.form/trunk/src/z3c/form/browser/multi_display.pt
  U   z3c.form/trunk/src/z3c/form/browser/multi_input.pt

-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================

--- z3c.form/trunk/CHANGES.txt	2009-09-24 14:17:01 UTC (rev 104486)
+++ z3c.form/trunk/CHANGES.txt	2009-09-24 15:13:54 UTC (rev 104487)
@@ -5,7 +5,8 @@
 Version 2.2.0 (unreleased)
 --------------------------
 
-- Bug: <div class="error"> was generated twice for ObjectWidget in input mode.
+- Bug: <div class="error"> was generated twice for MultiWidget and
+  ObjectWidget in input mode.
 
 - Feature: Add ``z3c.form.error.ComputedErrorViewMessage`` factory for easy
   creation of dynamically computed error messages.

Modified: z3c.form/trunk/src/z3c/form/browser/multi_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/multi_display.pt	2009-09-24 14:17:01 UTC (rev 104486)
+++ z3c.form/trunk/src/z3c/form/browser/multi_display.pt	2009-09-24 15:13:54 UTC (rev 104487)
@@ -1,7 +1,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       tal:omit-tag="">
-<span id="" class=""
+<div id="" class=""
       tal:attributes="id view/id;
                       class view/klass;
                       style view/style;
@@ -36,12 +38,8 @@
             <input size="24" value="" type="text" />
           </div>
         </div>
-        <div class="error"
-             tal:condition="widget/error">
-          <span tal:replace="structure widget/error/render">error</span>
-        </div>
       </metal:block>
     </div>
   </tal:block>
-</span>
+</div>
 </html>

Modified: z3c.form/trunk/src/z3c/form/browser/multi_input.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/multi_input.pt	2009-09-24 14:17:01 UTC (rev 104486)
+++ z3c.form/trunk/src/z3c/form/browser/multi_input.pt	2009-09-24 15:13:54 UTC (rev 104487)
@@ -2,7 +2,7 @@
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      tal:omit-tag="">  
+      tal:omit-tag="">
 <div class="multi-widget"
      tal:attributes="class view/klass">
   <tal:block repeat="widget view/widgets">
@@ -18,6 +18,8 @@
                   tal:condition="widget/required">*</span>
           </label>
         </div>
+        <div tal:condition="widget/error"
+             tal:replace="structure widget/error/render">error</div>
         <div class="widget">
           <div class="multi-widget-checkbox">
             <input id="" name=""
@@ -31,10 +33,6 @@
             <input size="24" value="" type="text" />
           </div>
         </div>
-        <div class="error"
-             tal:condition="widget/error">
-          <span tal:replace="structure widget/error/render">error</span>
-        </div>
       </metal:block>
     </div>
   </tal:block>

