Author: diveshdutta
Date: Mon Jul 4 16:55:38 2016
New Revision: 1751344
URL: http://svn.apache.org/viewvc?rev=1751344&view=rev
Log:
[OFBIZ-7582] Catalog Component: Checkbox and Radio buttons should get selected
on clicking upon their labels.
Modified:
ofbiz/trunk/applications/product/template/category/CreateProductInCategoryStart.ftl
ofbiz/trunk/applications/product/template/category/EditCategory.ftl
ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
ofbiz/trunk/applications/product/template/find/AdvancedSearch.ftl
ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl
ofbiz/trunk/applications/product/template/price/EditProductPriceRules.ftl
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
ofbiz/trunk/applications/product/template/product/EditProductContent.ftl
ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
ofbiz/trunk/applications/product/template/product/EditProductQuickAdmin.ftl
ofbiz/trunk/applications/product/template/product/QuickAddVariants.ftl
Modified:
ofbiz/trunk/applications/product/template/category/CreateProductInCategoryStart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/category/CreateProductInCategoryStart.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/template/category/CreateProductInCategoryStart.ftl
(original)
+++
ofbiz/trunk/applications/product/template/category/CreateProductInCategoryStart.ftl
Mon Jul 4 16:55:38 2016
@@ -44,7 +44,9 @@ under the License.
<option
value="${productFeature.productFeatureId}">${productFeature.description}</option>
</#list>
</select>
- <input type="checkbox"
name="pftsel_${productFeatureTypeId}"/>${uiLabelMap.ProductSelectable}
+ <label>
+ <input type="checkbox"
name="pftsel_${productFeatureTypeId}"/>${uiLabelMap.ProductSelectable}
+ </label>
</div>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/template/category/EditCategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/category/EditCategory.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/category/EditCategory.ftl
(original)
+++ ofbiz/trunk/applications/product/template/category/EditCategory.ftl Mon Jul
4 16:55:38 2016
@@ -219,9 +219,9 @@ function insertImageName(type,nameValue)
<input type="file" size="50" name="fname"/>
<br />
<span>
- <input type="radio" name="upload_file_type_bogus"
value="category" checked="checked"
onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl}
- <input type="radio" name="upload_file_type_bogus"
value="linkOne"
onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl}
- <input type="radio" name="upload_file_type_bogus"
value="linkTwo"onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkTwo</@ofbizUrl>");'/>${uiLabelMap.ProductLinkTwoImageUrl}
+ <label><input type="radio"
name="upload_file_type_bogus" value="category" checked="checked"
onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl}</label>
+ <label><input type="radio"
name="upload_file_type_bogus" value="linkOne"
onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl}</label>
+ <label><input type="radio"
name="upload_file_type_bogus"
value="linkTwo"onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkTwo</@ofbizUrl>");'/>${uiLabelMap.ProductLinkTwoImageUrl}</label>
</span>
<input type="submit" class="smallSubmit"
value="${uiLabelMap.ProductUploadImage}"/>
</td></tr>
Modified: ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl
(original)
+++ ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl Mon
Jul 4 16:55:38 2016
@@ -31,7 +31,7 @@ under the License.
<td><b>${uiLabelMap.ProductFeatureType}</b></td>
<td><b>${uiLabelMap.ProductIdSeqNum}</b></td>
<td><b>${uiLabelMap.ProductIdCode}</b></td>
- <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox"
name="selectAll" value="Y" checked="checked"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'productFeatureTypeId_tableRow_', 'selectAllForm');" /></td>
+ <td align="right"><b><label>${uiLabelMap.CommonAll}<input
type="checkbox" name="selectAll" value="Y" checked="checked"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'productFeatureTypeId_tableRow_', 'selectAllForm');" /></label></b></td>
</tr>
<#assign rowClass = "2">
<#list 0..featureNum-1 as feature>
Modified:
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
(original)
+++
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
Mon Jul 4 16:55:38 2016
@@ -81,7 +81,7 @@ under the License.
<td><b>${uiLabelMap.ProductIdSeqNum}</b></td>
<td><b>${uiLabelMap.ProductIdCode}</b></td>
<td><b>${uiLabelMap.ProductAbbrev}</b></td>
- <td align="right"><b>${uiLabelMap.CommonAll}<input
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'productFeatureId_tableRow_', 'selectAllForm');" /></b></td>
+ <td align="right"><b><label>${uiLabelMap.CommonAll}<input
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'productFeatureId_tableRow_', 'selectAllForm');" /></label></b></td>
</tr>
<#if (listSize > 0)>
<#assign rowCount = 0>
Modified: ofbiz/trunk/applications/product/template/find/AdvancedSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/find/AdvancedSearch.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/find/AdvancedSearch.ftl (original)
+++ ofbiz/trunk/applications/product/template/find/AdvancedSearch.ftl Mon Jul
4 16:55:38 2016
@@ -37,8 +37,8 @@ under the License.
<td valign="middle">
<div>
<b>"${(searchCategory.description)!}"
[${(searchCategory.productCategoryId)!}]</b>
${uiLabelMap.ProductIncludeSubCategories}
- ${uiLabelMap.CommonYes}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" />
- ${uiLabelMap.CommonNo}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="N"/>
+ <label>${uiLabelMap.CommonYes}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /></label>
+ <label>${uiLabelMap.CommonNo}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="N"/></label>
</div>
</td>
</tr>
@@ -70,11 +70,11 @@ under the License.
<div>
<@htmlTemplate.lookupField
value="${requestParameters.SEARCH_CATEGORY_ID!}"
formName="advtokeywordsearchform" name="SEARCH_CATEGORY_ID"
id="SEARCH_CATEGORY_ID" fieldFormName="LookupProductCategory"/>
${uiLabelMap.ProductIncludeSubCategories}
- ${uiLabelMap.CommonYes}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/>
- ${uiLabelMap.CommonNo}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="N"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_CATEGORY_EXC" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_CATEGORY_EXC" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_CATEGORY_EXC" value="N"/>
+ <label>${uiLabelMap.CommonYes}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/></label>
+ <label>${uiLabelMap.CommonNo}<input type="radio"
name="SEARCH_SUB_CATEGORIES" value="N"/></label>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_CATEGORY_EXC" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_CATEGORY_EXC" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_CATEGORY_EXC" value="N"/></label>
</div>
</td>
</tr>
@@ -106,8 +106,8 @@ under the License.
<td valign="middle">
<div>
<input type="text" name="SEARCH_STRING" size="40"
value="${requestParameters.SEARCH_STRING!}"/>
- ${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>
@@ -118,21 +118,21 @@ under the License.
<td valign="middle">
<div>
<input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15"
value="${requestParameters.SEARCH_PROD_FEAT_CAT1!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC1" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC1" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC1" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC1" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC1" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC1" value="N"/></label>
</div>
<div>
<input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15"
value="${requestParameters.SEARCH_PROD_FEAT_CAT2!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC2" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC2" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC2" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC2" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC2" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC2" value="N"/></label>
</div>
<div>
<input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15"
value="${requestParameters.SEARCH_PROD_FEAT_CAT3!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC3" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC3" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC3" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC3" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC3" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_CAT_EXC3" value="N"/></label>
</div>
</td>
</tr>
@@ -143,21 +143,21 @@ under the License.
<td valign="middle">
<div>
<input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15"
value="${requestParameters.SEARCH_PROD_FEAT_GRP1!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC1" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC1" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC1" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC1" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC1" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC1" value="N"/></label>
</div>
<div>
<input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15"
value="${requestParameters.SEARCH_PROD_FEAT_GRP2!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC2" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC2" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC2" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC2" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC2" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC2" value="N"/></label>
</div>
<div>
<input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15"
value="${requestParameters.SEARCH_PROD_FEAT_GRP3!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC3" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC3" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC3" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC3" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC3" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_PROD_FEAT_GRP_EXC3" value="N"/></label>
</div>
</td>
</tr>
@@ -169,21 +169,21 @@ under the License.
<td valign="middle">
<div>
<input type="text" name="SEARCH_FEAT1" size="15"
value="${requestParameters.SEARCH_FEAT1!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_FEAT_EXC1" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_FEAT_EXC1" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_FEAT_EXC1" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_FEAT_EXC1" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_FEAT_EXC1" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_FEAT_EXC1" value="N"/></label>
</div>
<div>
<input type="text" name="SEARCH_FEAT2" size="15"
value="${requestParameters.SEARCH_FEAT2!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_FEAT_EXC2" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_FEAT_EXC2" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_FEAT_EXC2" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_FEAT_EXC2" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_FEAT_EXC2" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_FEAT_EXC2" value="N"/></label>
</div>
<div>
<input type="text" name="SEARCH_FEAT3" size="15"
value="${requestParameters.SEARCH_FEAT3!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_FEAT_EXC3" value="" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_FEAT_EXC3" value="Y"/>
- ${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_FEAT_EXC3" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_FEAT_EXC3" value="" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_FEAT_EXC3" value="Y"/></label>
+ <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio"
name="SEARCH_FEAT_EXC3" value="N"/></label>
</div>
</td>
</tr>
@@ -252,8 +252,8 @@ under the License.
<option
value="SortProductPrice:MINIMUM_PRICE">${uiLabelMap.ProductMinimumPrice}</option>
<option
value="SortProductPrice:MAXIMUM_PRICE">${uiLabelMap.ProductMaximumPrice}</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>
@@ -284,8 +284,8 @@ under the License.
</td>
<td>
<input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE"
size="60" maxlength="60"
value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE!}"/>
- ${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_GOOD_IDENTIFICATION_INCL" value="Y" checked="checked"/>
- ${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_GOOD_IDENTIFICATION_INCL" value="N"/>
+ <label>${uiLabelMap.CommonInclude}<input type="radio"
name="SEARCH_GOOD_IDENTIFICATION_INCL" value="Y" checked="checked"/></label>
+ <label>${uiLabelMap.CommonExclude}<input type="radio"
name="SEARCH_GOOD_IDENTIFICATION_INCL" value="N"/></label>
</td>
</tr>
<#if searchConstraintStrings?has_content>
@@ -299,8 +299,8 @@ under the License.
</#list>
<span
class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString}
<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/product/template/find/KeywordSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl (original)
+++ ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl Mon Jul 4
16:55:38 2016
@@ -69,7 +69,7 @@ under the License.
<table cellspacing="0" class="basic-table">
<tr>
- <td><input type="checkbox" name="selectAll" value="0"
onclick="javascript:toggleAll(this);"/> <b>${uiLabelMap.ProductProduct}</b></td>
+ <td><label><input type="checkbox" name="selectAll" value="0"
onclick="javascript:toggleAll(this);"/>
<b>${uiLabelMap.ProductProduct}</b></label></td>
<td align="right">
<b>
<#if 0 < viewIndex?int>
Modified:
ofbiz/trunk/applications/product/template/price/EditProductPriceRules.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/price/EditProductPriceRules.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/price/EditProductPriceRules.ftl
(original)
+++ ofbiz/trunk/applications/product/template/price/EditProductPriceRules.ftl
Mon Jul 4 16:55:38 2016
@@ -44,8 +44,8 @@ under the License.
<#assign saleRule = productPriceRule.isSale?? &&
productPriceRule.isSale == "Y">
<div>
<span
class="label"><b>${uiLabelMap.ProductNotifySale}</b></span>
- <input type="radio" name="isSale" value="Y" <#if
saleRule>checked="checked"</#if> />${uiLabelMap.CommonYes}
- <input type="radio" name="isSale" value="N" <#if
!saleRule>checked="checked"</#if> />${uiLabelMap.CommonNo}
+ <label><input type="radio" name="isSale" value="Y" <#if
saleRule>checked="checked"</#if> />${uiLabelMap.CommonYes}</label>
+ <label><input type="radio" name="isSale" value="N" <#if
!saleRule>checked="checked"</#if> />${uiLabelMap.CommonNo}</label>
<input type="submit" value="${uiLabelMap.CommonUpdate}" />
</div>
Modified:
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
(original)
+++
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
Mon Jul 4 16:55:38 2016
@@ -65,7 +65,7 @@ under the License.
<td><b>${uiLabelMap.CommonThruDate}</b></td>
<td><b>${uiLabelMap.ProductAmount}</b></td>
<td><b>${uiLabelMap.CommonSequence}</b></td>
- <td><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll"
value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this,
'selectAllForm');highlightAllRows(this, 'productFeatureId_tableRow_',
'selectAllForm');" /></td>
+ <td><b><label>${uiLabelMap.CommonAll}<input type="checkbox"
name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'productFeatureId_tableRow_', 'selectAllForm');" /></labe></b></td>
</tr>
<#assign rowCount = 0>
<#assign rowClass = "2">
Modified:
ofbiz/trunk/applications/product/template/product/EditProductContent.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/product/EditProductContent.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/product/EditProductContent.ftl
(original)
+++ ofbiz/trunk/applications/product/template/product/EditProductContent.ftl
Mon Jul 4 16:55:38 2016
@@ -192,11 +192,11 @@ under the License.
</td>
<td> </td>
<td width="80%" colspan="4" valign="top">
- <input type="radio" name="upload_file_type_bogus"
value="small"
onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>");'/>${uiLabelMap.CommonSmall}
- <input type="radio" name="upload_file_type_bogus"
value="medium"
onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=medium</@ofbizUrl>");'/>${uiLabelMap.CommonMedium}
- <input type="radio" name="upload_file_type_bogus"
value="large"onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=large</@ofbizUrl>");'/>${uiLabelMap.CommonLarge}
- <input type="radio" name="upload_file_type_bogus"
value="detail"
onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=detail</@ofbizUrl>");'/>${uiLabelMap.CommonDetail}
- <input type="radio" name="upload_file_type_bogus"
value="original" checked="checked"
onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=original</@ofbizUrl>");'/>${uiLabelMap.ProductOriginal}
+ <label><input type="radio" name="upload_file_type_bogus"
value="small"
onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>");'/>${uiLabelMap.CommonSmall}</label>
+ <label><input type="radio" name="upload_file_type_bogus"
value="medium"
onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=medium</@ofbizUrl>");'/>${uiLabelMap.CommonMedium}</label>
+ <label><input type="radio" name="upload_file_type_bogus"
value="large"onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=large</@ofbizUrl>");'/>${uiLabelMap.CommonLarge}</label>
+ <label><input type="radio" name="upload_file_type_bogus"
value="detail"
onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=detail</@ofbizUrl>");'/>${uiLabelMap.CommonDetail}</label>
+ <label><input type="radio" name="upload_file_type_bogus"
value="original" checked="checked"
onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=original</@ofbizUrl>");'/>${uiLabelMap.ProductOriginal}</label>
<input type="submit" class="smallSubmit"
value="${uiLabelMap.ProductUploadImage}"/>
</td>
</tr>
Modified:
ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
(original)
+++ ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
Mon Jul 4 16:55:38 2016
@@ -35,7 +35,7 @@ under the License.
<td><b>${uiLabelMap.ProductCategory}</b></td>
<td><b>${uiLabelMap.CommonFromDate}</b></td>
<td><b>${uiLabelMap.ProductThruDateAmountSequenceApplicationType}</b></td>
- <td><b>${uiLabelMap.CommonAll}<input type="checkbox"
name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'productFeatureId_tableRow_', 'selectAllForm');"/></b></td>
+ <td><b><label>${uiLabelMap.CommonAll}<input type="checkbox"
name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'productFeatureId_tableRow_', 'selectAllForm');"/></label></b></td>
</tr>
<#assign rowClass = "2">
<#list productFeatureAndAppls as productFeatureAndAppl>
Modified:
ofbiz/trunk/applications/product/template/product/EditProductQuickAdmin.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/product/EditProductQuickAdmin.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/product/EditProductQuickAdmin.ftl
(original)
+++ ofbiz/trunk/applications/product/template/product/EditProductQuickAdmin.ftl
Mon Jul 4 16:55:38 2016
@@ -134,7 +134,7 @@ function doPublish() {
(assocProduct.smallImageUrl! != "") &&
(assocProduct.smallImageUrl! == product.smallImageUrl!)) >
<#assign checked = "checked='checked'"/>
</#if>
- <td><input type="radio" ${checked} name="useImages"
value="${assocProduct.productId}"/></td>
+ <td><label><input type="radio" ${checked} name="useImages"
value="${assocProduct.productId}"/></label></td>
<#assign fromDate =
Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productAssoc.getTimestamp("fromDate").toString())/>
<td><a class="buttontext"
href="javascript:removeAssoc('${productAssoc.productIdTo}','${fromDate}');">x</a></td>
</tr>
Modified: ofbiz/trunk/applications/product/template/product/QuickAddVariants.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/product/QuickAddVariants.ftl?rev=1751344&r1=1751343&r2=1751344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/product/QuickAddVariants.ftl
(original)
+++ ofbiz/trunk/applications/product/template/product/QuickAddVariants.ftl Mon
Jul 4 16:55:38 2016
@@ -62,7 +62,7 @@ function clickAll(e) {
<td><b>${uiLabelMap.ProductNewProductCreate} !</b></td>
<td><b>${uiLabelMap.ProductSequenceNum}</b></td>
<td><b>${uiLabelMap.ProductExistingVariant} :</b></td>
- <td align="right"><b>${uiLabelMap.CommonAll}<input type="checkbox"
name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:clickAll(this);" /></b></td>
+ <td align="right"><b><label>${uiLabelMap.CommonAll}<input
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:clickAll(this);" /></label></b></td>
</tr>
<#assign defaultSequenceNum = 10>