svn commit: r1535981 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl

Author: jleroux
Date: Sat Oct 26 12:37:43 2013
New Revision: 1535981

URL: http://svn.apache.org/r1535981
Log:
Fixes "Under some conditions the Paypal button encroachs the menu bar" https://issues.apache.org/jira/browse/OFBIZ-3136

Small improvement to provide a default in French when any countr has been selected. The same idea can be used with other default locale.

Actually this issue can be completly fixed without efforts to reduce the lengths of labels above buttons in some languages, also depends on screen widths and anyway OFBiz is far to provide a responsive design, if even this is wanted...

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl

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=1535981&r1=1535980&r2=1535981&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl Sat Oct 26 12:37:43 2013
@@ -37,7 +37,11 @@ under the License.
       <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>">[${uiLabelMap.OrderViewCart}]</a></li>
       <#if (shoppingCartSize > 0)>
             <#if !initialLocaleComplete?exists || initialLocaleComplete?length == 2 >
-                <#assign initialLocaleComplete = "en_US">
+                <#if initialLocaleComplete?exists && initialLocaleComplete?length == 2  && initialLocaleComplete == "fr">
+                    <#assign initialLocaleComplete = "fr_FR"><#-- same idea can be used with other default locale -->
+                <#else>
+                    <#assign initialLocaleComplete = "en_US">
+                </#if>                              
             </#if>          
           <li id="quickCheckoutEnabled"><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">[${uiLabelMap.OrderCheckoutQuick}]</a></li>
           <li id="quickCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</li>