svn commit: r814542 - /ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl

[mor-2]

Author: mor
Date: Mon Sep 14 09:31:43 2009
New Revision: 814542

URL: http://svn.apache.org/viewvc?rev=814542&view=rev
Log:
Applied a combined patch from Eric DE MAULDE and Deepak Dixit where the former is related to fix to the tag and latter is related to markup improvements. For details refer
to jira issue OFBIZ-2935 (https://issues.apache.org/jira/browse/OFBIZ-2935)

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=814542&r1=814541&r2=814542&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Mon Sep 14 09:31:43 2009
@@ -30,11 +30,11 @@
         <#if (shoppingCartSize > 0)>
           <#if hidetoplinks?default("N") != "Y">
             <ul>
-              <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="buttons">${uiLabelMap.OrderViewCart}</a></li>
-              <li><a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="buttons">${uiLabelMap.OrderCheckout}</a></li>
-              <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="buttons">${uiLabelMap.OrderCheckoutQuick}</a></li>
-              <li><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="buttons">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
-              <li><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>" class="buttons">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
+              <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="button">${uiLabelMap.OrderViewCart}</a></li>
+              <li><a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="button">${uiLabelMap.OrderCheckout}</a></li>
+              <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="button">${uiLabelMap.OrderCheckoutQuick}</a></li>
+              <li><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="button">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
+              <li><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>" class="button">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
             </ul>
           </#if>
           <table>
@@ -44,7 +44,14 @@
                 <th>${uiLabelMap.OrderItem}</th>
                 <th>${uiLabelMap.CommonSubtotal}</th>
               </tr>
-            <thead>
+            </thead>
+            <tfoot>
+              <tr>
+                <td colspan="3">
+                  ${uiLabelMap.OrderTotal}: <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/>
+                </td>
+              </tr>
+            </tfoot>
             <tbody>
             <#list shoppingCart.items() as cartLine>
               <tr>
@@ -57,31 +64,24 @@
                           <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>" class="linktext">${cartLine.getName()}</a>
                       </#if>
                   <#else>
-                    <b>${cartLine.getItemTypeDescription()?if_exists}</b>
+                    <strong>${cartLine.getItemTypeDescription()?if_exists}</strong>
                   </#if>
                 </td>
                 <td><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></td>
               </tr>
               <#if cartLine.getReservStart()?exists>
-                <tr><td>&nbsp;</td><td colspan="2">(${cartLine.getReservStart()?string("yyyy-MM-dd")}, ${cartLine.getReservLength()} <#if cartLine.getReservLength() == 1>${uiLabelMap.CommonDay}<#else/>${uiLabelMap.CommonDays}</#if>)</td></tr>
+                <tr><td>&nbsp;</td><td colspan="2">(${cartLine.getReservStart()?string("yyyy-MM-dd")}, ${cartLine.getReservLength()} <#if cartLine.getReservLength() == 1>${uiLabelMap.CommonDay}<#else>${uiLabelMap.CommonDays}</#if>)</td></tr>
               </#if>
             </#list>
             </tbody>
-            <tfoot>
-            <tr>
-              <th colspan="3">
-                ${uiLabelMap.OrderTotal}: <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/>
-              </th>
-            </tr>
-            </tfoot>
           </table>
           <#if hidebottomlinks?default("N") != "Y">
             <ul>
-              <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="buttons">${uiLabelMap.OrderViewCart}</a></li>
-              <li><a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="buttons">${uiLabelMap.OrderCheckout}</a></li>
-              <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="buttons">${uiLabelMap.OrderCheckoutQuick}</a></li>
-              <li><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="buttons">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
-              <li><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>" class="buttons">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
+              <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="button">${uiLabelMap.OrderViewCart}</a></li>
+              <li><a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="button">${uiLabelMap.OrderCheckout}</a></li>
+              <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="button">${uiLabelMap.OrderCheckoutQuick}</a></li>
+              <li><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="button">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
+              <li><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>" class="button">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
             </ul>
           </#if>
         <#else>