svn commit: r1751346 - in /ofbiz/trunk/applications/workeffort/template: find/WorkEffortSearchOptions.ftl workeffort/EditWorkEffortDupForm.ftl

[diveshdutta]

Author: diveshdutta
Date: Mon Jul  4 17:01:09 2016
New Revision: 1751346

URL: http://svn.apache.org/viewvc?rev=1751346&view=rev
Log:
[OFBIZ-7584] Workeffort: Checkbox and Radio buttons should get selected on 
clicking upon their labels. Thanks Mohammad Kathawala for your patch. 

Modified:
    
ofbiz/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl
    
ofbiz/trunk/applications/workeffort/template/workeffort/EditWorkEffortDupForm.ftl

Modified: 
ofbiz/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl?rev=1751346&r1=1751345&r2=1751346&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl 
(original)
+++ 
ofbiz/trunk/applications/workeffort/template/find/WorkEffortSearchOptions.ftl 
Mon Jul  4 17:01:09 2016
@@ -29,8 +29,8 @@ under the License.
           <td valign="middle">
             <div>
               <input type="text" name="SEARCH_STRING" size="40" 
value="${requestParameters.SEARCH_STRING!}"/>&nbsp;
-              ${uiLabelMap.CommonAny}<input type="radio" 
name="SEARCH_OPERATOR" value="OR" <#if searchOperator == 
"OR">checked="checked"</#if>/>
-              ${uiLabelMap.CommonAll}<input type="radio" 
name="SEARCH_OPERATOR" value="AND" <#if searchOperator == 
"AND">checked="checked"</#if>/>
+              <label>${uiLabelMap.CommonAny}<input type="radio" 
name="SEARCH_OPERATOR" value="OR" <#if searchOperator == 
"OR">checked="checked"</#if>/></label>
+              <label>${uiLabelMap.CommonAll}<input type="radio" 
name="SEARCH_OPERATOR" value="AND" <#if searchOperator == 
"AND">checked="checked"</#if>/></label>
             </div>
           </td>
         </tr>
@@ -61,8 +61,8 @@ under the License.
                   </#list>
                   </select>
                   ${uiLabelMap.WorkEffortIncludeAllSubWorkEfforts}?
-                  ${uiLabelMap.CommonYes}<input type="radio" 
name="SEARCH_SUB_WORK_EFFORTS" value="Y" checked="checked"/>
-                  ${uiLabelMap.CommonNo}<input type="radio" 
name="SEARCH_SUB_WORK_EFFORTS" value="N"/>
+                  <label>${uiLabelMap.CommonYes}<input type="radio" 
name="SEARCH_SUB_WORK_EFFORTS" value="Y" checked="checked"/></label>
+                  <label>${uiLabelMap.CommonNo}<input type="radio" 
name="SEARCH_SUB_WORK_EFFORTS" value="N"/></label>
             </div>
           </td>
         </tr>
@@ -130,8 +130,8 @@ under the License.
                 <option 
value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option>
                 <option 
value="SortWorkEffortField:workEffortName">${uiLabelMap.WorkEffortName}</option>
               </select>
-              ${uiLabelMap.ProductLowToHigh}<input type="radio" 
name="sortAscending" value="Y" checked="checked"/>
-              ${uiLabelMap.ProductHighToLow}<input type="radio" 
name="sortAscending" value="N"/>
+              <label>${uiLabelMap.ProductLowToHigh}<input type="radio" 
name="sortAscending" value="Y" checked="checked"/></label>
+              <label>${uiLabelMap.ProductHighToLow}<input type="radio" 
name="sortAscending" value="N"/></label>
             </div>
           </td>
         </tr>
@@ -144,8 +144,8 @@ under the License.
                 </#list>
                 <div class="label">${uiLabelMap.CommonSortedBy} 
${searchSortOrderString}</div>
                 <div>
-                  ${uiLabelMap.ProductNewSearch}<input type="radio" 
name="clearSearch" value="Y" checked="checked"/>
-                  ${uiLabelMap.CommonRefineSearch}<input type="radio" 
name="clearSearch" value="N"/>
+                  <label>${uiLabelMap.ProductNewSearch}<input type="radio" 
name="clearSearch" value="Y" checked="checked"/></label>
+                  <label>${uiLabelMap.CommonRefineSearch}<input type="radio" 
name="clearSearch" value="N"/></label>
                 </div>
             </td>
           </tr>

Modified: 
ofbiz/trunk/applications/workeffort/template/workeffort/EditWorkEffortDupForm.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/template/workeffort/EditWorkEffortDupForm.ftl?rev=1751346&r1=1751345&r2=1751346&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/workeffort/template/workeffort/EditWorkEffortDupForm.ftl
 (original)
+++ 
ofbiz/trunk/applications/workeffort/template/workeffort/EditWorkEffortDupForm.ftl
 Mon Jul  4 17:01:09 2016
@@ -24,16 +24,16 @@ under the License.
             </div>
             <div>
                 <span class="label">${uiLabelMap.CommonDuplicate}</span>
-                ${uiLabelMap.FormFieldTitle_rate}&nbsp;<input type="checkbox" 
name="duplicateWorkEffortAssignmentRates" value="Y" checked="checked"/>
-                ${uiLabelMap.WorkEffortAssoc}&nbsp;<input type="checkbox" 
name="duplicateWorkEffortAssocs" value="Y" checked="checked"/>
-                ${uiLabelMap.ProductContent}&nbsp;<input type="checkbox" 
name="duplicateWorkEffortContents" value="Y" checked="checked"/>
-                ${uiLabelMap.WorkEffortNotes}&nbsp;<input type="checkbox" 
name="duplicateWorkEffortNotes" value="Y" checked="checked"/>
+                <label>${uiLabelMap.FormFieldTitle_rate}&nbsp;<input 
type="checkbox" name="duplicateWorkEffortAssignmentRates" value="Y" 
checked="checked"/></label>
+                <label>${uiLabelMap.WorkEffortAssoc}&nbsp;<input 
type="checkbox" name="duplicateWorkEffortAssocs" value="Y" 
checked="checked"/></label>
+                <label>${uiLabelMap.ProductContent}&nbsp;<input 
type="checkbox" name="duplicateWorkEffortContents" value="Y" 
checked="checked"/></label>
+                <label>${uiLabelMap.WorkEffortNotes}&nbsp;<input 
type="checkbox" name="duplicateWorkEffortNotes" value="Y" 
checked="checked"/></label>
             </div>
             <div>
                 <span class="label">${uiLabelMap.CommonRemove}</span>
-                ${uiLabelMap.FormFieldTitle_rate}&nbsp;<input type="checkbox" 
name="removeWorkEffortAssignmentRates" value="Y"/>
-                ${uiLabelMap.WorkEffortAssoc}&nbsp;<input type="checkbox" 
name="removeWorkEffortAssocs" value="Y"/>
-                ${uiLabelMap.ProductContent}&nbsp;<input type="checkbox" 
name="removeWorkEffortContents" value="Y"/>
-                ${uiLabelMap.WorkEffortNotes}&nbsp;<input type="checkbox" 
name="removeWorkEffortNotes" value="Y"/>
+                <label>${uiLabelMap.FormFieldTitle_rate}&nbsp;<input 
type="checkbox" name="removeWorkEffortAssignmentRates" value="Y"/></label>
+                <label>${uiLabelMap.WorkEffortAssoc}&nbsp;<input 
type="checkbox" name="removeWorkEffortAssocs" value="Y"/></label>
+                <label>${uiLabelMap.ProductContent}&nbsp;<input 
type="checkbox" name="removeWorkEffortContents" value="Y"/></label>
+                <label>${uiLabelMap.WorkEffortNotes}&nbsp;<input 
type="checkbox" name="removeWorkEffortNotes" value="Y"/></label>
             </div>
         </form>
\ No newline at end of file