Included support for new label attribute at Bebop Widgets into Mandalay and the Heirloom theme.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2688 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java

@@ -94,6 +94,7 @@ public class ArticlePropertyForm extends GenericArticlePropertyForm
         TextArea lead = new TextArea(leadParam);
         lead.setCols(40);
         lead.setRows(5);
+        lead.setLabel(GlobalizationUtil.globalize("cms.contenttypes.ui.lead"));
         lead.setHint(GlobalizationUtil.globalize("cms.contenttypes.ui.lead_hint"));
         add(lead);
     }

ccm-core/web/themes/heirloom/packages/bebop/xsl/FormWidget.xsl

@@ -7,6 +7,11 @@
     <xsl:output method="html" indent="yes"/>
 
     <xsl:template match="bebop:formWidget">
+        <xsl:if test="@label">
+            <label for="{@name}">
+                <xsl:value-of select="@label"/>
+            </label>
+        </xsl:if>
         <input>
             <xsl:for-each select="@*">
                 <xsl:attribute name="{name()}">

ccm-core/web/themes/heirloom/packages/bebop/xsl/TextArea.xsl

@@ -6,6 +6,11 @@
 
     <xsl:template match="bebop:textarea"
                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+         <xsl:if test="@label">
+            <label for="{@name}">
+                <xsl:value-of select="@label"/>
+            </label>
+        </xsl:if>
         <textarea>
             <xsl:for-each select="@*[not(name()='value')]">
                 <xsl:attribute name="{name()}">

ccm-core/web/themes/heirloom/packages/bebop/xsl/Widget.xsl

@@ -15,6 +15,11 @@
     </xsl:template>
  
     <xsl:template match="bebop:formWidget">
+        <xsl:if test="@label">
+            <label for="{@name}">
+                <xsl:value-of select="@label"/>
+            </label>
+        </xsl:if>
         <xsl:element name="input">
             <xsl:for-each select="@*">
                 <xsl:attribute name="{name()}">

ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopWidget.xsl

@@ -165,6 +165,14 @@
     <!-- DE Erzeugt alle Formular-Eingabefelder, die per <input> in HTML angelegt werden. -->
     <!-- EN Creates all form input field, which are created by a <input> in html. -->
     <xsl:template match="bebop:formWidget">
+        <!--<xsl:if test="@label">
+            <label for="{@name}">
+                <xsl:value-of select="@label"/>
+            </label>
+        </xsl:if>-->
+        <xsl:call-template name="processLabel">
+            <xsl:with-param name="widget" select="."/>
+        </xsl:call-template>
         <input>
             <xsl:call-template name="mandalay:processAttributes"/>
             <!-- DE Besondere Behandlung von Submit-Button Double-Click-Protection -->
@@ -181,6 +189,9 @@
     <!-- DE Erzeugt ein Textfeld -->
     <!-- EN Create a textarea -->
     <xsl:template match="bebop:textarea">
+        <xsl:call-template name="processLabel">
+            <xsl:with-param name="widget" select="."/>
+        </xsl:call-template>
         <textarea>
             <xsl:call-template name="mandalay:processAttributes"/>
             <xsl:value-of select="@value"/>
@@ -209,4 +220,26 @@
         </fieldset>
     </xsl:template>
   
+    <xsl:template name="processLabel">
+        <xsl:param name="widget"/>
+        
+        <xsl:if test="$widget/@label">
+            <label for="{$widget/@name}">
+                <xsl:value-of select="$widget/@label"/>
+                <xsl:if test="string-length($widget/@hint) &gt; 0">
+                    <span class="hint">
+                        <xsl:attribute name="content">
+                            <xsl:value-of select="@hint"/>
+                        </xsl:attribute>
+                        <xsl:call-template name="mandalay:getSetting">
+                            <xsl:with-param name="module" select="'bebop'"/>
+                            <xsl:with-param name="setting" select="'hintSymbol'"/>
+                            <xsl:with-param name="default" select="'(?)'"/>
+                        </xsl:call-template>
+                    </span>
+                </xsl:if>
+            </label>
+        </xsl:if>
+    </xsl:template>
+  
 </xsl:stylesheet>

ccm-sci-bundle/web/themes/mandalay/includes/mandalay/toolbox.xsl

@@ -394,7 +394,9 @@ Setting up global templates like getStaticText and getSetting
     <!-- EN Process all attributes -->
     <xsl:template name="mandalay:processAttributes">
         <xsl:for-each select="@*">
-            <xsl:if test="name() != 'href_no_javascript'">
+            <xsl:if test="(name() != 'href_no_javascript')
+                       and (name() != 'hint')
+                       and (name() != 'label')">
                 <xsl:attribute name="{name()}">
                     <xsl:value-of select="."/>
                 </xsl:attribute>

ccm-sci-bundle/web/themes/mandalay/settings/bebop.xml

@@ -24,6 +24,8 @@
   <setting id="padding/showPadding">false</setting>
   <setting id="padding/borderColor">cccccc</setting>
   
+  <setting id="hintSymbol">(?)</setting>
+  
   <setting id="table/setImage/checkboxChecked">/images/bebop/checkBoxChecked.gif</setting>
   <setting id="table/setImage/checkboxUnchecked">/images/bebop/checkBoxUnchecked.gif</setting>
   <setting id="table/setImage/checkboxGreyChecked">/images/bebop/checkBoxGreyChecked.gif</setting>