svn commit: r539353 - in /ofbiz/trunk: applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl framework/images/webapp/images/maincss.css

[jacopoc]

Author: jacopoc
Date: Fri May 18 03:03:07 2007
New Revision: 539353

URL: http://svn.apache.org/viewvc?view=rev&rev=539353
Log:
Layout improvements from Adrian Crum OFBIZ-994

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
    ofbiz/trunk/framework/images/webapp/images/maincss.css

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl?view=diff&rev=539353&r1=539352&r2=539353
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl Fri May 18 03:03:07 2007
@@ -24,20 +24,20 @@
       <li><a href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
       <li><a href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
     <#else>
-      <li><span class="disabled">${uiLabelMap.OrderRecalculateOrder}</span></li>
-      <li><span class="disabled">${uiLabelMap.OrderRemoveSelected}</span></li>
+      <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
+      <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
     </#if>
     <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
       <#if shoppingCart.getOrderPartyId() == "_NA_" || (shoppingCart.size() = 0)>
-        <li><span class="disabled">${uiLabelMap.OrderFinalizeOrder}</span></li>
+        <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
       <#else>
         <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
       </#if>
     <#else>
       <#if shoppingCart.size() = 0>
-        <li><span class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</span></li>
-        <li><span class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</span></li>
-        <li><span class="disabled">${uiLabelMap.OrderFinalizeOrder}</span></li>
+        <li class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li>
+        <li class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li>
+        <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li>
       <#else>
         <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li>
         <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=default</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li>

Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?view=diff&rev=539353&r1=539352&r2=539353
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Fri May 18 03:03:07 2007
@@ -1561,6 +1561,10 @@
 padding: 0.1em 0.4em 0.1em 0.4em;
 }
 
+.button-bar ul .opposed {
+float: right;
+}
+
 .button-bar ul a,
 .tabContainer ul a {
 display: block;
@@ -1664,15 +1668,21 @@
 }
 
 .tab-bar ul li {
+background-color: #000099;
+background-image: url(/images/gradient_sub_uns.gif);
+background-repeat: repeat-x;
+border-right: 0.1em solid #69a9d9;
 margin: 0;
 padding: 0;
 }
 
+#app-navigation .opposed li,
+#app-navigation ul .opposed {
+border-left: 0.1em solid #69a9d9;
+border-right: none;
+}
+
 .tab-bar ul a {
-background-color: #000099;
-background-image: url(/images/gradient_sub_uns.gif);
-background-repeat: repeat-x;
-border-left: 0.1em solid #5f9fcf;
 color: #ffff66;
 }
 
@@ -1689,6 +1699,7 @@
 
 .tab-bar ul .disabled {
 color: #D4D0C8;
+padding: 0.1em 0.4em 0.1em 0.4em;
 }
 
 /* ======================== */