Author: diveshdutta
Date: Mon Jul 4 17:15:43 2016
New Revision: 1751350
URL: http://svn.apache.org/viewvc?rev=1751350&view=rev
Log:
[OFBIZ-7669] ebayStore: Checkbox and Radio buttons should get selected on
clicking upon their labels.Thanks Mohammad Kathwala for your patch
Modified:
ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl
ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl
ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl
ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl
Modified:
ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl?rev=1751350&r1=1751349&r2=1751350&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl
Mon Jul 4 17:15:43 2016
@@ -87,10 +87,14 @@ under the License.
<a target="_blank"
href="http://payments.sandbox.ebay.com/ws/eBayISAPI.dll?ViewPaymentStatus&transId=${leaveFeedback.transactionID}&ssPageName=STRK:MESOX:VPS&itemid=${leaveFeedback.itemID}";>order
details</a>
</td>
<td>
+ <label>
<input type="radio"
name="commentType${feedbackCounter}" value="positive"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Positive</span>
+ </label>
+ <label>
<input type="radio"
name="commentType${feedbackCounter}" checked="checked" value="none"
onclick="document.getElementById('rate${feedbackCounter}').style.display='none';"/><span>I'll
leave Feedback later</span>
+ </label>
<div id="rate${feedbackCounter}"
style="display:none">
<input type="text" value="" maxlength="80"
size="80" name="commentText${feedbackCounter}" label="Tell us more"/>
<br />80 characters left<br /><br />
@@ -118,14 +122,22 @@ under the License.
<a target="_blank"
href="http://payments.sandbox.ebay.com/ws/eBayISAPI.dll?ViewPaymentStatus&transId=${leaveFeedback.transactionID}&ssPageName=STRK:MESOX:VPS&itemid=${leaveFeedback.itemID}";>order
details</a>
</td>
<td>
+ <label>
<input type="radio"
name="commentType${feedbackCounter}" value="positive"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Positive</span>
+ </label>
+ <label>
<input type="radio"
name="commentType${feedbackCounter}" value="neutral"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Neutral</span>
+ </label>
+ <label>
<input type="radio"
name="commentType${feedbackCounter}" value="negative"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Negative</span>
+ </label>
+ <label>
<input type="radio"
name="commentType${feedbackCounter}" checked="checked" value="none"
onclick="document.getElementById('rate${feedbackCounter}').style.display='none';"/><span>I'll
leave Feedback later</span>
+ </label>
<div id="rate${feedbackCounter}" style="display:none">
<input type="text" value="" maxlength="80"
size="80" name="commentText${feedbackCounter}" label="Tell us more"/>
<br />80 characters left<br /><br />
@@ -150,28 +162,23 @@ under the License.
<table class="answers" width="100%"
border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="5" type="radio" />
- </td><td>Item was not
received</td>
+ <td
width="25"><label><input name="AqItemAsDescribedId${feedbackCounter}" value="5"
type="radio" /> Item was not received</label>
+ </td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="6" type="radio" /></td>
- <td>Quality did not match
item description</td>
+ <td
width="25"></label><input name="AqItemAsDescribedId${feedbackCounter}"
value="6" type="radio" />Quality did not match item description</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="2" type="radio" /></td>
- <td>Item was damaged</td>
+ <td
width="25"><label><input name="AqItemAsDescribedId${feedbackCounter}" value="2"
type="radio" />Item was damaged</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="1" type="radio" /></td>
- <td>Item was a
counterfeit, replica, or an unauthorized copy</td>
+ <td
width="25"><label><input name="AqItemAsDescribedId${feedbackCounter}" value="1"
type="radio" />Item was a counterfeit, replica, or an unauthorized
copy</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="3" type="radio" /></td>
- <td>Wrong item</td>
+ <td
width="25"><label><input name="AqItemAsDescribedId${feedbackCounter}" value="3"
type="radio" />Wrong item</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="4" type="radio"
checked="checked" /></td>
- <td>Other</td>
+ <td
width="25"><label><input name="AqItemAsDescribedId${feedbackCounter}" value="4"
type="radio" checked="checked" />Other</label></td>
</tr>
</tbody>
</table>
@@ -244,10 +251,14 @@ under the License.
<a target="_blank"
href="http://payments.sandbox.ebay.com/ws/eBayISAPI.dll?ViewPaymentStatus&transId=${leaveFeedback.transactionID}&ssPageName=STRK:MESOX:VPS&itemid=${leaveFeedback.itemID}";>order
details</a>
</td>
<td>
+ <label>
<input type="radio"
name="commentType${feedbackCounter}" value="positive"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Positive</span>
+ </label>
+ <label>
<input type="radio"
name="commentType${feedbackCounter}" checked="checked" value="none"
onclick="document.getElementById('rate${feedbackCounter}').style.display='none';"/><span>I'll
leave Feedback later</span>
+ </label>
<div id="rate${feedbackCounter}" style="display:none">
<input type="text" value="" maxlength="80"
size="80" name="commentText${feedbackCounter}" label="Tell us more"/>
<br />80 characters left<br /><br />
@@ -277,14 +288,22 @@ under the License.
<a target="_blank"
href="http://payments.sandbox.ebay.com/ws/eBayISAPI.dll?ViewPaymentStatus&transId=${leaveFeedback.transactionID}&ssPageName=STRK:MESOX:VPS&itemid=${leaveFeedback.itemID}";>order
details</a>
</td>
<td>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
value="positive"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Positive</span>
+ </label>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
value="neutral"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Neutral</span>
+ </label>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
value="negative"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Negative</span>
+ </label>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
checked="checked" value="none"
onclick="document.getElementById('rate${feedbackCounter}').style.display='none';"/><span>I'll
leave Feedback later</span>
+ </label>
<div id="rate${feedbackCounter}" style="display:none">
<input type="text" value="" maxlength="80" size="80"
name="commentText${feedbackCounter}" label="Tell us more"/>
<br />80 characters left<br /><br />
@@ -309,28 +328,23 @@ under the License.
<table class="answers" width="100%"
border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="5" type="radio" />
- </td><td>Item was not
received</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="5" type="radio" />Item was
not received</label>
+ </td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="6" type="radio" /></td>
- <td>Quality did not match item
description</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="6" type="radio" />Quality
did not match item description</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="2" type="radio" /></td>
- <td>Item was damaged</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="2" type="radio" />Item was
damaged</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="1" type="radio" /></td>
- <td>Item was a counterfeit,
replica, or an unauthorized copy</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="1" type="radio" />Item was
a counterfeit, replica, or an unauthorized copy</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="3" type="radio" /></td>
- <td>Wrong item</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="3" type="radio" />Wrong
item</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="4" type="radio"
checked="checked" /></td>
- <td>Other</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="4" type="radio"
checked="checked" />Other</label></td>
</tr>
</tbody>
</table>
@@ -402,19 +416,31 @@ under the License.
</td>
<td>
<#if leaveFeedback.role == "seller">
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
value="positive"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Positive</span>
+ </label>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
value="neutral"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Neutral</span>
+ </label>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
value="negative"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Negative</span>
+ </label>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
checked="checked" value="none"
onclick="document.getElementById('rate${feedbackCounter}').style.display='none';"/><span>I'll
leave Feedback later</span>
+ </label>
<#else>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
value="positive"
onclick="document.getElementById('rate${feedbackCounter}').style.display='block';"/><span>Positive</span>
+ </label>
+ <label>
<input type="radio" name="commentType${feedbackCounter}"
checked="checked" value="none"
onclick="document.getElementById('rate${feedbackCounter}').style.display='none';"/><span>I'll
leave Feedback later</span>
+ </label>
</#if>
<#if leaveFeedback.role == "seller">
<div id="rate${feedbackCounter}" style="display:none">
@@ -441,28 +467,23 @@ under the License.
<table class="answers" width="100%"
border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="5" type="radio" />
- </td><td>Item was not
received</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="5" type="radio" />Item was
not received</label>
+ </td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="6" type="radio" /></td>
- <td>Quality did not match item
description</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="6" type="radio" />Quality
did not match item description</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="2" type="radio" /></td>
- <td>Item was damaged</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="2" type="radio" />Item was
damaged</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="1" type="radio" /></td>
- <td>Item was a counterfeit,
replica, or an unauthorized copy</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="1" type="radio" />Item was
a counterfeit, replica, or an unauthorized copy</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="3" type="radio" /></td>
- <td>Wrong item</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="3" type="radio" />Wrong
item</label></td>
</tr>
<tr>
- <td width="25"><input
name="AqItemAsDescribedId${feedbackCounter}" value="4" type="radio"
checked="checked" /></td>
- <td>Other</td>
+ <td width="25"><label><input
name="AqItemAsDescribedId${feedbackCounter}" value="4" type="radio"
checked="checked" />Other</label></td>
</tr>
</tbody>
</table>
Modified:
ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl?rev=1751350&r1=1751349&r2=1751350&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl
Mon Jul 4 17:15:43 2016
@@ -124,8 +124,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>
Modified:
ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl?rev=1751350&r1=1751349&r2=1751350&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl
Mon Jul 4 17:15:43 2016
@@ -420,13 +420,12 @@ under the License.
<td><input type="text"
name="location" size="50" maxlength="50" value="${item.getLocation()!}" /></td>
</tr>
<tr>
- <td class="label"><b>Enable
auto-relist item</b></td>
- <td><input type="checkbox"
name="isAutoRelist" value="Y" <#if isAutoRelist ==
"Y">checked="checked"</#if>/></td>
+ <td class="label"><label><b>Enable
auto-relist item</b> <input type="checkbox" name="isAutoRelist" value="Y" <#if
isAutoRelist == "Y">checked="checked"</#if>/></label></td>
</tr>
<#if isReserve?? && isReserve == true>
<tr>
- <td class="label"><b>Require eBay
Inventory</b></td>
- <td><input type="checkbox"
name="requireEbayInventory" value="Y" <#if requireEbayInventory ==
"Y">checked="checked"</#if>/></td>
+ <td
class="label"><label><b>Require eBay Inventory</b> <input type="checkbox"
name="requireEbayInventory" value="Y" <#if requireEbayInventory ==
"Y">checked="checked"</#if>/></label></td>
+ <td></td>
</tr>
</#if>
<tr>
@@ -523,7 +522,7 @@ under the License.
<table align="left"
width="60%" height="100%" cellspacing="0">
<tr>
<td></td>
- <td><input
type="checkbox" value="Y" onclick="javascript:enabledItemTemplate(this.value);"
id="enabledTheme" name="enabledTheme" /><b>Add a theme</b></checkbox></td>
+ <td><label><input
type="checkbox" value="Y" onclick="javascript:enabledItemTemplate(this.value);"
id="enabledTheme" name="enabledTheme" /><b>Add a theme</b></label></td>
</tr>
<tr>
<td
class="label">Select Theme</td>
@@ -601,10 +600,10 @@ under the License.
<td
class="label"></td>
<td>
<#if
listingType.type.equals("Chinese")>
- <input
type="radio" name="listype" value="auction"/><b>${tabName!}</b>
+ <label><input
type="radio" name="listype" value="auction"/><b>${tabName!}</b></label>
<#--<input
type="checkbox" value="Y" name="enabledAuction_${id}"
/><b>${tabName!}</b></checkbox-->
<#elseif
listingType.type == "FixedPriceItem">
- <input
type="radio" name="listype" value="fixedprice"/><b>${tabName!}</b>
+ <label><input
type="radio" name="listype" value="fixedprice"/><b>${tabName!}</b></label>
<#--input
type="checkbox" value="Y" name="enabledFixedPrice_${id}"
/><b>${tabName!}</b></checkbox-->
</#if>
</td>
@@ -678,7 +677,7 @@ under the License.
<#if
listingType.type.equals("FixedPriceItem") >
<tr>
<td
class="label"></td><!-- use when fixed price and store fixed price -->
- <td><input
type="checkbox" value="true" name="enableBestOffer_${id}" /><b>Enable Best
Offer</b></td>
+ <td><label><input
type="checkbox" value="true" name="enableBestOffer_${id}" /><b>Enable Best
Offer</b></label></td>
<td class="label"></td>
<td><br /></td>
</tr>
@@ -720,8 +719,7 @@ under the License.
<#if
paymentMethod.compareTo(buyerPayMethCode_PAY_PAL!) == 0 >
<#assign is_payPal = true>
</#if>
- <td
valign="top"><input type="checkbox" value="true"
name="Payments_${paymentMethod.value()!}" /></td>
- <td
align="left"><b>${paymentMethod.value()!}</b></td>
+ <td
valign="top"></label><input type="checkbox" value="true"
name="Payments_${paymentMethod.value()!}" />
<b>${paymentMethod.value()!}</b></label></td>
<#if j
== 3>
</tr>
<#assign j = 0>
@@ -795,8 +793,7 @@ under the License.
<#list
shippingLocationDetails as shippingLocationDetail>
<#assign
shippingLocation = shippingLocationDetail.getShippingLocation()!>
<#if j==0><tr></#if>
- <td
valign="top"><input type="checkbox" value="true"
name="Shipping_${shippingLocation!}" /></td>
- <td
align="left"><b>${shippingLocationDetail.getDescription()!}</b></td>
+ <td
valign="top"><label><input type="checkbox" value="true"
name="Shipping_${shippingLocation!}"
/><b>${shippingLocationDetail.getDescription()!}</b></label></td>
<#if
j==3></tr><#assign j=0><#else><#assign j=j+1></#if>
</#list>
</table>
Modified: ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl?rev=1751350&r1=1751349&r2=1751350&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl Mon
Jul 4 17:15:43 2016
@@ -167,8 +167,8 @@ under the License.
<td class="label" align="right" valign="middle"></td>
<td valign="middle">
<div onclick="javascript:switchTheme();">
- <input type="radio" name="storeThemeType" <#if themeType!
== "Basic">checked="checked"</#if> value="Basic" default="default" /> Basic
Theme
- <input type="radio" name="storeThemeType" <#if themeType!
== "Advanced">checked="checked"</#if> value="Advanced" /> Advanced Theme
+ <label><input type="radio" name="storeThemeType" <#if
themeType! == "Basic">checked="checked"</#if> value="Basic" default="default"
/> Basic Theme</label>
+ <label><input type="radio" name="storeThemeType" <#if
themeType! == "Advanced">checked="checked"</#if> value="Advanced" /> Advanced
Theme</label>
</div>
</td>
</tr>
