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

[mor-2]

Author: mor
Date: Fri Sep 11 10:29:20 2009
New Revision: 813763

URL: http://svn.apache.org/viewvc?rev=813763&view=rev
Log:
Fixed the layout of micro cart in ecommerce that was broken a bit with recent markup changes. Thanks Rohit Jain for implementation.

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

Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=813763&r1=813762&r2=813763&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Fri Sep 11 10:29:20 2009
@@ -1016,3 +1016,15 @@
 .fieldwitherrors .calendar_date_select {
 border:2px solid red;
 }
+p#microCartNotEmpty {
+margin-bottom: 0;
+}
+#microcart li {
+display: inline;
+}
+#microcart li#microCartPayPalCheckout img {
+width: 135px;
+}
+#microcart li#googleCheckoutEnabled img {
+width: 145px;
+}
\ No newline at end of file

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=813763&r1=813762&r2=813763&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl Fri Sep 11 10:29:20 2009
@@ -39,10 +39,10 @@
           <li id="quickCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</li>
           <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>">[${uiLabelMap.EcommerceCartToGoogleCheckout}]</a></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>
           <#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"/></a><li>
+            <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>
       <#else>
           <li class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</li>