OFBiz › OFBiz - Commits

svn commit: r1819240 - in /ofbiz/ofbiz-plugins/trunk/ecommerce/template: cart/ShowCart.ftl cart/UpdateCart.ftl catalog/CategoryDetail.ftl customer/MiniSignUpForContactList.ftl forum/Forums.ftl includes/Header.ftl order/OnePageCheckoutProcess.ftl

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Deepak Dixit-5

svn commit: r1819240 - in /ofbiz/ofbiz-plugins/trunk/ecommerce/template: cart/ShowCart.ftl cart/UpdateCart.ftl catalog/CategoryDetail.ftl customer/MiniSignUpForContactList.ftl forum/Forums.ftl includes/Header.ftl order/OnePageCheckoutProcess.ftl

Author: deepak
Date: Mon Dec 25 09:46:12 2017
New Revision: 1819240

URL: http://svn.apache.org/viewvc?rev=1819240&view=rev
Log:
Improved: Remoevd some unused developer comments, also fix incorect markup

Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/UpdateCart.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OnePageCheckoutProcess.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=1819240&r1=1819239&r2=1819240&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl Mon Dec 25 09:46:12 2017
@@ -334,7 +334,7 @@ under the License.
Static["org.apache.ofbiz.product.product.ProductWorker"].getGwpAlternativeOptionName(
dispatcher, delegator, alternativeOptionProductId, requestAttributes.locale) />
<option
- value="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>">
+ value="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>">
${alternativeOptionName?default(alternativeOptionProductId)}
</option>
</#list>
@@ -533,7 +533,7 @@ under the License.
<td colspan="8">
<#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous">
<div class="input-group">
- <select class="form-control" name="shoppingListId" class="selectBox">
+ <select class="form-control selectBox" name="shoppingListId">
<#if shoppingLists?has_content>
<#list shoppingLists as shoppingList>
<option value="${shoppingList.shoppingListId}">${shoppingList.listName}</option>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/UpdateCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/UpdateCart.ftl?rev=1819240&r1=1819239&r2=1819240&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/UpdateCart.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/UpdateCart.ftl Mon Dec 25 09:46:12 2017
@@ -35,7 +35,7 @@ under the License.
</thead>
<tfoot>
<tr id="completedCartSubtotalRow">
- <th id="subTotal" scope="row" colspan="4">${uiLabelMap.CommonSubtotal}</th>
+ <td id="subTotal" scope="row" colspan="4">${uiLabelMap.CommonSubtotal}</td>
<td headers="subTotal" colspan="2" class="amount" id="completedCartSubTotal">
<@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() />
</td>
@@ -47,26 +47,26 @@ under the License.
.calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) />
</#list>
<tr id="completedCartDiscountRow">
- <th id="productDiscount" scope="row" colspan="4">${uiLabelMap.ProductDiscount}</th>
+ <td id="productDiscount" scope="row" colspan="4">${uiLabelMap.ProductDiscount}</td>
<td headers="productDiscount" colspan="2" class="amount text-success" id="completedCartDiscount">
<input type="hidden" value="${orderAdjustmentsTotal}" id="initializedCompletedCartDiscount" />
<@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() />
</td>
</tr>
<tr>
- <th id="shippingAndHandling" scope="row" colspan="4">${uiLabelMap.OrderShippingAndHandling}</th>
+ <td id="shippingAndHandling" scope="row" colspan="4">${uiLabelMap.OrderShippingAndHandling}</td>
<td headers="shippingAndHandling" colspan="2" class="amount" id="completedCartTotalShipping">
<@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() />
</td>
</tr>
<tr>
- <th id="salesTax" scope="row" colspan="4">${uiLabelMap.OrderSalesTax}</th>
+ <td id="salesTax" scope="row" colspan="4">${uiLabelMap.OrderSalesTax}</td>
<td headers="salesTax" colspan="2" class="amount" id="completedCartTotalSalesTax">
<@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() />
</td>
</tr>
<tr>
- <th id="grandTotal" scope="row" colspan="4">${uiLabelMap.OrderGrandTotal}</th>
+ <td id="grandTotal" scope="row" colspan="4">${uiLabelMap.OrderGrandTotal}</td>
<td headers="grandTotal" colspan="2" class="amount" id="completedCartDisplayGrandTotal">
<strong><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() /></strong>
</td>
@@ -128,14 +128,14 @@ under the License.
<tfoot>
<tr class="thead-light"><th colspan="7" >Summary</th></tr>
<tr>
- <th scope="row" colspan="5">${uiLabelMap.CommonSubtotal}</th>
- <td class="amount"id="cartSubTotal" >
+ <td scope="row" colspan="5">${uiLabelMap.CommonSubtotal}</td>
+ <td class="amount" id="cartSubTotal" >
<@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() />
</td>
<td> </td>
</tr>
<tr>
- <th scope="row" colspan="5">${uiLabelMap.ProductDiscount}</th>
+ <td scope="row" colspan="5">${uiLabelMap.ProductDiscount}</td>
<td id="cartDiscountValue" class="amount text-success">
<#assign orderAdjustmentsTotal = 0 />
<#list shoppingCart.getAdjustments() as cartAdjustment>
@@ -148,21 +148,21 @@ under the License.
<td> </td>
</tr>
<tr>
- <th scope="row" colspan="5">${uiLabelMap.OrderShippingAndHandling}</th>
+ <td scope="row" colspan="5">${uiLabelMap.OrderShippingAndHandling}</td>
<td id="cartTotalShipping" class="amount">
<@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() />
</td>
<td> </td>
</tr>
<tr>
- <th scope="row" colspan="5">${uiLabelMap.OrderSalesTax}</th>
+ <td scope="row" colspan="5">${uiLabelMap.OrderSalesTax}</td>
<td id="cartTotalSalesTax" class="amount">
<@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() />
</td>
<td> </td>
</tr>
<tr>
- <th scope="row" colspan="5">${uiLabelMap.OrderGrandTotal}</th>
+ <td scope="row" colspan="5">${uiLabelMap.OrderGrandTotal}</td>
<td id="cartDisplayGrandTotal" class="amount">
<strong><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() /></strong>
</td>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl?rev=1819240&r1=1819239&r2=1819240&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl Mon Dec 25 09:46:12 2017
@@ -132,7 +132,6 @@

<#assign numCol = numCol?default(1)/>
<#assign numCol = numCol?number/>
- <#assign tabCol = 1/>

<div
@@ -141,11 +140,6 @@
</#if>
class="productsummary-container<#if (numCol?int > 1)> matrix</#if>">

-
- <#if (numCol?int > 1)>
- 
- </#if>
-
<div class="row row-eq-height">

<#list productCategoryMembers as productCategoryMember>
@@ -155,15 +149,10 @@
${setRequestAttribute("listIndex", productCategoryMember_index)}
${screens.render(productsummaryScreen)}
<#else>
- <#if (tabCol?int = 1)><tr></#if>
-
${setRequestAttribute("optProductId", productCategoryMember.productId)}
${setRequestAttribute("productCategoryMember", productCategoryMember)}
${setRequestAttribute("listIndex", productCategoryMember_index)}
${screens.render(productsummaryScreen)}
-
- <#if (tabCol?int = numCol)></#if>
- <#assign tabCol = tabCol+1/><#if (tabCol?int > numCol)><#assign tabCol = 1/></#if>
</#if>
</#list>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl?rev=1819240&r1=1819239&r2=1819240&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl Mon Dec 25 09:46:12 2017
@@ -83,7 +83,7 @@ under the License.
</select>
</div>
<input type="submit" class="form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceSubscribe}"/>
- <input type="button" class"form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceUnsubscribe}"
+ <input type="button" class="form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceUnsubscribe}"
onclick="javascript:unsubscribeByContactMech();"/>
</form>
<#else>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl?rev=1819240&r1=1819239&r2=1819240&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl Mon Dec 25 09:46:12 2017
@@ -19,7 +19,7 @@ under the License.

<div id="browse-forums" class="card">
<div class="card-header">
- ${uiLabelMap.ProductBrowseForums}</li>
+ ${uiLabelMap.ProductBrowseForums}
</div>
<div class="card-body">
<ul>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl?rev=1819240&r1=1819239&r2=1819240&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl Mon Dec 25 09:46:12 2017
@@ -19,7 +19,7 @@ under the License.
<div class="container-fluid">
<div class="row align-items-center">
<div class="col">
- <a class="navbar-brand" href="#">
+ <a class="navbar-brand" href="<@ofbizUrl>main</@ofbizUrl>">
<#if sessionAttributes.overrideLogo??>
<img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo}</@ofbizContentUrl>" alt="Logo"/>
<#elseif catalogHeaderLogo??>

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=1819240&r1=1819239&r2=1819240&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OnePageCheckoutProcess.ftl Mon Dec 25 09:46:12 2017
@@ -84,7 +84,7 @@ under the License.
</div>
<div class="form-group col-md-6">
<label for="lastName">${uiLabelMap.PartyLastName}*
- <span id="advice-required-lastName" style="display:none"class="errorMessage">
+ <span id="advice-required-lastName" style="display:none" class="errorMessage">
(${uiLabelMap.CommonRequired})
</span>
</label>
@@ -162,7 +162,7 @@ under the License.
</#if>
<div class="form-group col-md-4">
<label for="emailAddress">${uiLabelMap.PartyEmailAddress}*
- <span id="advice-required-emailAddress" style="display:none"class="errorMessage">
+ <span id="advice-required-emailAddress" style="display:none" class="errorMessage">
(${uiLabelMap.CommonRequired})
</span>
</label>
@@ -198,7 +198,7 @@ under the License.
</div>
<div class="form-group col-md-3">
<label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*
- <span id="advice-required-shipToPostalCode" class="custom-advice errorMessage"style="display:none">
+ <span id="advice-required-shipToPostalCode" class="custom-advice errorMessage" style="display:none">
(${uiLabelMap.CommonRequired})
</span>
</label>