svn commit: r539070 - in /ofbiz/trunk/applications/order/webapp/ordermgr: entry/ order/

[jaz-3]

Author: jaz
Date: Thu May 17 11:30:49 2007
New Revision: 539070

URL: http://svn.apache.org/viewvc?view=rev&rev=539070
Log:
a few minor UI adjustments

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl Thu May 17 11:30:49 2007
@@ -20,29 +20,31 @@
 <#if stepTitleId?exists>
     <#assign stepTitle = uiLabelMap.get(stepTitleId)>
 </#if>
-<div class="boxtop">
-    <div class="boxhead-right">
-        <#list checkoutSteps as checkoutStep>
-            <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
-            <#if checkoutStep.enabled == "N">
-                <span class="buttontextdisabled">${stepUiLabel}</span>
-            <#else>
-                <a href="<@ofbizUrl>${checkoutStep.uri}</@ofbizUrl>" class="buttontext">${stepUiLabel}</a>
-            </#if>
-        </#list>
-        <#if isLastStep == "N">
-            <a href="javascript:document.checkoutsetupform.submit();" class="buttontext">${uiLabelMap.CommonContinue}</a>
-        <#else>
-            <a href="<@ofbizUrl>processorder</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateOrder}</a>
-        </#if>
-    </div>
-    <div class="boxhead-left" align="left">
+<div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">
         <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
             ${uiLabelMap.OrderPurchaseOrder}
         <#else>
             ${uiLabelMap.OrderSalesOrder}
         </#if>
         :&nbsp;${stepTitle?if_exists}
-    </div>
-    <div class="boxhead-fill">&nbsp;</div>
+      </li>
+
+      <#if isLastStep == "N">
+        <li><a href="javascript:document.checkoutsetupform.submit();">${uiLabelMap.CommonContinue}</a></li>
+      <#else>
+        <li><a href="<@ofbizUrl>processorder</@ofbizUrl>">${uiLabelMap.OrderCreateOrder}</a></li>
+      </#if>
+      
+      <#list checkoutSteps?reverse as checkoutStep>
+        <#assign stepUiLabel = uiLabelMap.get(checkoutStep.label)>
+        <#if checkoutStep.enabled == "N">
+            <li><span class="disabled">${stepUiLabel}</span></li>
+        <#else>
+            <li><a href="<@ofbizUrl>${checkoutStep.uri}</@ofbizUrl>">${stepUiLabel}</a></li>
+        </#if>
+      </#list>
+    </ul>
+ <br class="clear" />
 </div>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Thu May 17 11:30:49 2007
@@ -20,15 +20,18 @@
 <#if orderHeader?has_content>
 
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxlink">
-            <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
-                <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED">
-                    <div class="tabletext"><a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCancelAllItems}</a><a href="<@ofbizUrl>orderview?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewOrder}</a></div>
-                </#if>
-            </#if>
-        </div>
-        <div class="boxhead">&nbsp;${uiLabelMap.OrderOrderItems}</div>
+    <div class="screenlet-title-bar">
+        <ul>
+          <li class="head3">&nbsp;${uiLabelMap.OrderOrderItems}</li>
+
+          <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
+              <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED">
+                  <li><a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>">${uiLabelMap.OrderCancelAllItems}</a></li>
+                  <li><a href="<@ofbizUrl>orderview?${paramString}</@ofbizUrl>">${uiLabelMap.OrderViewOrder}</a></li>
+              </#if>
+          </#if>
+        </ul>
+        <br class="clear" />
     </div>
     <div class="screenlet-body">
             <#if !orderItemList?has_content>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Thu May 17 11:30:49 2007
@@ -68,26 +68,23 @@
 <input type="hidden" name="viewSize" value="${viewSize}"/>
 <input type="hidden" name="viewIndex" value="${viewIndex}"/>
 
-<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
-  <tr>
-    <td width='100%'>
-      <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
-        <tr>
-          <td><div class='boxhead'>${uiLabelMap.OrderFindOrder}</div></td>
-          <td align='right'>
-            <div class="tabletext">
-              <#if requestParameters.hideFields?default("N") == "Y">
-                <a href="<@ofbizUrl>searchorders?hideFields=N&viewSize=${viewSize}&viewIndex=${viewIndex}&${paramList}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonShowLookupFields}</a>
-              <#else>
-                <#if orderList?exists><a href="<@ofbizUrl>searchorders?hideFields=Y&viewSize=${viewSize}&viewIndex=${viewIndex}&${paramList}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonHideFields}</a></#if>
-                <a href="javascript:lookupOrders(true);" class="buttontext">${uiLabelMap.OrderLookupOrder}</a>
-                <a href="/partymgr/control/findparty?externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.PartyLookupParty}</a>
-              </#if>
-            </div>
-          </td>
-        </tr>
-      </table>
-      <#if requestParameters.hideFields?default("N") != "Y">
+<div id="findOrders" class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${uiLabelMap.OrderFindOrder}</li>
+      <#if requestParameters.hideFields?default("N") == "Y">
+        <li><a href="<@ofbizUrl>searchorders?hideFields=N&viewSize=${viewSize}&viewIndex=${viewIndex}&${paramList}</@ofbizUrl>">${uiLabelMap.CommonShowLookupFields}</a></li>
+      <#else>
+        <#if orderList?exists><li><a href="<@ofbizUrl>searchorders?hideFields=Y&viewSize=${viewSize}&viewIndex=${viewIndex}&${paramList}</@ofbizUrl>">${uiLabelMap.CommonHideFields}</a></li></#if>
+        <li><a href="/partymgr/control/findparty?externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${uiLabelMap.PartyLookupParty}</a></li>
+        <li><a href="javascript:lookupOrders(true);">${uiLabelMap.OrderLookupOrder}</a></li>
+
+      </#if>      
+    </ul>
+ <br class="clear" />
+  </div>
+  <#if parameters.hideFields?default("N") != "Y">
+    <div class="screenlet-body">
       <table width='100%' border='0' cellspacing='0' cellpadding='2' class='boxbottom'>
         <tr>
           <td align='center' width='100%'>
@@ -369,9 +366,8 @@
         </tr>
       </table>
       </#if>
-    </td>
-  </tr>
-</table>
+    </div>
+</div>
 <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:lookupOrders(true);"/>
 </form>
 <#if requestParameters.hideFields?default("N") != "Y">
@@ -383,36 +379,31 @@
 </#if>
 
 <br/>
-<form name="massOrderChangeForm" method="post" action="javascript:void();">
-<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
-  <tr>
-    <td width='100%'>
-      <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
-        <tr>
-          <td width="50%"><div class="boxhead">${uiLabelMap.OrderOrderFound}</div></td>
-          <td width="50%">
-            <div class="boxhead" align="right">
-              <#if (orderList?has_content && 0 < orderList?size)>
-                <#if (viewIndex > 1)>
-                  <a href="<@ofbizUrl>searchorders?viewSize=${viewSize}&viewIndex=${viewIndex-1}&hideFields=${requestParameters.hideFields?default("N")}&${paramList}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a>
-                <#else>
-                  <span class="buttontextdisabled">${uiLabelMap.CommonPrevious}</span>
-                </#if>
-                <#if (orderListSize > 0)>
-                  <span class="submenutextinfo">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${orderListSize}</span>
-                </#if>
-                <#if (orderListSize > highIndex)>
-                  <a href="<@ofbizUrl>searchorders?viewSize=${viewSize}&viewIndex=${viewIndex+1}&hideFields=${requestParameters.hideFields?default("N")}&${paramList}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
-                <#else>
-                  <span class="buttontextdisabled">${uiLabelMap.CommonNext}</span>
-                </#if>
-              </#if>
-              &nbsp;
-            </div>
-          </td>
-        </tr>
-      </table>
 
+<div id="findOrdersList" class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${uiLabelMap.OrderOrderFound}</li>
+      <#if (orderList?has_content && 0 < orderList?size)>
+        <#if (viewIndex > 1)>
+          <li><a href="<@ofbizUrl>searchorders?viewSize=${viewSize}&viewIndex=${viewIndex-1}&hideFields=${requestParameters.hideFields?default("N")}&${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li>
+        <#else>
+          <li><span class="disabled">${uiLabelMap.CommonPrevious}</span></li>
+        </#if>
+        <#if (orderListSize > 0)>
+          <li><span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${orderListSize}</span></li>
+        </#if>
+        <#if (orderListSize > highIndex)>
+          <li><a href="<@ofbizUrl>searchorders?viewSize=${viewSize}&viewIndex=${viewIndex+1}&hideFields=${requestParameters.hideFields?default("N")}&${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>
+        <#else>
+          <li><span class="disabled">${uiLabelMap.CommonNext}</span></li>
+        </#if>
+      </#if>
+    </ul>
+ <br class="clear" />
+  </div>
+  <div class="screenlet-body">
+    <form name="massOrderChangeForm" method="post" action="javascript:void();">      
       <div>&nbsp;</div>
       <div align="right" class="tabletext">
         <input type="hidden" name="orderIdList" value=""/>
@@ -569,11 +560,9 @@
           </tr>
         </#if>
       </table>
-    </td>
-  </tr>
-</table>
-</form>
-
+    </form>
+  </div>
+</div>
 <#else>
   <h3>${uiLabelMap.OrderViewPermissionError}</h3>
 </#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Thu May 17 11:30:49 2007
@@ -35,9 +35,10 @@
 
 <#if displayParty?has_content || orderContactMechValueMaps?has_content>
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxhead">&nbsp;${uiLabelMap.OrderContactInformation}</div>
-    </div>
+    <div class="screenlet-title-bar">
+      <ul><li class="head3">&nbsp;${uiLabelMap.OrderContactInformation}</li></ul>
+      <br class="clear" />
+    </div>    
     <div class="screenlet-body">
       <table width="100%" border="0" cellpadding="1" cellspacing="0">
         <tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Thu May 17 11:30:49 2007
@@ -18,23 +18,25 @@
 -->
 
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxlink">
+    <div class="screenlet-title-bar">
+        <ul>
+            <#if orderHeader.externalId?has_content>
+               <#assign externalOrder = "(" + orderHeader.externalId + ")"/>
+            </#if>
+            <li class="head3">&nbsp;${uiLabelMap.OrderOrder}&nbsp;#<a href="<@ofbizUrl>/orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} ${uiLabelMap.CommonInformation} [&nbsp;<a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" target="_blank">PDF</a>&nbsp;]</li>
+                      
             <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING">
-                <div class="tabletext"><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&amp;${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderApproveOrder}</a></div>
+                <li><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&amp;${paramString}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</a></li>
             <#elseif currentStatus.statusId == "ORDER_APPROVED">
-                <div class="tabletext"><a href="<@ofbizUrl>changeOrderStatus/orderview?statusId=ORDER_HOLD&amp;${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderHold}</a></div>
+                <li><a href="<@ofbizUrl>changeOrderStatus/orderview?statusId=ORDER_HOLD&amp;${paramString}</@ofbizUrl>">${uiLabelMap.OrderHold}</a></li>
             <#elseif currentStatus.statusId == "ORDER_HOLD">
-                <div class="tabletext"><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&amp;${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderApproveOrder}</a></div>
+                <li><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&amp;${paramString}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</a></li>
             </#if>
             <#if setOrderCompleteOption>
-                  <div class="tabletext"><a href="<@ofbizUrl>changeOrderStatus?orderId=${orderId}&statusId=ORDER_COMPLETED</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCompleteOrder}</a></div>
+              <li><a href="<@ofbizUrl>changeOrderStatus?orderId=${orderId}&statusId=ORDER_COMPLETED</@ofbizUrl>">${uiLabelMap.OrderCompleteOrder}</a></li>
             </#if>
-        </div>
-        <#if orderHeader.externalId?has_content>
-          <#assign externalOrder = "(" + orderHeader.externalId + ")"/>
-        </#if>
-        <div class="boxhead">&nbsp;${uiLabelMap.OrderOrder}&nbsp;#<a href="<@ofbizUrl>/orderview?orderId=${orderId}</@ofbizUrl>" class="lightbuttontext">${orderId}</a>&nbsp;${externalOrder?if_exists} ${uiLabelMap.CommonInformation} [<a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" class="buttontext" target="_blank">PDF</a> ]</div>
+        </ul>
+        <br class="clear" />
     </div>
     <div class="screenlet-body">
           <table width="100%" border="0" cellpadding="1" cellspacing="0">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Thu May 17 11:30:49 2007
@@ -20,27 +20,27 @@
 <#if orderHeader?has_content>
 
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxlink">
-            <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
-                <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED">
-                    <div class="tabletext">
-                      <#if orderHeader.statusId != "ORDER_COMPLETED">
-                        <#--
-                        <a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCancelAllItems}</a>
-                        -->
-                        <a href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderEditItems}</a>
-                      </#if>
-                      <a href="<@ofbizUrl>loadCartFromOrder?${paramString}&finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateAsNewOrder}</a>
-                      <#if returnableItems?has_content>
-                        <a href="<@ofbizUrl>quickreturn?orderId=${orderId}&amp;party_id=${partyId?if_exists}&amp;returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>"  class="buttontext">${uiLabelMap.OrderCreateReturn}</a>
-                      </#if>
-                    </div>
-                </#if>
-            </#if>
-        </div>
-        <div class="boxhead">&nbsp;${uiLabelMap.OrderOrderItems}</div>
-    </div>
+    <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">&nbsp;${uiLabelMap.OrderOrderItems}</li>
+      <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
+        <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED">
+          <#if orderHeader.statusId != "ORDER_COMPLETED">
+            <#--
+            <a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCancelAllItems}</a>
+            -->
+            <li><a href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>">${uiLabelMap.OrderEditItems}</a></li>
+          </#if>
+          <li><a href="<@ofbizUrl>loadCartFromOrder?${paramString}&finalizeMode=init</@ofbizUrl>">${uiLabelMap.OrderCreateAsNewOrder}</a></li>
+          <#if returnableItems?has_content>
+            <li><a href="<@ofbizUrl>quickreturn?orderId=${orderId}&amp;party_id=${partyId?if_exists}&amp;returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>">${uiLabelMap.OrderCreateReturn}</a></li>
+          </#if>
+        </#if>
+      </#if>
+    </ul>
+ <br class="clear" />
+  </div>
+        
     <div class="screenlet-body">
         <table width="100%" border="0" cellpadding="0" cellspacing="0">
           <tr align="left" valign=bottom>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Thu May 17 11:30:49 2007
@@ -58,10 +58,14 @@
   
 
 <#-- order list -->
-
-<table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
-  <tr>
-    <td width="100%">
+<div id="findOrdersList" class="screenlet">
+    <div class="screenlet-title-bar">
+      <ul>
+        <li class="head3">${uiLabelMap.OrderLookupOrder}</li>
+      </ul>
+  <br class="clear" />
+    </div>
+    <div class="screenlet-body">
       <form method="post" name="findorder" action="<@ofbizUrl>orderlist</@ofbizUrl>">
         <input type="hidden" name="changeStatusAndTypeState" value="Y">
         <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
@@ -132,20 +136,17 @@
         </table>
         <br/>&nbsp;
       </form>
-    </td>
-  </tr>
+    </div>
+ </div>
 <#if hasPermission>
-  <tr>
-    <td width="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
-        <tr>
-          <td align="left"><div class="boxhead">${uiLabelMap.OrderOrderList}</div></td>
-        </tr>
-      </table>      
-    </td>
-  </tr>
-  <tr>
-    <td width="100%">
+  <div id="findOrdersList" class="screenlet">
+    <div class="screenlet-title-bar">
+      <ul>
+        <li class="head3">${uiLabelMap.OrderOrderList}</li>
+      </ul>
+  <br class="clear" />
+    </div>
+    <div class="screenlet-body">
       <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom">
         <tr>
           <td>
@@ -264,8 +265,8 @@
           </td>
         </tr>
       </table>
-    </td>
-  </tr>
+    </div>
+  </div>
 
   <@pagination/>
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl Thu May 17 11:30:49 2007
@@ -20,13 +20,14 @@
 <#if orderHeader?has_content>
 
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxlink">
-            <#if security.hasEntityPermission("ORDERMGR", "_NOTE", session)>
-                <a href="<@ofbizUrl>createnewnote?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesCreateNew}</a>
-            </#if>
-        </div>
-        <div class="boxhead">&nbsp;${uiLabelMap.OrderNotes}</div>
+    <div class="screenlet-title-bar">
+      <ul>
+        <li class="head3">&nbsp;${uiLabelMap.OrderNotes}</li>
+        <#if security.hasEntityPermission("ORDERMGR", "_NOTE", session)>
+          <li><a href="<@ofbizUrl>createnewnote?${paramString}</@ofbizUrl>">${uiLabelMap.OrderNotesCreateNew}</a></li>
+        </#if>
+      </ul>
+      <br class="clear" />
     </div>
     <div class="screenlet-body">
       <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Thu May 17 11:30:49 2007
@@ -18,8 +18,9 @@
 -->
 
 <div class="screenlet">
-  <div class="screenlet-header">
-      <div class="boxhead">&nbsp;${uiLabelMap.AccountingPaymentInformation}</div>
+  <div class="screenlet-title-bar">
+      <ul><li class="head3">&nbsp;${uiLabelMap.AccountingPaymentInformation}</li></ul>
+      <br class="clear" />
   </div>
   <div class="screenlet-body">
      <table width="100%" border="0" cellpadding="1" cellspacing="0">
@@ -203,7 +204,7 @@
                     </div>
                   </#if>
                 </td>
-                <td>
+                <td align="right" valign="top" width="20%">
                    <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
                    <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">                        
                       <a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?view=diff&rev=539070&r1=539069&r2=539070
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Thu May 17 11:30:49 2007
@@ -22,11 +22,12 @@
   <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType")?if_exists>
   <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>
   <div class="screenlet">
-    <div class="screenlet-header">
-       <div class="boxlink">
-         <div class="tabletext"><a href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderShipGroup} PDF</a></div>
-       </div>
-       <div class="boxhead">&nbsp;${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</div>
+    <div class="screenlet-title-bar">
+       <ul>
+         <li class="head3">&nbsp;${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</li>
+         <li><a href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>">${uiLabelMap.OrderShipGroup} PDF</a></li>
+       </ul>
+       <br class="clear" />
     </div>
     <div class="screenlet-body">
         <form name="updateOrderItemShipGroup" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>">