r13597 - in Products.Archetypes/branches/1.6: . Products/Archetypes/skins/archetypes/widgets

Author: dimboo
Date: Tue Apr 26 10:14:31 2011
New Revision: 13597

Modified:
   Products.Archetypes/branches/1.6/CHANGES.txt
   Products.Archetypes/branches/1.6/Products/Archetypes/skins/archetypes/widgets/field.pt
Log:
Put required field indicator inside the label tag, fixes #11726


Modified: Products.Archetypes/branches/1.6/CHANGES.txt
==============================================================================
--- Products.Archetypes/branches/1.6/CHANGES.txt	(original)
+++ Products.Archetypes/branches/1.6/CHANGES.txt	Tue Apr 26 10:14:31 2011
@@ -4,6 +4,8 @@
 1.6.7 - unreleased
 ------------------
 
+- Put required field indicator inside the label tag, fixes #
+  [dimboo]
 
 1.6.6 - 2011-03-30
 ------------------

Modified: Products.Archetypes/branches/1.6/Products/Archetypes/skins/archetypes/widgets/field.pt
==============================================================================
--- Products.Archetypes/branches/1.6/Products/Archetypes/skins/archetypes/widgets/field.pt	(original)
+++ Products.Archetypes/branches/1.6/Products/Archetypes/skins/archetypes/widgets/field.pt	Tue Apr 26 10:14:31 2011
@@ -81,17 +81,18 @@
              tal:attributes="class python: test(error_id, 'field error ' + 'Archetypes' + widget.getName(), 'field ' + 'Archetypes' + widget.getName()) + ' ' + kss_class;
                              id python: 'archetypes-fieldname-' + fieldName">
           <span metal:define-slot="widget_body_label_prefix"></span>
-          <label class="formQuestion" i18n:translate=""
-                 tal:content="python:widget.Label(here)"
+          <label class="formQuestion"
                  tal:attributes="for python:fieldName">
+            <span tal:replace="python:widget.Label(here)"
+                  i18n:translate="" />
+            <span class="required"
+                  tal:condition="field/required"
+                  title="Required"
+                  i18n:attributes="title title_required;"
+                  style="color: #f00;">
+              &#x25a0;
+            </span>
           </label>
-          <span class="required"
-                tal:condition="field/required"
-                title="Required"
-                i18n:attributes="title title_required;"
-                style="color: #f00;">
-            &#x25a0;
-          </span>
           <div class="formHelp"
                tal:define="description python:widget.Description(here)"
                tal:content="structure description"

------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network 
management toolset available today.  Delivers lowest initial 
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd