svn commit: r1751341 - in /ofbiz/trunk/applications/content/template: cms/CMSSites.ftl content/ContentSearchOptions.ftl

[diveshdutta]

Author: diveshdutta
Date: Mon Jul  4 16:46:51 2016
New Revision: 1751341

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

Modified:
    ofbiz/trunk/applications/content/template/cms/CMSSites.ftl
    ofbiz/trunk/applications/content/template/content/ContentSearchOptions.ftl

Modified: ofbiz/trunk/applications/content/template/cms/CMSSites.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/cms/CMSSites.ftl?rev=1751341&r1=1751340&r2=1751341&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/template/cms/CMSSites.ftl (original)
+++ ofbiz/trunk/applications/content/template/cms/CMSSites.ftl Mon Jul  4 
16:46:51 2016
@@ -163,16 +163,19 @@ function call_fieldlookup4(rootForumId,
   <a class="tabButton" 
href="<@ofbizUrl>CMSContentEdit?contentId=${content.contentId}&amp;nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>"
 >View</a>
           </td>
           <td>
-          <b>submitted:</b>
+          <label><b>submitted:</b>
           <input type="radio" name="statusId_o_${row}" 
value="CTNT_FINAL_DRAFT" checked="checked"/>
+          </label>
           </td>
           <td>
-          <b>publish:</b>
+          <label><b>publish:</b>
           <input type="radio" name="statusId_o_${row}" value="CTNT_PUBLISHED"/>
+          </label>
           </td>
           <td>
-          <b>reject:</b>
+          <label><b>reject:</b>
           <input type="radio" name="statusId_o_${row}" 
value="CTNT_DEACTIVATED"/>
+          </label>
           </td>
         </tr>
           <input type="hidden" name="contentId_o_${row}" 
value="${content.contentId}"/>

Modified: 
ofbiz/trunk/applications/content/template/content/ContentSearchOptions.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/content/ContentSearchOptions.ftl?rev=1751341&r1=1751340&r2=1751341&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/template/content/ContentSearchOptions.ftl 
(original)
+++ ofbiz/trunk/applications/content/template/content/ContentSearchOptions.ftl 
Mon Jul  4 16:46:51 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>
@@ -53,8 +53,8 @@ under the License.
                   </#list>
                   </select>
                   ${uiLabelMap.ContentIncludeAllSubContents}?
-                  ${uiLabelMap.CommonYes}<input type="radio" 
name="SEARCH_SUB_CONTENTS" value="Y" checked="checked"/>
-                  ${uiLabelMap.CommonNo}<input type="radio" 
name="SEARCH_SUB_CONTENTS" value="N"/>
+                  <label>${uiLabelMap.CommonYes}<input type="radio" 
name="SEARCH_SUB_CONTENTS" value="Y" checked="checked"/></label>
+                  <label>${uiLabelMap.CommonNo}<input type="radio" 
name="SEARCH_SUB_CONTENTS" value="N"/></label>
             </div>
           </td>
         </tr>
@@ -106,8 +106,8 @@ under the License.
                 <option 
value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option>
                 <option 
value="SortContentField:contentName">${uiLabelMap.FormFieldTitle_contentName}</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>
@@ -120,8 +120,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>