You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/01/20 21:28:47 UTC
svn commit: r613672 [1/4] - in /ofbiz/trunk/applications/order:
webapp/ordermgr/lookup/ webapp/ordermgr/order/ webapp/ordermgr/quote/
webapp/ordermgr/request/ webapp/ordermgr/requirement/
webapp/ordermgr/return/ webapp/ordermgr/task/ widget/ordermgr/
Author: mrisaliti
Date: Sun Jan 20 12:28:45 2008
New Revision: 613672
URL: http://svn.apache.org/viewvc?rev=613672&view=rev
Log:
Order View forms & removed some deprecated styles (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1545)
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.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/newnote.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
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml Sun Jan 20 12:28:45 2008
@@ -25,14 +25,14 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="OrderHeader" default-field-type="find"/>
<field name="orderHeaderId"><text-find/></field>
- <field name="orderTypeId" widget-style="selectBox">
+ <field name="orderTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="OrderType" key-field-name="orderTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="salesChannelEnumId" widget-style="selectBox">
+ <field name="salesChannelEnumId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
@@ -40,7 +40,7 @@
</entity-options>
</drop-down>
</field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
@@ -48,7 +48,7 @@
</drop-down>
</field>
<field name="productStoreId"><lookup target-form-name="/marketing/control/LookupProductStore"/></field>
- <field name="currencyUom" widget-style="selectBox">
+ <field name="currencyUom">
<drop-down allow-empty="true">
<entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
@@ -295,7 +295,7 @@
</field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" value="QUOTE_STATUS"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleForms.xml Sun Jan 20 12:28:45 2008
@@ -21,26 +21,26 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="UpdateDeliveryScheduleInformation" type="single" target="updateOrderDeliverySchedule" title="" default-map-name="schedule"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="schedule==null" target="createOrderDeliverySchedule"/>
<auto-fields-service service-name="updateOrderDeliverySchedule"/>
<field name="orderId"><hidden/></field>
<field name="orderItemSeqId"><hidden/></field>
- <field name="totalWeightUomId" widget-style="selectBox">
+ <field name="totalWeightUomId">
<drop-down>
<entity-options key-field-name="uomId" entity-name="Uom" description="${description}">
<entity-constraint name="uomTypeId" value="WEIGHT_MEASURE"/>
</entity-options>
</drop-down>
</field>
- <field name="totalCubicUomId" widget-style="selectBox">
+ <field name="totalCubicUomId">
<drop-down>
<entity-options key-field-name="uomId" entity-name="Uom" description="${description}">
<entity-constraint name="uomTypeId" value="VOLUME_DRY_MEASURE"/>
</entity-options>
</drop-down>
</field>
- <field name="statusId" widget-style="selectBox">
+ <field name="statusId">
<drop-down>
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" value="ORDER_DEL_SCH"/>
@@ -50,4 +50,4 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl Sun Jan 20 12:28:45 2008
@@ -19,22 +19,23 @@
<#if hasPermission>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxlink">
- <#if orderId?exists>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.OrderViewOrder}]</a>
- </#if>
- </div>
- <div class="boxhead">${uiLabelMap.OrderScheduleDelivery}</div>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.OrderScheduleDelivery}</li>
+ <#if orderId?exists>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderViewOrder}</a></li>
+ </#if>
+ </ul>
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<#if orderId?has_content>
${updatePODeliveryInfoWrapper.renderFormString(context)}
<#else>
- <div class="tabletext">${uiLabelMap.OrderNoPurchaseSpecified}</div>
+ ${uiLabelMap.OrderNoPurchaseSpecified}
</#if>
</div>
</div>
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Sun Jan 20 12:28:45 2008
@@ -21,7 +21,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="EditOrderHeader" type="single" target="updateOrderHeader" title=""
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" >
+ header-row-style="header-row" default-table-style="basic-table">
<actions>
<entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
<field-map field-name="statusId" env-name="orderHeader.statusId"/>
@@ -32,21 +32,21 @@
<field name="orderId" use-when="orderHeader!=null" ><display/></field>
<field name="orderId" use-when="orderHeader==null" ><ignored/></field>
- <field name="orderTypeId" widget-style="selectBox">
+ <field name="orderTypeId">
<drop-down>
<entity-options description="${description}" entity-name="OrderType" key-field-name="orderTypeId">
</entity-options>
</drop-down>
</field>
- <field name="statusId" use-when="orderHeader==null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+ <field name="statusId" use-when="orderHeader==null" title="${uiLabelMap.CommonStatus}">
<drop-down>
<entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
</entity-options>
</drop-down>
</field>
- <field name="statusId" use-when="orderHeader!=null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+ <field name="statusId" use-when="orderHeader!=null" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false" current-description="${currentStatus.description}">
<entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
<entity-constraint name="statusId" value="${orderHeader.statusId}"/>
@@ -55,7 +55,7 @@
</drop-down>
</field>
- <field name="salesChannelEnumId" widget-style="selectBox">
+ <field name="salesChannelEnumId">
<drop-down>
<entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
@@ -64,7 +64,7 @@
</drop-down>
</field>
- <field name="currencyUom" widget-style="selectBox">
+ <field name="currencyUom">
<drop-down>
<entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
@@ -80,7 +80,7 @@
<field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListOrderHeaders" type="single" target="" title=""
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" >
+ header-row-style="header-row" default-table-style="basic-table">
<actions>
<entity-and entity-name="OrderHeader">
<field-map field-name="orderId"/>
@@ -88,14 +88,13 @@
</actions>
<auto-fields-entity entity-name="OrderHeader" default-field-type="display"/>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="EditOrderHeader?orderId=${orderId}" description="[${orderId}]" />
+ <hyperlink target="EditOrderHeader?orderId=${orderId}" description="[${orderId}]"/>
</field>
<field name="statusId"> <display-entity entity-name="StatusItem"/> </field>
<field name="productStoreId"> <display-entity entity-name="ProductStore"/> </field>
</form>
<form name="ListOrderTerms" type="list" list-name="orderTerms" target="updateOrderTerm" title=""
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
- paginate-target="ListOrderTerms">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListOrderTerms">
<auto-fields-entity entity-name="OrderTerm" default-field-type="edit"/>
<field name="termTypeId"><display-entity also-hidden="true" entity-name="TermType"/></field>
<field name="orderId"><hidden/></field>
@@ -106,7 +105,7 @@
</field>
</form>
<form name="AddOrderTerm" type="single" target="createOrderTerm" title=""
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="OrderTerm" default-field-type="edit"/>
<field name="orderId"><hidden value="${parameters.orderId}"/></field>
<field name="termTypeId">
@@ -118,4 +117,4 @@
</field>
<field name="addButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml Sun Jan 20 12:28:45 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -21,7 +21,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="EditShopList" type="single" target="" title=""
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ShoppingList" />
<field name="shoppingListTypeId">
<drop-down >
@@ -36,7 +36,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListShopLists" type="single" target="" title=""
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" >
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ShoppingList" default-field-type="display"/>
<field name="shoppingListTypeId">
<display-entity entity-name="ShoppingListType"/>
@@ -46,4 +46,4 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl Sun Jan 20 12:28:45 2008
@@ -19,15 +19,18 @@
<#if orderHeader?has_content>
<div class="screenlet">
- <div class="screenlet-title-bar">
- <h3> ${uiLabelMap.OrderAddToOrder}</h3>
- </div>
- <div class="screenlet-body">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3"> ${uiLabelMap.OrderAddToOrder}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
<form method="post" action="<@o...@ofbizUrl>" name="appendItemForm">
<table class="basic-table" cellspacing="0">
<tr>
- <td class="label">${uiLabelMap.ProductChooseCatalog} :</td>
- <td><select name='prodCatalogId' class='selectBox'>
+ <td class="label">${uiLabelMap.ProductChooseCatalog}</td>
+ <td><select name='prodCatalogId'>
<#list catalogCol as catalogId>
<#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)>
<option value='${catalogId}'>${thisCatalogName}</option>
@@ -36,7 +39,7 @@
</td>
</tr>
<tr>
- <td class="label">${uiLabelMap.ProductProductId} :</td>
+ <td class="label">${uiLabelMap.ProductProductId}</td>
<td><input type="text" size="25" name="productId" value="${requestParameters.productId?if_exists}"/>
<a href="javascript:call_fieldlookup2(document.appendItemForm.productId,'LookupProduct');">
<img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
@@ -44,32 +47,32 @@
</td>
</tr>
<tr>
- <td class="label">${uiLabelMap.OrderPrice} :</td>
+ <td class="label">${uiLabelMap.OrderPrice}</td>
<td>
<input type="text" size="6" name="basePrice" value="${requestParameters.price?if_exists}"/>
<input type="checkbox" name="overridePrice" value="Y"/> ${uiLabelMap.OrderOverridePrice}
</td>
</tr>
<tr>
- <td class="label">${uiLabelMap.OrderQuantity} :</td>
+ <td class="label">${uiLabelMap.OrderQuantity}</td>
<td><input type="text" size="6" name="quantity" value="${requestParameters.quantity?default("1")}"/></td>
</tr>
<tr>
- <td class="label">${uiLabelMap.OrderShipGroup} :</td>
+ <td class="label">${uiLabelMap.OrderShipGroup}</td>
<td><input type="text" size="6" name="shipGroupSeqId" value="00001"/></td>
</tr>
<tr>
<td colspan="2"> </td>
</tr>
<tr>
- <td class="label">${uiLabelMap.OrderDesiredDeliveryDate} :</td>
+ <td class="label">${uiLabelMap.OrderDesiredDeliveryDate}</td>
<td>
<input type="text" size="25" maxlength="30" name="itemDesiredDeliveryDate"/>
<a href="javascript:call_cal(document.appendItemForm.itemDesiredDeliveryDate,'${toDayDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a>
</td>
</tr>
<tr>
- <td class="label">${uiLabelMap.CommonComment} :</td>
+ <td class="label">${uiLabelMap.CommonComment}</td>
<td>
<input type="text" size="25" name="itemComment"/>
</td>
@@ -82,4 +85,4 @@
</form>
</div>
</div>
-</#if>
+</#if>
\ No newline at end of file
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?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Sun Jan 20 12:28:45 2008
@@ -39,7 +39,6 @@
<div class="screenlet-title-bar">
<ul>
<li class="head3"> ${uiLabelMap.OrderOrderItems}</li>
-
<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session)>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED">
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderCancelAllItems}</a></li>
@@ -47,7 +46,7 @@
</#if>
</#if>
</ul>
- <br class="clear" />
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<#if !orderItemList?has_content>
@@ -73,7 +72,7 @@
<#assign productId = orderItem.productId?if_exists>
<#if productId?exists && productId == "shoppingcart.CommentLine">
<td colspan="8" valign="top">
- <b> >> ${orderItem.itemDescription}</b>
+ <span class="label">>> ${orderItem.itemDescription}</span>
</td>
<#else>
<td valign="top">
@@ -92,14 +91,14 @@
<#elseif orderItemType?exists>
<#assign orderItemName = orderItemType.description/>
</#if>
- <p>${uiLabelMap.ProductProduct}: ${orderItemName}</p>
+ <p>${uiLabelMap.ProductProduct} ${orderItemName}</p>
<#if productId?exists>
<#assign product = orderItem.getRelatedOneCache("Product")>
<#if product.salesDiscontinuationDate?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
<span class="alert">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
</#if>
</#if>
- ${uiLabelMap.CommonDescription}:<br />
+ ${uiLabelMap.CommonDescription}<br/>
<input type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/>
</#if>
</div>
@@ -117,11 +116,11 @@
<#-- now show status details per line item -->
<#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")>
<td>
- ${uiLabelMap.CommonCurrent}: ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br/>
+ ${uiLabelMap.CommonCurrent} ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br/>
<#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)>
<#list orderItemStatuses as orderItemStatus>
<#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")>
- ${orderItemStatus.statusDatetime.toString()} : ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br/>
+ ${orderItemStatus.statusDatetime.toString()} ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br/>
</#list>
<#assign returns = orderItem.getRelated("ReturnItem")?if_exists>
<#if returns?has_content>
@@ -129,7 +128,7 @@
<#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")>
<#if returnHeader.statusId != "RETURN_CANCELLED">
<div class="alert">
- <b>${uiLabelMap.OrderReturned}</b> #<a href="<@o...@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
+ <span class="label">${uiLabelMap.OrderReturned}</span> #<a href="<@o...@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
</div>
</#if>
</#list>
@@ -137,7 +136,7 @@
</td>
<td class="align-text" valign="top" nowrap="nowrap">
<#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))>
- ${uiLabelMap.OrderOrdered}: ${orderItem.quantity?default(0)?string.number} <br/>
+ ${uiLabelMap.OrderOrdered} ${orderItem.quantity?default(0)?string.number} <br/>
${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} <br/>
${uiLabelMap.OrderRemaining}: ${remainingQuantity} <br/>
</td>
@@ -145,9 +144,9 @@
<#-- check for permission to modify price -->
<#if (allowPriceChange)>
<input type="text" size="8" name="ipm_${orderItem.orderItemSeqId}" value="<@ofbizAmount amount=orderItem.unitPrice/>"/>
- <input type="checkbox" name="opm_${orderItem.orderItemSeqId}" value="Y"/>
+ <input type="checkbox" name="opm_${orderItem.orderItemSeqId}" value="Y"/>
<#else>
- <div class="tabletext"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> / <@ofbizCurrency amount=orderItem.unitListPrice isoCode=currencyUomId/></div>
+ <div><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> / <@ofbizCurrency amount=orderItem.unitListPrice isoCode=currencyUomId/></div>
</#if>
</td>
<td class="align-text" valign="top" nowrap="nowrap">
@@ -161,9 +160,9 @@
</#if>
</td>
<td> </td>
- <td class="button-col">
+ <td>
<#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT")>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCancelAll}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancelAll}</a>
<#else>
</#if>
@@ -178,21 +177,21 @@
<#assign adjustmentType = orderItemAdjustment.getRelatedOneCache("OrderAdjustmentType")>
<tr>
<td class="align-text" colspan="2">
- <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${adjustmentType.get("description",locale)}</b>:
+ <span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)}
${orderItemAdjustment.get("description",locale)?if_exists} (${orderItemAdjustment.comments?default("")})
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
<#if orderItemAdjustment.primaryGeoId?has_content>
<#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>
- <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ <span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
<#if orderItemAdjustment.secondaryGeoId?has_content>
<#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/>
- (<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
+ (<span class="label">${uiLabelMap.CommonIn}</span> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
</#if>
</#if>
- <#if orderItemAdjustment.sourcePercentage?exists><b>Rate:</b> ${orderItemAdjustment.sourcePercentage}</#if>
- <#if orderItemAdjustment.customerReferenceId?has_content><b>Customer Tax ID:</b> ${orderItemAdjustment.customerReferenceId}</#if>
- <#if orderItemAdjustment.exemptAmount?exists><b>Exempt Amount:</b> ${orderItemAdjustment.exemptAmount}</#if>
+ <#if orderItemAdjustment.sourcePercentage?exists><span class="label">Rate</span> ${orderItemAdjustment.sourcePercentage}</#if>
+ <#if orderItemAdjustment.customerReferenceId?has_content><span class="label">Customer Tax ID</span> ${orderItemAdjustment.customerReferenceId}</#if>
+ <#if orderItemAdjustment.exemptAmount?exists><span class="label">Exempt Amount</span> ${orderItemAdjustment.exemptAmount}</#if>
</#if>
</td>
<td> </td>
@@ -214,16 +213,16 @@
<#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>
<tr>
<td class="align-text" colspan="2">
- <b><i>${uiLabelMap.OrderShipGroup}</i>:</b> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}
+ <span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}
</td>
<td align="center">
<input type="text" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupAssoc.quantity?string.number}"/>
</td>
<td colspan="4"> </td>
- <td class="button-col">
+ <td>
<#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)))>
<#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCancel}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>
<#else>
</#if>
@@ -234,8 +233,8 @@
</#list>
<tr>
<td colspan="7"> </td>
- <td class="button-col">
- <input type="submit" value="${uiLabelMap.OrderUpdateItems}"/>
+ <td>
+ <input type="submit" value="${uiLabelMap.OrderUpdateItems}" class="buttontext"/>
</td>
</tr>
<tr><td colspan="8"><hr/></td></tr>
@@ -251,7 +250,7 @@
<table class="basic-table" cellspacing="0">
<tr>
<td class="align-text" width="55%">
- <b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} :
+ <span class="label">${adjustmentType.get("description",locale)}</span> ${orderHeaderAdjustment.comments?if_exists}
</td>
<td nowrap="nowrap" width="30%">
<#if (allowPriceChange)>
@@ -282,7 +281,7 @@
<tr><td colspan="3"><hr/></td></tr>
<tr>
<td class="align-text" width="55%">
- <b>${uiLabelMap.OrderAdjustment} :</b>
+ <span class="label">${uiLabelMap.OrderAdjustment}</span>
<select name="orderAdjustmentTypeId">
<#list orderAdjustmentTypes as type>
<option value="${type.orderAdjustmentTypeId}">${type.get("description",locale)?default(type.orderAdjustmentTypeId)}</option>
@@ -309,40 +308,39 @@
<table class="basic-table" cellspacing="0">
<tr><td colspan="4"><hr/></td></tr>
<tr class="align-text">
- <td width="80%"><b>${uiLabelMap.OrderItemsSubTotal} :</b></td>
+ <td width="80%"><span class="label">${uiLabelMap.OrderItemsSubTotal}</span></td>
<td width="10%" nowrap="nowrap"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td>
<td width="10%" colspan="2"> </td>
</tr>
<#-- other adjustments -->
<tr class="align-text">
- <td><b>${uiLabelMap.OrderTotalOtherOrderAdjustments} :</b></td>
+ <td><span class="label">${uiLabelMap.OrderTotalOtherOrderAdjustments}</span></td>
<td nowrap="nowrap"><@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/></td>
<td colspan="2"> </td>
</tr>
<#-- shipping adjustments -->
<tr class="align-text">
- <td><b>${uiLabelMap.OrderTotalShippingAndHandling} :</b></td>
+ <td><span class="label">${uiLabelMap.OrderTotalShippingAndHandling}</span></td>
<td nowrap="nowrap"><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></td>
<td colspan="2"> </td>
</tr>
- <#-- tax adjustments -->
+ <#-- tax adjustments -->
<tr class="align-text">
- <td><b>${uiLabelMap.OrderTotalSalesTax} :</b></td>
+ <td><span class="label">${uiLabelMap.OrderTotalSalesTax}</span></td>
<td nowrap="nowrap"><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></td>
<td colspan="2"> </td>
</tr>
<#-- grand total -->
<tr class="align-text">
- <td><b>${uiLabelMap.OrderTotalDue} :</b></td>
+ <td><span class="label">${uiLabelMap.OrderTotalDue}</span></td>
<td nowrap="nowrap"><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></td>
<td colspan="2"> </td>
</tr>
</table>
</div>
</div>
-
-</#if>
+</#if>
\ No newline at end of file
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?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Sun Jan 20 12:28:45 2008
@@ -78,62 +78,61 @@
<#if orderList?exists><li><a href="<@o...@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" />
+ <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'>
+ <table class="basic-table" cellspacing='0'>
<tr>
<td align='center' width='100%'>
- <table border='0' cellspacing='0' cellpadding='2'>
+ <table class="basic-table" cellspacing='0'>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.OrderOrderId}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderOrderId}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='orderId'/></td>
+ <td align='left'><input type='text' name='orderId'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.OrderExternalId}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderExternalId}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='externalId'/></td>
+ <td align='left'><input type='text' name='externalId'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.OrderCustomerPo}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderCustomerPo}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='correspondingPoId' value='${requestParameters.correspondingPoId?if_exists}'/></td>
+ <td align='left'><input type='text' name='correspondingPoId' value='${requestParameters.correspondingPoId?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.OrderInternalCode}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderInternalCode}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='internalCode' value='${requestParameters.internalCode?if_exists}'/></td>
+ <td align='left'><input type='text' name='internalCode' value='${requestParameters.internalCode?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.ProductProductId}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.ProductProductId}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='productId' value='${requestParameters.productId?if_exists}'/></td>
+ <td align='left'><input type='text' name='productId' value='${requestParameters.productId?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.ProductInventoryItemId}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.ProductInventoryItemId}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='inventoryItemId' value='${requestParameters.inventoryItemId?if_exists}'/></td>
+ <td align='left'><input type='text' name='inventoryItemId' value='${requestParameters.inventoryItemId?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.ProductSerialNumber}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.ProductSerialNumber}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='serialNumber' value='${requestParameters.serialNumber?if_exists}'/></td>
+ <td align='left'><input type='text' name='serialNumber' value='${requestParameters.serialNumber?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.ProductSoftIdentifier}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.ProductSoftIdentifier}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='softIdentifier' value='${requestParameters.softIdentifier?if_exists}'/></td>
+ <td align='left'><input type='text' name='softIdentifier' value='${requestParameters.softIdentifier?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.PartyRoleType}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.PartyRoleType}</td>
<td width='5%'> </td>
- <td>
- <select name='roleTypeId' class='selectBox'>
+ <td align='left'>
+ <select name='roleTypeId'>
<#if currentRole?has_content>
<option value="${currentRole.roleTypeId}">${currentRole.get("description", locale)}</option>
<option value="${currentRole.roleTypeId}">---</option>
@@ -146,25 +145,25 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.PartyPartyId}</td>
<td width='5%'> </td>
- <td>
- <input type='text' class='inputBox' name='partyId' value='${requestParameters.partyId?if_exists}'/>
+ <td align='left'>
+ <input type='text' name='partyId' value='${requestParameters.partyId?if_exists}'/>
<a href="javascript:call_fieldlookup2(document.lookuporder.partyId,'LookupPartyName');">
<img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
</a>
</td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.PartyUserLoginId}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.PartyUserLoginId}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='userLoginId' value='${requestParameters.userLoginId?if_exists}'/></td>
+ <td align='left'><input type='text' name='userLoginId' value='${requestParameters.userLoginId?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.OrderOrderType}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderOrderType}</td>
<td width='5%'> </td>
- <td>
- <select name='orderTypeId' class='selectBox'>
+ <td align='left'>
+ <select name='orderTypeId'>
<#if currentType?has_content>
<option value="${currentType.orderTypeId}">${currentType.get("description", locale)}</option>
<option value="${currentType.orderTypeId}">---</option>
@@ -177,20 +176,20 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.AccountingBillingAccount}</div>
+ <td width='25%' align='right' class='label'>${uiLabelMap.AccountingBillingAccount}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='billingAccountId' value='${requestParameters.billingAccountId?if_exists}'/></td>
+ <td align='left'><input type='text' name='billingAccountId' value='${requestParameters.billingAccountId?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.CommonCreatedBy}</div>
+ <td width='25%' align='right' class='label'>${uiLabelMap.CommonCreatedBy}</td>
<td width='5%'> </td>
- <td><input type='text' class='inputBox' name='createdBy' value='${requestParameters.createdBy?if_exists}'/></td>
+ <td align='left'><input type='text' name='createdBy' value='${requestParameters.createdBy?if_exists}'/></td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.OrderSalesChannel}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderSalesChannel}</td>
<td width='5%'> </td>
- <td>
- <select name='salesChannelEnumId' class='selectBox'>
+ <td align='left'>
+ <select name='salesChannelEnumId'>
<#if currentSalesChannel?has_content>
<option value="${currentSalesChannel.enumId}">${currentSalesChannel.get("description", locale)}</option>
<option value="${currentSalesChannel.enumId}">---</option>
@@ -203,10 +202,10 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.ProductProductStore}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.ProductProductStore}</td>
<td width='5%'> </td>
- <td>
- <select name='productStoreId' class='selectBox'>
+ <td align='left'>
+ <select name='productStoreId'>
<#if currentProductStore?has_content>
<option value="${currentProductStore.productStoreId}">${currentProductStore.storeName?if_exists}</option>
<option value="${currentProductStore.productStoreId}">---</option>
@@ -219,10 +218,10 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.ProductWebSite}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.ProductWebSite}</td>
<td width='5%'> </td>
- <td>
- <select name='orderWebSiteId' class='selectBox'>
+ <td align='left'>
+ <select name='orderWebSiteId'>
<#if currentWebSite?has_content>
<option value="${currentWebSite.webSiteId}">${currentWebSite.siteName}</option>
<option value="${currentWebSite.webSiteId}">---</option>
@@ -235,10 +234,10 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.CommonStatus}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.CommonStatus}</td>
<td width='5%'> </td>
- <td>
- <select name='orderStatusId' class='selectBox'>
+ <td align='left'>
+ <select name='orderStatusId'>
<#if currentStatus?has_content>
<option value="${currentStatus.statusId}">${currentStatus.get("description", locale)}</option>
<option value="${currentStatus.statusId}">---</option>
@@ -251,10 +250,10 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'><div class='tableheadtext'>${uiLabelMap.OrderContainsBackOrders}</div></td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderContainsBackOrders}</td>
<td width='5%'> </td>
- <td>
- <select name='hasBackOrders' class='selectBox'>
+ <td align='left'>
+ <select name='hasBackOrders'>
<#if requestParameters.hasBackOrders?has_content>
<option value="Y">${uiLabelMap.OrderBackOrders}</option>
<option value="Y">---</option>
@@ -265,36 +264,32 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'>
- <div class='tableheadtext'>${uiLabelMap.CommonDateFilter}</div>
- </td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.CommonDateFilter}</td>
<td width='5%'> </td>
- <td>
- <table border='0' cellspacing='0' cellpadding='0'>
+ <td align='left'>
+ <table class="basic-table" cellspacing='0'>
<tr>
<td nowrap>
- <input type='text' size='25' class='inputBox' name='minDate' value='${requestParameters.minDate?if_exists}'/>
+ <input type='text' size='25' name='minDate' value='${requestParameters.minDate?if_exists}'/>
<a href="javascript:call_cal(document.lookuporder.minDate,'${fromDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
- <span class='tabletext'>${uiLabelMap.CommonFrom}</span>
+ <span class='label'>${uiLabelMap.CommonFrom}</span>
</td>
</tr>
<tr>
<td nowrap>
- <input type='text' size='25' class='inputBox' name='maxDate' value='${requestParameters.maxDate?if_exists}'/>
+ <input type='text' size='25' name='maxDate' value='${requestParameters.maxDate?if_exists}'/>
<a href="javascript:call_cal(document.lookuporder.maxDate,'${thruDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
- <span class='tabletext'>${uiLabelMap.CommonThru}</span>
+ <span class='label'>${uiLabelMap.CommonThru}</span>
</td>
</tr>
</table>
</td>
</tr>
<tr>
- <td width='25%' align='right'>
- <div class='tableheadtext'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterInventoryProblems}</div>
- </td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterInventoryProblems}</td>
<td width='5%'> </td>
- <td>
- <table border='0' cellspacing='0' cellpadding='0'>
+ <td align='left'>
+ <table class="basic-table" cellspacing='0'>
<tr>
<td nowrap>
<input type="checkbox" name="filterInventoryProblems" value="Y"
@@ -304,12 +299,10 @@
</table>
</td>
</tr>
- <td width='25%' align='right'>
- <div class='tableheadtext'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</div>
- </td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</td>
<td width='5%'> </td>
- <td>
- <table border='0' cellspacing='0' cellpadding='0'>
+ <td align='left'>
+ <table class="basic-table" cellspacing='0'>
<tr>
<td nowrap>
<input type="checkbox" name="filterPartiallyReceivedPOs" value="Y"
@@ -320,12 +313,10 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'>
- <div class='tableheadtext'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</div>
- </td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</td>
<td width='5%'> </td>
- <td>
- <table border='0' cellspacing='0' cellpadding='0'>
+ <td align='left'>
+ <table class="basic-table" cellspacing='0'>
<tr>
<td nowrap>
<input type="checkbox" name="filterPOsOpenPastTheirETA" value="Y"
@@ -336,12 +327,10 @@
</td>
</tr>
<tr>
- <td width='25%' align='right'>
- <div class='tableheadtext'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsWithRejectedItems}</div>
- </td>
+ <td width='25%' align='right' class='label'>${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsWithRejectedItems}</td>
<td width='5%'> </td>
- <td>
- <table border='0' cellspacing='0' cellpadding='0'>
+ <td align='left'>
+ <table class="basic-table" cellspacing='0'>
<tr>
<td nowrap>
<input type="checkbox" name="filterPOsWithRejectedItems" value="Y"
@@ -351,14 +340,12 @@
</table>
</td>
</tr>
- <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="3"><hr"/></td></tr>
<tr>
<td width='25%' align='right'> </td>
<td width='5%'> </td>
- <td>
- <div class="tabletext">
+ <td align='left'>
<input type='checkbox' name='showAll' value='Y' onclick="javascript:lookupOrders(true);"/> ${uiLabelMap.CommonShowAllRecords}
- </div>
</td>
</tr>
</table>
@@ -400,15 +387,15 @@
</#if>
</#if>
</ul>
- <br class="clear" />
+ <br class="clear" />
</div>
<div class="screenlet-body">
<form name="massOrderChangeForm" method="post" action="javascript:void();">
<div> </div>
- <div align="right" class="tabletext">
+ <div align="right">
<input type="hidden" name="orderIdList" value=""/>
<input type="hidden" name="screenLocation" value="component://order/widget/ordermgr/OrderPrintScreens.xml#OrderPDF"/>
- <select name="serviceName" class="selectBox" onchange="javascript:setServiceName(this);">
+ <select name="serviceName" onchange="javascript:setServiceName(this);">
<option value="javascript:void();"> </option>
<option value="<@o...@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</option>
<option value="<@o...@ofbizUrl>">${uiLabelMap.OrderHold}</option>
@@ -419,7 +406,7 @@
<option value="<@o...@ofbizUrl>">${uiLabelMap.CommonPrint}</option>
<option value="<@o...@ofbizUrl>">${uiLabelMap.ContentCreateFile}</option>
</select>
- <select name="printerName" class="selectBox">
+ <select name="printerName">
<option value="javascript:void();"> </option>
<#list printers as printer>
<option value="${printer}">${printer}</option>
@@ -428,36 +415,33 @@
<a href="javascript:runAction();" class="buttontext">${uiLabelMap.OrderRunAction}</a>
</div>
- <table width='100%' border='0' cellspacing='0' cellpadding='2' class='boxbottom'>
- <tr>
+ <table class="basic-table hover-bar" cellspacing='0'>
+ <tr class="header-row">
<td width="1%" align="left">
<input type="checkbox" name="checkAllOrders" value="1" onchange="javascript:toggleOrderId(this);"/>
</td>
- <td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.OrderOrderType}</div></td>
- <td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.OrderOrderId}</div></td>
- <td width="20%" align="left"><div class="tableheadtext">${uiLabelMap.PartyName}</div></td>
- <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderSurvey}</div></td>
- <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderItemsOrdered}</div></td>
- <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderItemsBackOrdered}</div></td>
- <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderItemsReturned}</div></td>
- <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderRemainingSubTotal}</div></td>
- <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderOrderTotal}</div></td>
- <td width="5%" align="left"><div class="tableheadtext"> </div></td>
+ <td width="5%" align="left">${uiLabelMap.OrderOrderType}</td>
+ <td width="5%" align="left">${uiLabelMap.OrderOrderId}</td>
+ <td width="20%" align="left">${uiLabelMap.PartyName}</td>
+ <td width="5%" align="right">${uiLabelMap.OrderSurvey}</td>
+ <td width="5%" align="right">${uiLabelMap.OrderItemsOrdered}</td>
+ <td width="5%" align="right">${uiLabelMap.OrderItemsBackOrdered}</td>
+ <td width="5%" align="right">${uiLabelMap.OrderItemsReturned}</td>
+ <td width="10%" align="right">${uiLabelMap.OrderRemainingSubTotal}</td>
+ <td width="10%" align="right">${uiLabelMap.OrderOrderTotal}</td>
+ <td width="5%" align="left"> </td>
<#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")>
- <td width="15%" align="left"><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td>
- <td width="5%"><div class="tabletext"><b>${uiLabelMap.CommonFilter}</b></div></td>
+ <td width="15%" align="left">${uiLabelMap.CommonStatus}</td>
+ <td width="5%">${uiLabelMap.CommonFilter}</td>
<#else>
- <td width="20%" align="left"><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td>
+ <td width="20%" align="left">${uiLabelMap.CommonStatus}</td>
</#if>
- <td width="20%" align="left"><div class="tableheadtext">${uiLabelMap.OrderDate}</div></td>
- <td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.PartyPartyId}</div></td>
+ <td width="20%" align="left">${uiLabelMap.OrderDate}</div></td>
+ <td width="5%" align="left">${uiLabelMap.PartyPartyId}</div></td>
<td width="10%"> </td>
</tr>
- <tr>
- <td colspan='15'><hr class='sepbar'/></td>
- </tr>
<#if orderList?has_content>
- <#assign rowClass = "viewManyTR2">
+ <#assign alt_row = false>
<#list orderList as orderHeader>
<#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
<#assign statusItem = orderHeader.getRelatedOneCache("StatusItem")>
@@ -468,14 +452,14 @@
<#assign displayParty = orh.getPlacingParty()?if_exists>
</#if>
<#assign partyId = displayParty.partyId?default("_NA_")>
- <tr class='${rowClass}'>
+ <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>
<input type="checkbox" name="orderIdList" value="${orderHeader.orderId}"/>
</td>
- <td><div class='tabletext'>${orderType.get("description",locale)?default(orderType.orderTypeId?default(""))}</div></td>
+ <td>${orderType.get("description",locale)?default(orderType.orderTypeId?default(""))}</td>
<td><a href="<@o...@ofbizUrl>" class='buttontext'>${orderHeader.orderId}</a></td>
<td>
- <div class="tabletext">
+ <div>
<#if displayParty?has_content>
<#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}
@@ -484,8 +468,7 @@
</#if>
</div>
<#--
- <div class='tabletext'>
-
+ <div>
<#if placingParty?has_content>
<#assign partyId = placingParty.partyId>
<#if placingParty.getEntityName() == "Person">
@@ -507,18 +490,18 @@
</div>
-->
</td>
- <td align="right"><div class="tabletext">${orh.hasSurvey()?string.number}</div></td>
- <td align="right"><div class="tabletext">${orh.getTotalOrderItemsQuantity()?string.number}</div></td>
- <td align="right"><div class="tabletext">${orh.getOrderBackorderQuantity()?string.number}</div></td>
- <td align="right"><div class="tabletext">${orh.getOrderReturnedQuantity()?string.number}</div></td>
- <td align="right"><div class="tabletext"><@ofbizCurrency amount=orderHeader.remainingSubTotal isoCode=orh.getCurrency()/></div></td>
- <td align="right"><div class="tabletext"><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orh.getCurrency()/></div></td>
+ <td align="right">${orh.hasSurvey()?string.number}</td>
+ <td align="right">${orh.getTotalOrderItemsQuantity()?string.number}</td>
+ <td align="right">${orh.getOrderBackorderQuantity()?string.number}</td>
+ <td align="right">${orh.getOrderReturnedQuantity()?string.number}</td>
+ <td align="right"><@ofbizCurrency amount=orderHeader.remainingSubTotal isoCode=orh.getCurrency()/></td>
+ <td align="right"><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orh.getCurrency()/></td>
<td> </td>
- <td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td>
- </td>
+ <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td>
+ </td>
<#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")>
- <td class="tabletext">
+ <td>
<#if filterInventoryProblems.contains(orderHeader.orderId)>
Inv
</#if>
@@ -532,14 +515,13 @@
Part
</#if>
</td>
- </#if>
-
- <td><div class="tabletext">${orderHeader.getString("orderDate")}</div></td>
+ </#if>
+ <td>${orderHeader.getString("orderDate")}</td>
<td>
<#if partyId != "_NA_">
<a href="${customerDetailLink}${partyId}" class="buttontext">${partyId}</a>
<#else>
- <span class='tabletext'>${uiLabelMap.CommonNA}</span>
+ ${uiLabelMap.CommonNA}
</#if>
</td>
<td align='right'>
@@ -547,11 +529,7 @@
</td>
</tr>
<#-- toggle the row color -->
- <#if rowClass == "viewManyTR2">
- <#assign rowClass = "viewManyTR1">
- <#else>
- <#assign rowClass = "viewManyTR2">
- </#if>
+ <#assign alt_row = !alt_row>
</#list>
<#else>
<tr>
@@ -569,4 +547,4 @@
</div>
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/newnote.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/newnote.ftl?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/newnote.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/newnote.ftl Sun Jan 20 12:28:45 2008
@@ -18,31 +18,43 @@
-->
<#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)>
- <h1>${uiLabelMap.OrderAddNote}</h1>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.OrderAddNote}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
-
- <form method="post" action="<@o...@ofbizUrl>" name="createnoteform">
- <table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderNote}</div></td>
- <td width="54%">
- <textarea name="note" class="textAreaBox" rows="5" cols="70"></textarea>
- </td>
- </tr>
- <tr>
- <td/><td class="tabletext">${uiLabelMap.OrderInternalNote} :
- <select class="selectBox" name="internalNote" size="1"><option value=""></option><option value="Y" selected>${uiLabelMap.CommonYes}</option><option value="N">${uiLabelMap.CommonNo}</option></select></td>
- </tr>
- <tr>
- <td/><td class="tabletext"><i>${uiLabelMap.OrderInternalNoteMessage}</i></td>
- </table>
- </form>
-
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
+ <form method="post" action="<@o...@ofbizUrl>" name="createnoteform">
+ <table class="basic-table" cellspacing='0'>
+ <tr>
+ <td width="26%" align="right"><span class="label">${uiLabelMap.OrderNote}</span></td>
+ <td width="54%">
+ <textarea name="note" rows="5" cols="70"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><span class="label">${uiLabelMap.OrderInternalNote}</span>
+ <select name="internalNote" size="1">
+ <option value=""></option>
+ <option value="Y" selected>${uiLabelMap.CommonYes}</option>
+ <option value="N">${uiLabelMap.CommonNo}</option>
+ </select>
+ <span class="tooltip">${uiLabelMap.OrderInternalNoteMessage}</span>
+ </td>
+ </tr>
+ </table>
+ </form>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
+ <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
+ </div>
+</div>
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
+</#if>
\ No newline at end of file
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?rev=613672&r1=613671&r2=613672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Sun Jan 20 12:28:45 2008
@@ -18,7 +18,7 @@
-->
<#macro partyPostalAddress postalContactMechList contactMechPurposeTypeId contactPostalAddress>
- <select name="contactMechId" class="selectBox">
+ <select name="contactMechId">
<option value="${contactPostalAddress.contactMechId}">${(contactPostalAddress.address1)?default("")} - ${contactPostalAddress.city?default("")}</option>
<option value="${contactPostalAddress.contactMechId}"></option>
<#list postalContactMechList as postalContactMech>
@@ -37,17 +37,15 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul><li class="head3"> ${uiLabelMap.OrderContactInformation}</li></ul>
- <br class="clear" />
+ <br class="clear"/>
</div>
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <table class="basic-table" cellspacing='0'>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.CommonName}</b></div>
- </td>
+ <td align="right" valign="top" width="15%"><span class="label"> ${uiLabelMap.CommonName}</span></td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if displayParty?has_content>
<#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}
@@ -66,19 +64,19 @@
<#assign contactMech = orderContactMechValueMap.contactMech>
<#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType>
<#--<#assign partyContactMech = orderContactMechValueMap.partyContactMech>-->
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="7"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${contactMechPurpose.get("description",locale)}</b></div>
+ <span class="label"> ${contactMechPurpose.get("description",locale)}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
<#if contactMech.contactMechTypeId == "POSTAL_ADDRESS">
<#assign postalAddress = orderContactMechValueMap.postalAddress>
<#if postalAddress?has_content>
- <div class="tabletext">
- <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if>
- <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br/></#if>
+ <div>
+ <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br/></#if>
+ <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br/></#if>
${postalAddress.address1}<br/>
<#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if>
@@ -98,14 +96,14 @@
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
<input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId?if_exists}"/>
<input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId?if_exists}"/>
- <hr class="sepbar"/>
+ <hr/>
<div><@partyPostalAddress postalContactMechList = postalContactMechList?if_exists contactMechPurposeTypeId = contactMechPurpose.contactMechPurposeTypeId?if_exists contactPostalAddress=postalAddress?if_exists/><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></div>
</form>
</#if>
</#if>
<#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER">
<#assign telecomNumber = orderContactMechValueMap.telecomNumber>
- <div class="tabletext">
+ <div>
${telecomNumber.countryCode?if_exists}
<#if telecomNumber.areaCode?exists>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber}
<#--<#if partyContactMech.extension?exists>ext ${partyContactMech.extension}</#if>-->
@@ -115,7 +113,7 @@
</#if>
</div>
<#elseif contactMech.contactMechTypeId == "EMAIL_ADDRESS">
- <div class="tabletext">
+ <div>
${contactMech.infoString}
<#if security.hasEntityPermission("ORDERMGR", "_SEND_CONFIRMATION", session)>
<br/>(<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSendConfirmationEmail}</a>)
@@ -124,7 +122,7 @@
</#if>
</div>
<#elseif contactMech.contactMechTypeId == "WEB_ADDRESS">
- <div class="tabletext">
+ <div>
${contactMech.infoString}
<#assign openString = contactMech.infoString>
<#if !openString?starts_with("http") && !openString?starts_with("HTTP")>
@@ -133,7 +131,7 @@
<a target="_blank" href="${openString}" class="buttontext">(open page in new window)</a>
</div>
<#else>
- <div class="tabletext">
+ <div>
${contactMech.infoString?if_exists}
</div>
</#if>
@@ -143,4 +141,4 @@
</table>
</div>
</div>
-</#if>
+</#if>
\ No newline at end of file