svn commit: r1751348 - in /ofbiz/trunk/framework/webtools/template: datafile/ViewDataFile.ftl entity/CheckDb.ftl entity/EntityImport.ftl entity/EntityImportDir.ftl entity/EntityImportReaders.ftl labelmanager/SearchLabels.ftl

[diveshdutta]

Author: diveshdutta
Date: Mon Jul  4 17:09:30 2016
New Revision: 1751348

URL: http://svn.apache.org/viewvc?rev=1751348&view=rev
Log:
[OFBIZ-7667] Webtools : Checkbox and Radio buttons should get selected on clicking upon their labels. Thanks Ratnesh Upadhyay for your patch

Modified:
    ofbiz/trunk/framework/webtools/template/datafile/ViewDataFile.ftl
    ofbiz/trunk/framework/webtools/template/entity/CheckDb.ftl
    ofbiz/trunk/framework/webtools/template/entity/EntityImport.ftl
    ofbiz/trunk/framework/webtools/template/entity/EntityImportDir.ftl
    ofbiz/trunk/framework/webtools/template/entity/EntityImportReaders.ftl
    ofbiz/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl

Modified: ofbiz/trunk/framework/webtools/template/datafile/ViewDataFile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/datafile/ViewDataFile.ftl?rev=1751348&r1=1751347&r2=1751348&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/datafile/ViewDataFile.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/datafile/ViewDataFile.ftl Mon Jul  4 17:09:30 2016
@@ -24,7 +24,7 @@ under the License.
           <tr>
             <td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td>
             <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION!}" /></td>
-            <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if> /></td>
+            <td><label><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if> /></label></td>
           </tr>
           <tr>
             <td class="label">${uiLabelMap.WebtoolsDataDefinitionName}</td>
@@ -46,7 +46,7 @@ under the License.
           <tr>
             <td class="label">${uiLabelMap.WebtoolsDataFileName}</td>
             <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION!}" /></td>
-            <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if> /></td>
+            <td><label><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" id="datafile_is_url" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if> /></label></td>
           </tr>
           <tr>
             <td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td>

Modified: ofbiz/trunk/framework/webtools/template/entity/CheckDb.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/entity/CheckDb.ftl?rev=1751348&r1=1751347&r2=1751348&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/entity/CheckDb.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/entity/CheckDb.ftl Mon Jul  4 17:09:30 2016
@@ -20,11 +20,11 @@ under the License.
     <form method="post" action="${encodeURLCheckDb}">
         <input type="hidden" name="option" value="checkupdatetables"/>
         ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/>
-        &nbsp;<input type="checkbox" name="checkPks" value="true" checked="checked"/>&nbsp;${uiLabelMap.WebtoolsPks}
-        &nbsp;<input type="checkbox" name="checkFks" value="true"/>&nbsp;${uiLabelMap.WebtoolsFks}
-        &nbsp;<input type="checkbox" name="checkFkIdx" value="true"/>&nbsp;${uiLabelMap.WebtoolsFkIdx}
-        &nbsp;<input type="checkbox" name="addMissing" value="true"/>&nbsp;${uiLabelMap.WebtoolsAddMissing}
-        &nbsp;<input type="checkbox" name="repair" value="true"/>&nbsp;${uiLabelMap.WebtoolsRepairColumnSizes}
+        <label>&nbsp;<input type="checkbox" name="checkPks" value="true" checked="checked"/>&nbsp;${uiLabelMap.WebtoolsPks}</label>
+        <label>&nbsp;<input type="checkbox" name="checkFks" value="true"/>&nbsp;${uiLabelMap.WebtoolsFks}</label>
+        <label>&nbsp;<input type="checkbox" name="checkFkIdx" value="true"/>&nbsp;${uiLabelMap.WebtoolsFkIdx}</label>
+        <label>&nbsp;<input type="checkbox" name="addMissing" value="true"/>&nbsp;${uiLabelMap.WebtoolsAddMissing}</label>
+        <label>&nbsp;<input type="checkbox" name="repair" value="true"/>&nbsp;${uiLabelMap.WebtoolsRepairColumnSizes}</label>
         <input type="submit" value="${uiLabelMap.WebtoolsCheckUpdateDatabase}"/>
     </form>
     <p>${uiLabelMap.WebtoolsNoteUseAtYourOwnRisk}</p>

Modified: ofbiz/trunk/framework/webtools/template/entity/EntityImport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/entity/EntityImport.ftl?rev=1751348&r1=1751347&r2=1751348&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/entity/EntityImport.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/entity/EntityImport.ftl Mon Jul  4 17:09:30 2016
@@ -26,11 +26,11 @@ under the License.
     <input type="text" size="60" name="filename" value="${filename!}"/><br />
     ${uiLabelMap.WebtoolsAbsoluteFTLFilename}:<br />
     <input type="text" size="40" name="fmfilename" value="${fmfilename!}"/><br />
-    <input type="checkbox" name="isUrl" <#if isUrl??>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    <label><input type="checkbox" name="isUrl" <#if isUrl??>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}</label><br />
+    <label><input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}</label><br />
+    <label><input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</label><br />
+    <label><input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</label><br />
+    <label><input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}</label><br />
     ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
     <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
   </form>

Modified: ofbiz/trunk/framework/webtools/template/entity/EntityImportDir.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/entity/EntityImportDir.ftl?rev=1751348&r1=1751347&r2=1751348&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/entity/EntityImportDir.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/entity/EntityImportDir.ftl Mon Jul  4 17:09:30 2016
@@ -24,11 +24,11 @@ under the License.
   <form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
     ${uiLabelMap.WebtoolsAbsolutePath}:<br />
     <input type="text" size="60" name="path" value="${path!}"/><br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="deleteFiles" <#if (deleteFiles??)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    <label><input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}</label><br />
+    <label><input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</label><br />
+    <label><input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</label><br />
+    <label><input type="checkbox" name="deleteFiles" <#if (deleteFiles??)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}</label><br />
+    <label><input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}</label><br />
     ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
     ${uiLabelMap.WebtoolsPause}:<input type="text" size="6" value="${filePauseStr?default("0")}" name="filePause"/><br />
     <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>

Modified: ofbiz/trunk/framework/webtools/template/entity/EntityImportReaders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/entity/EntityImportReaders.ftl?rev=1751348&r1=1751347&r2=1751348&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/entity/EntityImportReaders.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/entity/EntityImportReaders.ftl Mon Jul  4 17:09:30 2016
@@ -23,10 +23,10 @@ under the License.
   <form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
     Enter Readers (comma separated, no spaces; from entityengine.xml and ofbiz-component.xml files; common ones include seed,ext,demo):<br />
     <input type="text" size="60" name="readers" value="${readers?default("seed")}"/><br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    <label><input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMostlyInserts}</label><br />
+    <label><input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}</label><br />
+    <label><input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}</label><br />
+    <label><input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}</label>R<br />
     ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
     <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImport}"/></div>
   </form>

Modified: ofbiz/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl?rev=1751348&r1=1751347&r2=1751348&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/labelmanager/SearchLabels.ftl Mon Jul  4 17:09:30 2016
@@ -74,16 +74,16 @@ under the License.
       </tr>
       <tr>
         <td class="label">
-          ${uiLabelMap.WebtoolsLabelManagerOnlyNotUsedLabels}
+          <label for="onlyNotUsedLabels">${uiLabelMap.WebtoolsLabelManagerOnlyNotUsedLabels}</label>
         </td>
         <td>
-          <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> />
+          <input type="checkbox" id="onlyNotUsedLabels" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> />
         </td>
         <td class="label">
-          ${uiLabelMap.WebtoolsLabelManagerOnlyMissingTranslations}
+          <label for="onlyMissingTranslations">${uiLabelMap.WebtoolsLabelManagerOnlyMissingTranslations}</label>
         </td>
         <td>
-          <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> />
+          <input type="checkbox" id="onlyMissingTranslations" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> />
         </td>
       </tr>
       <tr>