svn commit: r922483 - in /ofbiz/trunk: applications/order/webapp/ordermgr/order/orderinfo.ftl applications/order/webapp/ordermgr/order/orderitems.ftl themes/tomahawk/webapp/tomahawk/css/style.css

[doogie-3]

Author: doogie
Date: Sat Mar 13 05:50:00 2010
New Revision: 922483

URL: http://svn.apache.org/viewvc?rev=922483&view=rev
Log:
Add red/green like shades to orderinfo and orderitem status areas, but
only for APPROVED and REJECTED statuses for now.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
    ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css

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?rev=922483&r1=922482&r2=922483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sat Mar 13 05:50:00 2010
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 
-<div class="screenlet">
+<div class="screenlet order-info">
     <div class="screenlet-title-bar">
         <ul>
             <#if orderHeader.externalId?has_content>
@@ -102,8 +102,8 @@ under the License.
             <tr>
               <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.OrderStatusHistory}</td>
               <td width="5%">&nbsp;</td>
-              <td valign="top" width="80%">
-                ${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}
+              <td valign="top" width="80%"<#if currentStatus.statusCode?has_content> class="${currentStatus.statusCode}"</#if>>
+                <span class="current-status">${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}</span>
                 <#if orderHeaderStatuses?has_content>
                   <hr/>
                   <#list orderHeaderStatuses as orderHeaderStatus>
@@ -277,4 +277,4 @@ under the License.
             </#if>
         </table>
     </div>
-</div>
\ No newline at end of file
+</div>

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?rev=922483&r1=922482&r2=922483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sat Mar 13 05:50:00 2010
@@ -129,8 +129,8 @@ under the License.
                   <#-- now show status details per line item -->
                   <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")>
                   <td colspan="1" valign="top">
-                    <div class="screenlet order-item-status-list"><div class="screenlet-body">
-                    <div><span class="label">${uiLabelMap.CommonCurrent}</span>&nbsp;${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div>
+                    <div class="screenlet order-item-status-list<#if currentItemStatus.statusCode?has_content> ${currentItemStatus.statusCode}</#if>"><div class="screenlet-body">
+                    <div class="current-status"><span class="label">${uiLabelMap.CommonCurrent}</span>&nbsp;${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div>
                     <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)>
                     <#list orderItemStatuses as orderItemStatus>
                       <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")>

Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=922483&r1=922482&r2=922483&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Sat Mar 13 05:50:00 2010
@@ -2472,3 +2472,23 @@ background-color:#D4D0C8;
 .basic-table.order-items .alternate-row .screenlet-body {
  background-color:#bfbfbf;
 }
+
+.order-info .current-status {
+font-size:145%;
+padding:10px;
+}
+.order-item-status-list .current-status {
+font-size:145%;
+}
+.order-info .APPROVED, .order-list .APPROVED {
+background-color:#a9b996;
+}
+.order-info .REJECTED, .order-list .REJECTED {
+background-color:#b29898;
+}
+.order-item-status-list.APPROVED .screenlet-body, .alternate-row .order-item-status-list.APPROVED .screenlet-body {
+background-color:#a9b996;
+}
+.order-item-status-list.REJECTED .screenlet-body, .alternate-row .order-item-status-list.REJECTED .screenlet-body {
+background-color:#b29898;
+}