svn commit: r1583026 - in /ofbiz/trunk/framework/widget: src/org/ofbiz/widget/form/MacroFormRenderer.java templates/htmlFormMacroLibrary.ftl

[jl...@apache.org]

Author: jleroux
Date: Sat Mar 29 16:49:02 2014
New Revision: 1583026

URL: http://svn.apache.org/r1583026
Log:
A patch from Rong Nguyen for "Focus input(dropdown list) when click on label in widget form" https://issues.apache.org/jira/browse/OFBIZ-5594

The current widget form does not focus input(dropdown list) when a label is clicked on.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
    ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1583026&r1=1583025&r2=1583026&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Sat Mar 29 16:49:02 2014
@@ -29,9 +29,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.WeakHashMap;
-import java.util.Map.Entry;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -1273,6 +1273,9 @@ public class MacroFormRenderer implement
                 sr.append("\" id=\"");
                 sr.append(id);
                 sr.append("_title");
+                // Render "for"
+                sr.append("\" for=\"");
+                sr.append(id);
             }
             sr.append("\" />");
             executeMacro(writer, sr.toString());

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1583026&r1=1583025&r2=1583026&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Mar 29 16:49:02 2014
@@ -313,10 +313,10 @@ under the License.
 
 <#macro renderIgnoredField></#macro>
 
-<#macro renderFieldTitle style title id fieldHelpText="">
-  <span<#if fieldHelpText?has_content> title="${fieldHelpText}"</#if><#if style?has_content> class="${style}"</#if><#if id?has_content> id="${id}"</#if>><#t/>
+<#macro renderFieldTitle style title id fieldHelpText="" for="">
+  <label <#if for?has_content>for="${for}"</#if> <#if fieldHelpText?has_content> title="${fieldHelpText}"</#if><#if style?has_content> class="${style}"</#if><#if id?has_content> id="${id}"</#if>><#t/>
     ${title}<#t/>
-  </span><#t/>
+  </label><#t/>
 </#macro>
 
 <#macro renderSingleFormFieldTitle></#macro>