Author: jacopoc Date: Thu Nov 23 22:40:26 2006 New Revision: 478780 URL: http://svn.apache.org/viewvc?view=rev&rev=478780 Log: Applied patch from Ray Barlow (OFBIZ-467) to fix the logic that allows the configuration (shown/hidden) of top & bottom minicart links in ecommerce.
Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml?view=diff&rev=478780&r1=478779&r2=478780 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml (original) +++ incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml Thu Nov 23 22:40:26 2006 @@ -29,6 +29,10 @@ </screen> <screen name="minicart"> <section> + <actions> + <set field="hidetoplinks" value="N"/> + <set field="hidebottomlinks" value="N"/> + </actions> <widgets> <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/minicart.ftl"/></html></platform-specific> </widgets> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?view=diff&rev=478780&r1=478779&r2=478780 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Thu Nov 23 22:40:26 2006 @@ -28,7 +28,7 @@ </div> <div class="screenlet-body"> <#if (shoppingCartSize > 0)> - <#if !hidetoplinks?exists> + <#if hidetoplinks?default("N") != "Y"> <div><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceViewCart}</a> <a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCheckout}</a></div> </#if> <table width="100%" cellpadding="0" cellspacing="2"> @@ -59,7 +59,7 @@ </td> </tr> </table> - <#if !hidebottomlinks?exists> + <#if hidebottomlinks?default("N") != "Y"> <div><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceViewCart}</a> <a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCheckout}</a></div> <div style="margin-top: 4px;"><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCheckoutQuick}</a></div> </#if>