r13596 - in Products.Archetypes/branches/1.5/Products/Archetypes: . skins/archetypes/widgets

Author: dimboo
Date: Tue Apr 26 10:13:14 2011
New Revision: 13596

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


Modified: Products.Archetypes/branches/1.5/Products/Archetypes/HISTORY.txt
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/HISTORY.txt	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/HISTORY.txt	Tue Apr 26 10:13:14 2011
@@ -1,7 +1,8 @@
 1.5.18 - Unreleased
 ===================
 
-- No changes yet.
+- Put required field indicator inside the label tag, fixes #
+  [dimboo]
 
 1.5.17 - 2011-03-09
 ===================

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/widgets/field.pt
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/widgets/field.pt	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/widgets/field.pt	Tue Apr 26 10:13:14 2011
@@ -78,17 +78,18 @@
              tal:attributes="class python: test(error_id, 'field error ' + 'Archetypes' + widget.getName(), 'field ' + 'Archetypes' + widget.getName()) + ' ' + kss_class; 
                              id python: 'archetypes-fieldname-' + field.getName()">
           <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:field.getName()">
+              <span tal:replace="python:widget.Label(here)"
+                    i18n:translate="" />
+              <span class="fieldRequired"
+                    tal:condition="field/required"
+                    title="Required"
+                    i18n:translate="label_required"
+                    i18n:attributes="title title_required;">
+                (Required)
+              </span>
           </label>
-          <span class="fieldRequired"
-                tal:condition="field/required"
-                title="Required"
-                i18n:translate="label_required"
-                i18n:attributes="title title_required;">
-            (Required)
-          </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