Author: jacopoc
Date: Thu Mar 15 10:14:54 2007
New Revision: 518696
URL:
http://svn.apache.org/viewvc?view=rev&rev=518696Log:
Applied patch from Adrian Crum to fix a layout issue in the order entry page.
Issue OFBIZ-807
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=518696&r1=518695&r2=518696==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl Thu Mar 15 10:14:54 2007
@@ -17,8 +17,7 @@
under the License.
-->
-<div class="boxtop">
- <div class="boxhead-right">
+<div class="button-bar">
<a href="<@ofbizUrl>emptycart</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderClearOrder}</a>
<#if (shoppingCart.size() > 0)>
<a href="javascript:document.cartform.submit()" class="buttontext">${uiLabelMap.OrderRecalculateOrder}</a>
@@ -44,15 +43,15 @@
<a href="<@ofbizUrl>finalizeOrder?finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderFinalizeOrder}</a>
</#if>
</#if>
- </div>
- <div class="boxhead-left">
- ${uiLabelMap.CommonCreate}
+</div>
+<div class="screenlet-title-bar">
+ <h3>
+ ${uiLabelMap.CommonCreate}
<#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
${uiLabelMap.OrderPurchaseOrder}
<#else>
${uiLabelMap.OrderSalesOrder}
</#if>
- </div>
- <div class="boxhead-fill"> </div>
+ </h3>
</div>
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=518696&r1=518695&r2=518696==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Thu Mar 15 10:14:54 2007
@@ -1102,9 +1102,8 @@
#column-container .left {
float: left;
/* alt: position: absolute; top: 0px; left: 0px; */
-/*width: 22em;*/
+width: 22em;
margin-right: 1em;
-width: 20%;
}
.left-border {