svn commit: r819894 - in /ofbiz/trunk: framework/images/webapp/images/ecommain.css specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js

[mor-2]

Author: mor
Date: Tue Sep 29 12:09:42 2009
New Revision: 819894

URL: http://svn.apache.org/viewvc?rev=819894&view=rev
Log:
Misc. improvements. Thanks Rohit Jain for implementation.

Modified:
    ofbiz/trunk/framework/images/webapp/images/ecommain.css
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js

Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=819894&r1=819893&r2=819894&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Tue Sep 29 12:09:42 2009
@@ -182,6 +182,7 @@
 text-align:right;
 top:0;
 width:290px;
+height: 75px;
 }
 
 #welcome-message {
@@ -1025,6 +1026,6 @@
 #microcart li#microCartPayPalCheckout img {
 width: 135px;
 }
-#microcart li#googleCheckoutEnabled img {
+#microcart li#googleCheckoutEnabled img, #microcart li#googleCheckoutDisabled img {
 width: 145px;
 }

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl?rev=819894&r1=819893&r2=819894&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl Tue Sep 29 12:09:42 2009
@@ -29,6 +29,7 @@
                 <#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.OrderItem}<#else/>${uiLabelMap.OrderItems}</#if>,
                 <strong id="microCartTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></strong>
             </p>
+            <span id="microCartEmpty" style="display:none">${uiLabelMap.OrderShoppingCartEmpty}</span>
         <#else>
             <p>${uiLabelMap.OrderShoppingCartEmpty}</p>
         </#if>
@@ -40,7 +41,7 @@
           <li id="onePageCheckoutEnabled"><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>">[${uiLabelMap.EcommerceOnePageCheckout}]</a></li>
           <li id="onePageCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</li>
           <li id="googleCheckoutEnabled"><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>"><img src="https://checkout.google.com/buttons/checkout.gif?merchant_id=634321449957567&amp;w=160&amp;h=43&amp;style=white&amp;variant=text&amp;loc=en_US" alt="[${uiLabelMap.EcommerceCartToGoogleCheckout}]" /></a></li>
-          <li id="googleCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.EcommerceCartToGoogleCheckout}]</li>
+          <li id="googleCheckoutDisabled" style="display:none" class="disabled"><img src="https://checkout.google.com/buttons/checkout.gif?merchant_id=634321449957567&amp;w=160&amp;h=43&amp;style=white&amp;variant=text&amp;loc=en_US" alt="[${uiLabelMap.EcommerceCartToGoogleCheckout}]" /></li>
           <#if shoppingCart?has_content && (shoppingCart.getGrandTotal() > 0)>
             <li id="microCartPayPalCheckout"><a href="<@ofbizUrl>setPayPalCheckout</@ofbizUrl>"><img src="https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif" alt="[PayPal Express Checkout]" /></a></li>
           </#if>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=819894&r1=819893&r2=819894&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Tue Sep 29 12:09:42 2009
@@ -476,6 +476,7 @@
                 $('onePageCheckoutDisabled').show();
                 $('googleCheckoutEnabled').hide();
                 $('googleCheckoutDisabled').show();
+                $('microCartPayPalCheckout').hide();
             } else {
                 // Used for edit cart
                 $('microCartQuantity').update(data.totalQuantity);