OFBiz › OFBiz - Commits

svn commit: r1847363 - in /ofbiz/ofbiz-plugins/trunk/ecommerce/template: cart/ catalog/ content/ customer/ customer/profile/ order/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

akashjain

svn commit: r1847363 - in /ofbiz/ofbiz-plugins/trunk/ecommerce/template: cart/ catalog/ content/ customer/ customer/profile/ order/

Author: akashjain
Date: Sat Nov 24 13:07:42 2018
New Revision: 1847363

URL: http://svn.apache.org/viewvc?rev=1847363&view=rev
Log:
Improved: Corrected all the checkboxes and radio buttons in all the ecommerce FTLs, applied patch from jira issue.
(OFBIZ-7670)
Thanks, Chandrashekhar Dhakad for your contribution.

Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductReview.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/SearchContent.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditCreditCard.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditBillToAddress.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditPostalAddress.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditShipToAddress.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/NewCustomer.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutOptions.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingAddress.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustomerTaxInfo.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OnePageCheckoutProcess.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonCustSettings.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl Sat Nov 24 13:07:42 2018
@@ -569,11 +569,11 @@ under the License.
</tr>
<tr>
<td colspan="8">
- <label class="form-check-label">
- <input type="checkbox" onclick="javascript:document.cartform.submit()"
+ <div class="form-check">
+ <input type="checkbox" class="form-check-input" onclick="javascript:document.cartform.submit()"
name="alwaysShowcart" <#if shoppingCart.viewCartOnAdd()>checked="checked"</#if>/>
- ${uiLabelMap.EcommerceAlwaysViewCartAfterAddingAnItem}.
- </label>
+ <label>${uiLabelMap.EcommerceAlwaysViewCartAfterAddingAnItem}.</label>
+ </div>
</td>
</tr>
</tfoot>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl Sat Nov 24 13:07:42 2018
@@ -553,9 +553,9 @@ ${virtualJavaScript!}
<#if renderSingleChoiceWithRadioButtons?? && "Y" == renderSingleChoiceWithRadioButtons>
<#-- This is the radio button implementation -->
<#if !question.isMandatory()>
- <div>
- <input type="radio" name='${counter}' value='<#if !question.isSelected()>checked</#if>'/>
- No option
+ <div class="form-check">
+ <input type="radio" class="form-check-input" name='${counter}' value='<#if !question.isSelected()>checked</#if>'/>
+ <label>No option</label>
</div>
</#if>
<#assign optionCounter = 0>
@@ -568,11 +568,11 @@ ${virtualJavaScript!}
</#if>
<#-- Render virtual compoennts -->
<#if option.hasVirtualComponent()>
- <div>
- <input type='radio' name='${counter}' id="${counter}_${optionCounter}"
+ <div class="form-check">
+ <input type='radio' name='${counter}' class="form-check-input" id="${counter}_${optionCounter}"
value='${optionCounter}'
onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');"/>
- ${option.description} <#if !option.isAvailable()> (*)</#if>
+ <label>${option.description} <#if !option.isAvailable()> (*)</#if>
<#assign components = option.getComponents()>
<#list components as component>
<#if (option.isVirtualComponent(component))>
@@ -583,17 +583,19 @@ ${virtualJavaScript!}
<#assign componentCounter = componentCounter + 1>
</#if>
</#list>
+ </label>
</div>
<#else>
- <div>
- <input type="radio" name='${counter}' value='${optionCounter}'
+ <div class="form-check">
+ <input type="radio" name='${counter}' class="form-check-input" value='${optionCounter}'
<#if option.isSelected() || (!question.isSelected() && optionCounter == 0 && question.isMandatory())>checked="checked"</#if>/>
- ${option.description} 
+ <label>${option.description} 
<#if (shownPrice > 0)>+<@ofbizCurrency amount=shownPrice isoCode=price.currencyUsed/>
 </#if>
<#if (shownPrice < 0)>-<@ofbizCurrency amount=(-1*shownPrice) isoCode=price.currencyUsed/>
 </#if>
<#if !option.isAvailable()>(*)</#if>
+ </label>
</div>
</#if>
<#assign optionCounter = optionCounter + 1>
@@ -635,11 +637,11 @@ ${virtualJavaScript!}
<#assign componentCounter = 0>
<#-- Render virtual compoennts -->
<#if option.hasVirtualComponent()>
- <div>
- <input type='CHECKBOX' name='${counter}' id="${counter}_${optionCounter}"
+ <div class="form-check">
+ <input type='CHECKBOX' name='${counter}' class="form-check-input" id="${counter}_${optionCounter}"
value='${optionCounter}'
onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');"/>
- ${option.description} <#if !option.isAvailable()> (*)</#if>
+ <label>${option.description} <#if !option.isAvailable()> (*)</#if>
<#assign components = option.getComponents()>
<#list components as component>
<#if (option.isVirtualComponent(component))>
@@ -650,13 +652,15 @@ ${virtualJavaScript!}
<#assign componentCounter = componentCounter + 1>
</#if>
</#list>
+ </label>
</div>
<#else>
- <div>
- <input type='CHECKBOX' name='${counter}'
+ <div class="form-check">
+ <input type='CHECKBOX' name='${counter}' class="form-check-input"
value='${optionCounter}' <#if option.isSelected()>checked="checked"</#if>/>
- ${option.description} +<@ofbizCurrency amount=option.price isoCode=price.currencyUsed/>
+ <label>${option.description} +<@ofbizCurrency amount=option.price isoCode=price.currencyUsed/>
<#if !option.isAvailable()> (*)</#if>
+ </label>
</div>
</#if>
<#assign optionCounter = optionCounter + 1>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl Sat Nov 24 13:07:42 2018
@@ -46,10 +46,12 @@ under the License.
</#if>
<div class="form-group">
<div class="form-check">
- <label class="form-check-label" for="SEARCH_OPERATOR_OR"><input type="radio" class="form-check-input" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if "OR" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAny}</label>
+ <input type="radio" class="form-check-input" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if "OR" == searchOperator>checked="checked"</#if> />
+ <label class="form-check-label" for="SEARCH_OPERATOR_OR">${uiLabelMap.CommonAny}</label>
</div>
<div class="form-check">
- <label class="form-check-label" for="SEARCH_OPERATOR_AND"><input type="radio" class="form-check-input" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if "AND" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAll}</label>
+ <input type="radio" class="form-check-input" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if "AND" == searchOperator>checked="checked"</#if> />
+ <label class="form-check-label" for="SEARCH_OPERATOR_AND">${uiLabelMap.CommonAll}</label>
</div>
</div>
<div class="form-group">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductReview.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductReview.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductReview.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductReview.ftl Sat Nov 24 13:07:42 2018
@@ -25,38 +25,38 @@ under the License.
<input type="hidden" name="product_id" value="${requestParameters.product_id}" />
<input type="hidden" name="category_id" value="${requestParameters.category_id}" />
<div>
- <span><label for="one">${uiLabelMap.EcommerceRating}:</label></span>
- <span>
- <label for="one">1</label>
- <input type="radio" id="one" name="productRating" value="1.0" />
- </span>
- <span>
- <label for="two">2</label>
- <input type="radio" id="two" name="productRating" value="2.0" />
- </span>
- <span>
- <label for="three">3</label>
- <input type="radio" id="three" name="productRating" value="3.0" />
- </span>
- <span>
- <label for="four">4</label>
- <input type="radio" id="four" name="productRating" value="4.0" />
- </span>
- <span>
- <label for="five">5</label>
- <input type="radio" id="five" name="productRating" value="5.0" />
- </span>
+ <label for="one">${uiLabelMap.EcommerceRating}:</label>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" id="one" name="productRating" value="1.0" />
+ <label class="form-check-label" for="one">1</label>
+ </div>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" id="two" name="productRating" value="2.0" />
+ <label class="form-check-label" for="two">2</label>
+ </div>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" id="three" name="productRating" value="3.0" />
+ <label class="form-check-label" for="three">3</label>
+ </div>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" id="four" name="productRating" value="4.0" />
+ <label class="form-check-label" for="four">4</label>
+ </div>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" id="five" name="productRating" value="5.0" />
+ <label class="form-check-label" for="five">5</label>
+ </div>
</div>
<div>
- <span><label for="yes">${uiLabelMap.EcommercePostAnonymous}:</label></span>
- <span>
- <label for="yes">${uiLabelMap.CommonYes}</label>
- <input type="radio" id="yes" name="postedAnonymous" value="Y" />
- </span>
- <span>
- <label for="no">${uiLabelMap.CommonNo}</label>
- <input type="radio" id="no" name="postedAnonymous" value="N" checked="checked" />
- </span>
+ <label for="yes">${uiLabelMap.EcommercePostAnonymous}:</label>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" id="yes" name="postedAnonymous" value="Y" />
+ <label class="form-check-label" for="yes">${uiLabelMap.CommonYes}</label>
+ </div>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" id="no" name="postedAnonymous" value="N" checked="checked" />
+ <label class="form-check-label" for="no">${uiLabelMap.CommonNo}</label>
+ </div>
</div>
<div>
<label for="review">${uiLabelMap.CommonReview}:</label>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/SearchContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/SearchContent.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/SearchContent.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/SearchContent.ftl Sat Nov 24 13:07:42 2018
@@ -38,9 +38,11 @@ under the License.
<div>${uiLabelMap.ProductFeatures}:</div>
</td>
<td align="right" valign="middle">
- <div>
- ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all" value="all" checked="checked" />
- ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all" value="any" />
+ <div class="form-check form-check-inline">
+ <input class="form-check-input" type="radio" name="any_or_all" value="all" checked="checked" /><label class="form-check-label">${uiLabelMap.CommonAll}</label>
+ </div>
+ <div class="form-check form-check-inline">
+ <input class="form-check-input" type="radio" name="any_or_all" value="any" /><label class="form-check-label">${uiLabelMap.CommonAny}</label>
</div>
</td>
</tr>
@@ -77,11 +79,13 @@ under the License.
<div> - ${searchConstraintString}</div>
</#list>
<div>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div>
- <div>
- ${uiLabelMap.ProductNewSearch}
- <input type="radio" name="clearSearch" value="Y" checked="checked" />
- ${uiLabelMap.CommonRefineSearch}
- <input type="radio" name="clearSearch" value="N" />
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" name="clearSearch" value="Y" checked="checked" />
+ <label class="form-check-label">${uiLabelMap.ProductNewSearch}</label>
+ </div>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" name="clearSearch" value="N" />
+ <label class="form-check-label">${uiLabelMap.CommonRefineSearch}</label>
</div>
</td>
</tr>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditCreditCard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditCreditCard.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditCreditCard.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditCreditCard.ftl Sat Nov 24 13:07:42 2018
@@ -43,8 +43,9 @@ under the License.
<#assign hasCurrent = true />
<div class="row">
<div class="col-sm-6">
- <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked"/>
- <label>${uiLabelMap.PartyUseCurrentAddress}:</label>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" name="contactMechId" value="${curContactMechId}" checked="checked"/>
+ <label>${uiLabelMap.PartyUseCurrentAddress}:
<#list curPartyContactMechPurposes as curPartyContactMechPurpose>
<#assign curContactMechPurposeType =
curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
@@ -67,6 +68,8 @@ under the License.
<#if curPartyContactMech.thruDate??>
${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}
</#if>
+ </label>
+ </div>
</div>
</div>
<#else>
@@ -90,7 +93,9 @@ under the License.
<#assign partyContactMech = postalAddressInfo.partyContactMech />
<div class="row">
<div class="col-sm-6">
- <input type="radio" name="contactMechId" value="${contactMech.contactMechId}"/>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" name="contactMechId" value="${contactMech.contactMechId}"/>
+ <label>
<#list partyContactMechPurposes as partyContactMechPurpose>
<#assign contactMechPurposeType =
partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
@@ -99,7 +104,7 @@ under the License.
(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})
</#if>
</#list>
- <#if postalAddress.toName??><label>${uiLabelMap.CommonTo}: ${postalAddress.toName}</label></#if>
+ <#if postalAddress.toName??>${uiLabelMap.CommonTo}: ${postalAddress.toName}</#if>
<#if postalAddress.attnName??>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}</#if>
${postalAddress.address1!}
<#if postalAddress.address2??>${postalAddress.address2}</#if>
@@ -113,14 +118,16 @@ under the License.
<#if partyContactMech.thruDate??>
${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}
</#if>
+ </label>
+ </div>
</div>
</div>
</#list>
<#if !postalAddressInfos?has_content && !curContactMech??>
<label>${uiLabelMap.PartyNoContactInformation}.</label>
</#if>
- <div class="input-group">
- <input type="radio" class="mr-2" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked="checked"</#if>/>
+ <div class="form-check">
+ <input type="radio" class="form-check-input mr-2" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked="checked"</#if>/>
<label>${uiLabelMap.PartyCreateNewBillingAddress}.</label>
</div>
</div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl Sat Nov 24 13:07:42 2018
@@ -406,9 +406,9 @@ will generally always be reserved for th
<@fieldErrors fieldName="USERNAME"/>
<#if !requestParameters.preferredUsername?has_content>
<div class="form-check">
- <label class="form-check-label"></label>
- <input type="checkbox" name="UNUSEEMAIL" class="checkbox form-check-input" id="UNUSEEMAIL" value="on"
- onclick="setEmailUsername();" onfocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress}
+ <input type="checkbox" name="UNUSEEMAIL" class="form-check-input" id="UNUSEEMAIL" value="on"
+ onclick="setEmailUsername();" onfocus="setLastFocused(this);"/>
+ <label>${uiLabelMap.EcommerceUseEmailAddress}</label>
</div>
</#if>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditBillToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditBillToAddress.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditBillToAddress.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditBillToAddress.ftl Sat Nov 24 13:07:42 2018
@@ -100,10 +100,10 @@ under the License.
value="${extension?default("${billToExtension!}")}" size="3" maxlength="3"/>
</div>
</#if>
- <div class="inline">
- <label for="setShippingPurposeForBilling">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
- <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForBilling" value="Y"
+ <div class="form-check">
+ <input type="checkbox" name="setShippingPurpose" class="form-check-input" id="setShippingPurposeForBilling" value="Y"
<#if setShippingPurpose??>checked="checked"</#if>/>
+ <label for="setShippingPurposeForBilling">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
</div>
<#--
<div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditPostalAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditPostalAddress.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditPostalAddress.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditPostalAddress.ftl Sat Nov 24 13:07:42 2018
@@ -81,15 +81,15 @@ under the License.
<span id="advice-required-stateProvinceGeoId_${contactMech.contactMechId}" style="display: none"
class="errorMessage">(${uiLabelMap.CommonRequired})</span>
</div>
- <div class="inline">
- <label for="setBillingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
- <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForPostalAddress" value="Y"
+ <div class="form-check">
+ <input type="checkbox" name="setBillingPurpose" class="form-check-input" id="setBillingPurposeForPostalAddress" value="Y"
<#if setBillingPurpose??>checked="checked"</#if>/>
+ <label for="setBillingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
</div>
- <div class="inline">
- <label for="setShippingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
- <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForPostalAddress" value="Y"
+ <div class="form-check">
+ <input type="checkbox" name="setShippingPurpose" class="form-check-input" id="setShippingPurposeForPostalAddress" value="Y"
<#if setShippingPurpose??>checked="checked"</#if>/>
+ <label for="setShippingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
</div>
<#--
<div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditShipToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditShipToAddress.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditShipToAddress.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/EditShipToAddress.ftl Sat Nov 24 13:07:42 2018
@@ -98,10 +98,10 @@ under the License.
maxlength="3"/>
</div>
</#if>
- <div class="inline">
- <label for="setBillingPurposeForShipping">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
- <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y"
+ <div class="form-check">
+ <input type="checkbox" name="setBillingPurpose" class="form-check-input" id="setBillingPurposeForShipping" value="Y"
<#if setBillingPurpose??>checked="checked"</#if>/>
+ <label for="setBillingPurposeForShipping">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
</div>
<#--
<div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl Sat Nov 24 13:07:42 2018
@@ -85,15 +85,15 @@ under the License.
</#if>
</select>
</div>
- <div class="inline">
- <label for="setBillingPurpose">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
- <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y"
+ <div class="form-check">
+ <input type="checkbox" name="setBillingPurpose" class="form-check-input" id="setBillingPurpose" value="Y"
<#if setBillingPurpose??>checked="checked"</#if>/>
+ <label for="setBillingPurpose">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
</div>
- <div class="inline">
- <label for="setShippingPurpose">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
- <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y"
+ <div class="form-check">
+ <input type="checkbox" name="setShippingPurpose" class="form-check-input" id="setShippingPurpose" value="Y"
<#if setShippingPurpose??>checked="checked"</#if>/>
+ <label for="setShippingPurpose">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
</div>
</fieldset>
</form>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/NewCustomer.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/NewCustomer.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/NewCustomer.ftl Sat Nov 24 13:07:42 2018
@@ -173,8 +173,8 @@ under the License.
- <input type="text" name="shipToExtension" id="shipToExtension"
value="${extension?default("${parameters.shipToExtension!}")}" size="3" maxlength="3"/>
</div>
- <div class="inline">
- <input type="checkbox" class="checkbox" name="useShippingAddressForBilling" id="useShippingAddressForBilling"
+ <div class="form-check">
+ <input type="checkbox" class="form-check-input" name="useShippingAddressForBilling" id="useShippingAddressForBilling"
value="Y" <#if parameters.useShippingAddressForBilling?has_content &&
parameters.useShippingAddressForBilling?default("")=="Y">checked="checked"</#if>/>
<label for="useShippingAddressForBilling">${uiLabelMap.FacilityBillingAddressSameShipping}</label>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutOptions.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutOptions.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutOptions.ftl Sat Nov 24 13:07:42 2018
@@ -107,7 +107,7 @@ function submitForm(form, mode, value) {
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<div class="form-check">
- <input type="radio" name="shipping_contact_mech_id" id="shipping_contact_mech_id" value="${shippingAddress.contactMechId}" onclick="javascript:submitForm(document.checkoutInfoForm, 'SA', null);"<#if shoppingCart.getShippingContactMechId()?default("") == shippingAddress.contactMechId> checked="checked"</#if>/>
+ <input type="radio" name="shipping_contact_mech_id" class="form-check-input" id="shipping_contact_mech_id" value="${shippingAddress.contactMechId}" onclick="javascript:submitForm(document.checkoutInfoForm, 'SA', null);"<#if shoppingCart.getShippingContactMechId()?default("") == shippingAddress.contactMechId> checked="checked"</#if>/>
<label for="shipping_contact_mech_id">
<#if shippingAddress.toName?has_content><strong>${uiLabelMap.CommonTo}:</strong> ${shippingAddress.toName}</#if>
<#if shippingAddress.attnName?has_content><strong>${uiLabelMap.PartyAddrAttnName}:</strong> ${shippingAddress.attnName}</#if>
@@ -141,7 +141,7 @@ function submitForm(form, mode, value) {
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
<div class="col-lg-4 col-sm-6">
<div class="form-check">
- <input type="radio" name="shipping_method" id="shipping_method_${carrierShipmentMethod_index}" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
+ <input type="radio" name="shipping_method" class="form-check-input" id="shipping_method_${carrierShipmentMethod_index}" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
<label for="shipping_method_${carrierShipmentMethod_index}">
<#if shoppingCart.getShippingContactMechId()??>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
@@ -154,20 +154,19 @@ function submitForm(form, mode, value) {
</#list>
</div>
<#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
- <label>
- <input type="radio" name="shipping_method" value="Default" checked="checked"/>
- ${uiLabelMap.OrderUseDefault}.
- </label>
+ <div class="form-check">
+ <input type="radio" name="shipping_method" class="form-check-input" value="Default" checked="checked"/>
+ <label>${uiLabelMap.OrderUseDefault}.</label>
+ </div>
</#if>
<h5>${uiLabelMap.OrderShipAllAtOnce}?</h5>
- <label>
- <input type="radio" <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name="may_split" value="false"/>
- ${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.
- </label>
- <label>
- <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" name="may_split" value="true"/>
- ${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.
- </label>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name="may_split" value="false"/>
+ <label>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</label>
+ </div>
+ <div class="form-check">
+ <input class="form-check-input" <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" name="may_split" value="true"/>
+ <label>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</label>
<#else>
<input type="hidden" name="shipping_method" value="NO_SHIPPING@_NA_"/>
<input type="hidden" name="may_split" value="false"/>
@@ -179,11 +178,13 @@ function submitForm(form, mode, value) {
<#if productStore.showCheckoutGiftOptions! != "N" && giftEnable! != "N">
<div>
<h5>${uiLabelMap.OrderIsThisGift}</h5>
- <div class="form-check">
- <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name="is_gift" id="is_gift" value="true">
- <label for="is_gift">${uiLabelMap.CommonYes}</label>
- <input type="radio" <#if "N" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name="is_gift" id="is_not_gift" value="false">
- <label for="is_not_gift">${uiLabelMap.CommonNo}</label>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" <#if "Y" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name="is_gift" id="is_gift" value="true">
+ <label class="form-check-label" for="is_gift">${uiLabelMap.CommonYes}</label>
+ </div>
+ <div class="form-check form-check-inline">
+ <input type="radio" class="form-check-input" <#if "N" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name="is_gift" id="is_not_gift" value="false">
+ <label class="form-check-label" for="is_not_gift">${uiLabelMap.CommonNo}</label>
</div>
</div>
<h5>${uiLabelMap.OrderGiftMessage}</h5>
@@ -229,25 +230,25 @@ function submitForm(form, mode, value) {

<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
<div class="form-check">
- <input type="radio" id="checkOutEXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if>/>
+ <input type="radio" id="checkOutEXT_OFFLINE" class="form-check-input" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutEXT_OFFLINE">${uiLabelMap.OrderMoneyOrder}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_COD??>
<div class="form-check">
- <input type="radio" id="checkOutEXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/>
+ <input type="radio" id="checkOutEXT_COD" class="form-check-input" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutEXT_COD">${uiLabelMap.OrderCOD}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??>
<div class="form-check">
- <input type="radio" id="checkOutEXT_WORLDPAY" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if>/>
+ <input type="radio" id="checkOutEXT_WORLDPAY" class="form-check-input" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutEXT_WORLDPAY">${uiLabelMap.AccountingPayWithWorldPay}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
<div class="form-check">
- <input type="radio" id="checkOutEXT_PAYPAL" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if>/>
+ <input type="radio" id="checkOutEXT_PAYPAL" class="form-check-input" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutEXT_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label>
</div>
</#if>
@@ -255,7 +256,7 @@ function submitForm(form, mode, value) {
<#-- financial accounts -->
<#list finAccounts as finAccount>
<div class="form-check">
- <input type="radio" name="checkOutFIN_ACCOUNT${finAccount.finAccountId}" value="FIN_ACCOUNT|${finAccount.finAccountId}" <#if "FIN_ACCOUNT" == checkOutPaymentId>checked="checked"</#if>/>
+ <input type="radio" class="form-check-input" name="checkOutFIN_ACCOUNT${finAccount.finAccountId}" value="FIN_ACCOUNT|${finAccount.finAccountId}" <#if "FIN_ACCOUNT" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutFIN_ACCOUNT${finAccount.finAccountId}">${uiLabelMap.AccountingFinAccount} #${finAccount.finAccountId}</label>
</div>
</#list>
@@ -270,7 +271,7 @@ function submitForm(form, mode, value) {
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
<#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
<div class="form-check">
- <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
+ <input type="radio" class="form-check-input" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
<label>CC: ${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</label>
</div>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EC', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
@@ -281,7 +282,7 @@ function submitForm(form, mode, value) {
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
<#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
<div class="form-check">
- <input type="radio" name="checkOutPaymentId" id="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
+ <input type="radio" class="form-check-input" name="checkOutPaymentId" id="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
<label for="checkOutPaymentId">${uiLabelMap.AccountingEFTAccount}: ${eftAccount.bankName!}: ${eftAccount.accountNumber!}</label>
</div>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
@@ -306,11 +307,11 @@ function submitForm(form, mode, value) {
</#if>
</#if>
</#if>
-
- <label>
- <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
- <span>${uiLabelMap.AccountingGift}: ${giftCardNumber}</span>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
+ <label>${uiLabelMap.AccountingGift}: ${giftCardNumber}
</label>
+ </div>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EG', '${paymentMethod.paymentMethodId}');" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>
<#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
</#if>
@@ -339,7 +340,7 @@ function submitForm(form, mode, value) {

<#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
<div class="form-check">
- <input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y"/>
+ <input type="checkbox" class="form-check-input" id="addGiftCard" name="addGiftCard" value="Y"/>
<label for="addGiftCard">${uiLabelMap.AccountingUseGiftCardNotOnFile}</label>
</div>
<div class="form-group">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl Sat Nov 24 13:07:42 2018
@@ -83,30 +83,26 @@ function submitForm(form, mode, value) {
<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
</div>
<div class="form-check">
- <label class="form-check-label" for="checkOutPaymentId_OFFLINE">
<input type="radio" class="form-check-input" id="checkOutPaymentId_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if> />
- ${uiLabelMap.OrderMoneyOrder}</label>
+ <label for="checkOutPaymentId_OFFLINE">${uiLabelMap.OrderMoneyOrder}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_COD??>
<div class="form-check">
- <label class="form-check-label" for="checkOutPaymentId_COD">
<input class="form-check-input" type="radio" id="checkOutPaymentId_COD" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if> />
- ${uiLabelMap.OrderCOD}</label>
+ <label for="checkOutPaymentId_COD">${uiLabelMap.OrderCOD}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??>
<div class="form-check">
- <label class="form-check-label" for="checkOutPaymentId_WORLDPAY">
<input class="form-check-input" type="radio" id="checkOutPaymentId_WORLDPAY" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if> />
- ${uiLabelMap.AccountingPayWithWorldPay}</label>
+ <label for="checkOutPaymentId_WORLDPAY">${uiLabelMap.AccountingPayWithWorldPay}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
<div class="form-check">
- <label class="form-check-label" for="checkOutPaymentId_PAYPAL">
<input class="form-check-input" type="radio" id="checkOutPaymentId_PAYPAL" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if> />
- ${uiLabelMap.AccountingPayWithPayPal}</label>
+ <label for="checkOutPaymentId_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label>
</div>
</#if>
<hr>
@@ -137,9 +133,9 @@ function submitForm(form, mode, value) {
</#if>

<div>
- <input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> />
- <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingGift}:${giftCardNumber}</label>
- <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" class="form-check-input" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> />
+ <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingGift}:${giftCardNumber}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if></label>
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EG', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
<strong>${uiLabelMap.OrderBillUpTo}:</strong> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)><@ofbizAmount amount=cart.getPaymentAmount(paymentMethod.paymentMethodId)!/></#if>"/>
</div>
@@ -148,9 +144,9 @@ function submitForm(form, mode, value) {
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
<#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false) />
<div>
- <input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> />
- <label for="checkOutPayment_${paymentMethod.paymentMethodId}">CC:${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</label>
- <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" class="form-check-input" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> />
+ <label for="checkOutPayment_${paymentMethod.paymentMethodId}">CC:${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if></label>
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EC', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
<label for="amount_${paymentMethod.paymentMethodId}"><strong>${uiLabelMap.OrderBillUpTo}:</strong></label><input type="text" size="5" class="inputBox" id="amount_${paymentMethod.paymentMethodId}" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)><@ofbizAmount amount=cart.getPaymentAmount(paymentMethod.paymentMethodId)!/></#if>" />
</div>
@@ -158,11 +154,10 @@ function submitForm(form, mode, value) {
<#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
<#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false) />
- <div>
- <label for="checkOutPayment_${paymentMethod.paymentMethodId}">
- <input type="radio" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if> />
- ${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName!}: ${eftAccount.accountNumber!}</label>
- <#if paymentMethod.description?has_content><p>(${paymentMethod.description})</p></#if>
+ <div class="form-check">
+ <input type="radio" id="checkOutPayment_${paymentMethod.paymentMethodId}" class="form-check-input" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if> />
+ <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName!}: ${eftAccount.accountNumber!}
+ <#if paymentMethod.description?has_content><p>(${paymentMethod.description})</p></#if></label>
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EE', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
</div>
</#if>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingAddress.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingAddress.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingAddress.ftl Sat Nov 24 13:07:42 2018
@@ -77,9 +77,9 @@ function toggleBillingAccount(box) {
<#assign checkThisAddress = (shippingContactMech_index == 0 && !cart.getShippingContactMechId()?has_content) || (cart.getShippingContactMechId()?default("") == shippingAddress.contactMechId)/>
<tr>
<td>
- <label>
- <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}"<#if checkThisAddress> checked="checked"</#if> />
- <span>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}"<#if checkThisAddress> checked="checked"</#if> />
+ <label>
<#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
<#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if>
<#if shippingAddress.address1?has_content>${shippingAddress.address1},</#if>
@@ -89,8 +89,8 @@ function toggleBillingAccount(box) {
<#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if>
<#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
- </span>
- </label>
+ </label>
+ </div>
</td>
</tr>
</#list>
@@ -114,7 +114,7 @@ function toggleBillingAccount(box) {
</tr>
<#else>
<#list agreements as agreement>
- <label><input type="radio" name="agreementId" value="${agreement.agreementId!}"<#if checkThisAddress> checked="checked"</#if> />${agreement.description!} will be used for this order.</label>
+ <div class="form-check"><input type="radio" class="form-check-input" name="agreementId" value="${agreement.agreementId!}"<#if checkThisAddress> checked="checked"</#if> /><label>${agreement.description!} will be used for this order.</label></div>
</#list>
</#if>
</#if>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustomerTaxInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustomerTaxInfo.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustomerTaxInfo.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustomerTaxInfo.ftl Sat Nov 24 13:07:42 2018
@@ -38,8 +38,10 @@ under the License.
<input type="text" name="partyTaxId" class="form-control" maxlength="40"/>
</div>
<#if "Y" == productStore.showTaxIsExempt?default("Y")>
+ <div class="form-check">
+ <input type="checkbox" class="form-check-input" name="isExempt" value="Y"/>
<label>${uiLabelMap.PartyTaxIsExempt} </label>
- <input type="checkbox" name="isExempt" value="Y"/>
+ </div>
<#else>
<input type="hidden" name="isExempt" value="N"/>
</#if>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OnePageCheckoutProcess.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OnePageCheckoutProcess.ftl Sat Nov 24 13:07:42 2018
@@ -472,8 +472,8 @@ under the License.
</select>
</div>
</div>
- <div>
- <input class="checkbox" id="useShippingAddressForBilling" name="useShippingAddressForBilling"
+ <div class="form-check">
+ <input class="form-check-input" id="useShippingAddressForBilling" name="useShippingAddressForBilling"
type="checkbox" value="Y"
<#if useShippingAddressForBilling?has_content && useShippingAddressForBilling?default("")=="Y">checked="checked"</#if>/>
<label for="useShippingAddressForBilling">${uiLabelMap.FacilityBillingAddressSameShipping}</label>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl Sat Nov 24 13:07:42 2018
@@ -27,7 +27,8 @@ under the License.
<#list carrierShipmentMethodList as carrierShipmentMethod>
<li>
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
- <input type="radio" id="shipping_method_${shippingMethod}" name="shipping_method" value="${shippingMethod}"
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="shipping_method_${shippingMethod}" name="shipping_method" value="${shippingMethod}"
<#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
<label for="shipping_method_${shippingMethod}">
<#if shoppingCart.getShippingContactMechId()??>
@@ -43,24 +44,25 @@ under the License.
</#if>
</#if>
</label>
+ </div>
</li>
</#list>
<#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
- <div>
- <input type="radio" name="shipping_method" value="Default" checked="checked"/>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" name="shipping_method" value="Default" checked="checked"/>
<label for="shipping_method">${uiLabelMap.OrderUseDefault}.</label>
</div>
</#if>
</fieldset>
<fieldset>
<legend>${uiLabelMap.OrderShipAllAtOnce}?</legend>
- <div>
- <input type="radio" id="maySplit_N" <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="maySplit_N" <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
name="may_split" value="false"/>
<label for="maySplit_N">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</label>
</div>
- <div>
- <input type="radio" id="maySplit_Y" <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="maySplit_Y" <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
name="may_split" value="true"/>
<label for="maySplit_Y">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</label>
</div>
@@ -78,13 +80,13 @@ under the License.
<#if productStore.showCheckoutGiftOptions! != "N">
<fieldset>
<legend>${uiLabelMap.OrderIsThisGift}</legend>
- <div>
- <input type="radio" id="is_gift_Y" <#if "Y" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="is_gift_Y" <#if "Y" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if>
name="is_gift" value="true"/>
<label for="is_gift_Y">${uiLabelMap.CommonYes}</label>
</div>
- <div>
- <input type="radio" id="is_gift_N" <#if "N" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="is_gift_N" <#if "N" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
name="is_gift" value="false"/>
<label far="is_gift_N">${uiLabelMap.CommonNo}</label>
</div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl Sat Nov 24 13:07:42 2018
@@ -23,32 +23,32 @@ under the License.
<form id="editPaymentOptions" method="post" action="<@ofbizUrl>setPaymentInformation</@ofbizUrl>" name="${parameters.formNameValue}">
<fieldset>
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
- <div>
- <input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?? && "Y" == addGiftCard>checked="checked"</#if> />
+ <div class="form-check">
+ <input type="checkbox" class="form-check-input" name="addGiftCard" value="Y" <#if addGiftCard?? && "Y" == addGiftCard>checked="checked"</#if> />
<label for="addGiftCard">${uiLabelMap.AccountingCheckGiftCard}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
- <div>
- <input type="radio" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?? && "EXT_OFFLINE" == paymentMethodTypeId>checked="checked"</#if> />
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?? && "EXT_OFFLINE" == paymentMethodTypeId>checked="checked"</#if> />
<label for="paymentMethodTypeId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
- <div>
- <input type="radio" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?? && "CREDIT_CARD" == paymentMethodTypeId>checked="checked"</#if> />
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?? && "CREDIT_CARD" == paymentMethodTypeId>checked="checked"</#if> />
<label for="paymentMethodTypeId_CREDIT_CARD">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
- <div>
- <input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?? && "EFT_ACCOUNT" == paymentMethodTypeId>checked="checked"</#if> />
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?? && "EFT_ACCOUNT" == paymentMethodTypeId>checked="checked"</#if> />
<label for="paymentMethodTypeId_EFT_ACCOUNT">${uiLabelMap.AccountingAHCElectronicCheck}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
- <div>
- <input type="radio" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?? && "EXT_PAYPAL" == paymentMethodTypeId>checked="checked"</#if> />
+ <div class="form-check">
+ <input type="radio" class="form-check-input" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?? && "EXT_PAYPAL" == paymentMethodTypeId>checked="checked"</#if> />
<label for="paymentMethodTypeId_EXT_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label>
</div>
</#if>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonCustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonCustSettings.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonCustSettings.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonCustSettings.ftl Sat Nov 24 13:07:42 2018
@@ -230,9 +230,9 @@ under the License.
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
<td align="center" valign="top" colspan="3">
- <div>
- <input type="checkbox" class="checkbox" id="useShippingPostalAddressForBilling" name="useShippingPostalAddressForBilling" value="Y"/>
- ${uiLabelMap.FacilityBillingAddressSameShipping}
+ <div class="form-check">
+ <input type="checkbox" class="form-check-input" id="useShippingPostalAddressForBilling" name="useShippingPostalAddressForBilling" value="Y"/>
+ <label>${uiLabelMap.FacilityBillingAddressSameShipping}</label>
</div>
</td>
</tr>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl?rev=1847363&r1=1847362&r2=1847363&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl Sat Nov 24 13:07:42 2018
@@ -76,14 +76,16 @@ function onClickShippingMethod(e) {
<#list carrierShipmentMethodList as carrierShipmentMethod>
<tr>
<td>
- <div>
+ <div class="form-check">
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
- <input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
+ <input type="radio" class="form-check-input" onclick="return onClickShippingMethod(event)" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
+ <label>
<#if shoppingCart.getShippingContactMechId()??>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
<#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!}
<#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
+ </label>
</div>
</td>
</tr>
@@ -91,7 +93,9 @@ function onClickShippingMethod(e) {
<#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
<tr>
<td width="1%" valign="top">
- <div><input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="Default" checked="checked"/>${uiLabelMap.OrderUseDefault}.</div>
+ <div class="form-check">
+ <input type="radio" class="form-check-input" onclick="return onClickShippingMethod(event)" name="shipping_method" value="Default" checked="checked"/><label>${uiLabelMap.OrderUseDefault}.</label>
+ </div>
</td>
</tr>
</#if>
@@ -147,17 +151,17 @@ function onClickShippingMethod(e) {
<tr><td colspan="2"><h2>${uiLabelMap.OrderShipAllAtOnce}?</h2></td></tr>
<tr>
<td valign="top" colspan="2">
- <div>
- <input type='radio' <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name='may_split' value='false'/>
+ <div class="form-check">
+ <input type='radio' class="form-check-input" <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name='may_split' value='false'/>
<span>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</span>
</div>
</td>
</tr>
<tr>
<td valign="top" colspan="2">
- <div>
- <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type='radio' name='may_split' value='true'/>
- <span>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</span>
+ <div class="form-check">
+ <input class="form-check-input" <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type='radio' name='may_split' value='true'/>
+ <label>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</label>
</div>
</td>
</tr>