svn commit: r890354 - in /ofbiz/trunk/applications/order/webapp/ordermgr/entry: OrderEntryCatalogTabBar.ftl OrderEntryTabBar.ftl

[jacopoc]

Author: jacopoc
Date: Mon Dec 14 15:02:28 2009
New Revision: 890354

URL: http://svn.apache.org/viewvc?rev=890354&view=rev
Log:
Small layout changes and formatting for order entry menu items.
 

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl?rev=890354&r1=890353&r2=890354&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl Mon Dec 14 15:02:28 2009
@@ -17,24 +17,24 @@
 under the License.
 -->
 
+<div class="screenlet">
 <div class="screenlet-title-bar">
+    <ul>
     <#if orderHeader?has_content>
-        <div class="boxhead-left">
-            ${uiLabelMap.PageTitleLookupBulkAddProduct}
-        </div>
+    <li class="h3">
+        ${uiLabelMap.PageTitleLookupBulkAddProduct}
+    </li>
     <#else>
-        <div class="boxhead-right">
-            <a href="<@ofbizUrl>orderentry</@ofbizUrl>" class="lightbuttontext">${uiLabelMap.OrderOrderItems}</a>
-        </div>
-        <div class="boxhead-left">
-            &nbsp;${uiLabelMap.CommonCreate}
-            <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
-                ${uiLabelMap.OrderPurchaseOrder}
-            <#else>
-                ${uiLabelMap.OrderSalesOrder}
-            </#if>
-        </div>
+    <li class="h3">
+        ${uiLabelMap.CommonCreate}&nbsp;
+        <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+            ${uiLabelMap.OrderPurchaseOrder}
+        <#else>
+            ${uiLabelMap.OrderSalesOrder}
+        </#if>
+    </li>
+    <li><a href="<@ofbizUrl>orderentry</@ofbizUrl>">${uiLabelMap.OrderOrderItems}</a></li>
     </#if>
-    <div class="boxhead-fill">&nbsp;</div>
+    </ul>
+</div>
 </div>
-

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?rev=890354&r1=890353&r2=890354&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl Mon Dec 14 15:02:28 2009
@@ -17,46 +17,43 @@
 under the License.
 -->
 
-<div class="button-bar tab-bar">
-  <ul>
-    <li><a href="<@ofbizUrl>emptycart</@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
-    <#if (shoppingCart.size() > 0)>
-      <li><a href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
-      <li><a href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
-    <#else>
-      <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 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 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>
-        <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=init</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
-      </#if>
-    </#if>
-  </ul>
-</div>
-<br/>
 <div class="screenlet">
   <div class="screenlet-title-bar">
-    <div class="h3">
-        ${uiLabelMap.CommonCreate}
+    <ul>
+      <li class="h3">
+        ${uiLabelMap.CommonCreate}&nbsp;
         <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
             ${uiLabelMap.OrderPurchaseOrder}
         <#else>
             ${uiLabelMap.OrderSalesOrder}
         </#if>
-    </div>
+      </li>
+      <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+        <#if shoppingCart.getOrderPartyId() == "_NA_" || (shoppingCart.size() = 0)>
+          <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 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>
+          <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=init</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li>
+        </#if>
+      </#if>
+
+      <#if (shoppingCart.size() > 0)>
+        <li><a href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li>
+        <li><a href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li>
+      <#else>
+        <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li>
+        <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li>
+      </#if>
+      <li><a href="<@ofbizUrl>emptycart</@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
+    </ul>
   </div>
 </div>
-