OFBiz › OFBiz - Commits

svn commit: r609802 - in /ofbiz/trunk/applications/order: webapp/ordermgr/request/ widget/ordermgr/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r609802 - in /ofbiz/trunk/applications/order: webapp/ordermgr/request/ widget/ordermgr/

Author: mrisaliti
Date: Mon Jan 7 15:02:01 2008
New Revision: 609802

URL: http://svn.apache.org/viewvc?rev=609802&view=rev
Log:
Requests forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1545)

Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl Mon Jan 7 15:02:01 2008
@@ -18,13 +18,13 @@
-->

<#if custRequestItem?exists>
-<form action="<@ofbizUrl>copyCustRequestItem</@ofbizUrl>" method="post" style="margin: 0;">
+<form action="<@ofbizUrl>copyCustRequestItem</@ofbizUrl>" method="post">
<input type="hidden" name="custRequestId" value="${custRequestItem.custRequestId}"/>
<input type="hidden" name="custRequestItemSeqId" value="${custRequestItem.custRequestItemSeqId}"/>
- <div class="tabletext">
- <b>${uiLabelMap.OrderCopyCustRequestItem}:</b>
+ <div>
+ <span class="label">${uiLabelMap.OrderCopyCustRequestItem}</span>
${uiLabelMap.OrderOrderQuoteItems} <input type="checkbox" class="checkBox" name="copyLinkedQuotes" value="Y"/>
</div>
<input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCopy}"/>
</form>
-</#if>
+</#if>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Mon Jan 7 15:02:01 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>

<set field="entityName" value="CustRequest"/>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -88,8 +87,7 @@
</field>
</form>
<form name="ListRequestItems" type="list" use-row-submit="true" title="" list-name="custRequestItems"
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="requestitems">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="requestitems">
<auto-fields-entity entity-name="CustRequestItem" default-field-type="display"/>
<field name="sequenceNum"></field>
<field name="custRequestId"><hidden/></field>
@@ -107,8 +105,7 @@
</form>

<form name="ListRequestQuoteItems" type="list" use-row-submit="true" title="" list-name="quotes"
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="RequestItemQuotes">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="RequestItemQuotes">
<auto-fields-entity entity-name="QuoteItem" default-field-type="display"/>
<field name="quoteId" widget-style="buttontext">
<hyperlink description="${quoteItemSeqId}" target="EditQuoteItemForRequest?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}&quoteId=${quoteId}&quoteItemSeqId=${quoteItemSeqId}"/>
@@ -127,7 +124,7 @@
</form>

<form name="EditCustRequest" type="single" target="updaterequest" title="Request" default-map-name="custRequest"
- 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="custRequest==null" target="createrequest"/>
<auto-fields-service service-name="updateCustRequest" default-field-type="edit"/>
<field name="custRequestId"><hidden/></field>
@@ -209,7 +206,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="EditCustRequestItem" type="single" target="updaterequestitem" title="" default-map-name="custRequestItem"
- 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="custRequestItem==null" target="createrequestitem"/>
<auto-fields-entity entity-name="CustRequestItem" default-field-type="edit"/>
<field name="custRequestId"><hidden/></field>
@@ -252,7 +249,7 @@
</field>
</form>
<form name="EditQuoteItemForRequest" type="single" target="updateQuoteItemForRequest" title="" default-map-name="quoteItem"
- 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="quoteItem==null" target="createQuoteItemForRequest"/>
<auto-fields-entity entity-name="QuoteItem" default-field-type="edit"/>
<field name="quoteId"><display/></field>
@@ -291,12 +288,11 @@
</field>
</form>
<form name="CreateQuoteAndQuoteItemForRequest" type="single" extends="EditQuoteItemForRequest" target="createQuoteAndQuoteItemForRequest" title="" default-map-name="quoteItem"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ header-row-style="header-row" default-table-style="basic-table">
</form>

<form name="ListRequestItemNotes" type="list" use-row-submit="true" title="" list-name="notes"
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="RequestItemNotes">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="RequestItemNotes">
<auto-fields-entity entity-name="CustRequestItemNoteView" default-field-type="display"/>
<field name="noteId"><hidden/></field>
<field name="noteName"><hidden/></field>
@@ -306,14 +302,13 @@
<field name="lastName"><hidden/></field>
</form>
<form name="ListRequestItemWorkEffortReq" type="list" use-row-submit="true" title="" list-name="requirements"
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="RequestItemRequirements">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="RequestItemRequirements">
<auto-fields-entity entity-name="Requirement" default-field-type="display"/>
<field name="requirementId"><hidden/></field>
</form>

<form name="EditRequestItemNote" type="single" target="createrequestitemnote" title="" default-map-name="quoteItem"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ header-row-style="header-row" default-table-style="basic-table">
<field name="custRequestId"><hidden/></field>
<field name="custRequestItemSeqId"><hidden/></field>
<field name="note"><textarea/></field>
@@ -323,8 +318,7 @@
</form>

<form name="ListRequestRoles" type="list" use-row-submit="true" title="" list-name="custRequestRoles"
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="RequestRoles">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="RequestRoles">
<auto-fields-entity entity-name="CustRequestRole" default-field-type="display"/>
<field name="custRequestId"><hidden/></field>
<field name="partyId" widget-style="buttontext">
@@ -342,7 +336,7 @@
</form>

<form name="EditRequestRole" type="single" target="createrequestrole" title=""
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ header-row-style="header-row" default-table-style="basic-table">
<field name="custRequestId"><hidden/></field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
@@ -356,16 +350,14 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListRequestItemRequirements" type="list" title="" list-name="custRequestRequirements"
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="RequestItemRequirements">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="RequestItemRequirements">
<auto-fields-entity entity-name="Requirement" default-field-type="display"/>
<field name="requirementId" widget-style="buttontext">
<hyperlink description="${requirementId}" target="EditRequirement?requirementId=${requirementId}"/>
</field>
</form>
<form name="ListCustRequestItemWorkEfforts" type="list" target="" title=""
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
-
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="custRequestId"><hidden/></field>
<field name="custRequestItemSeqId"><hidden/></field>
<field name="workEffortId">
@@ -379,7 +371,7 @@
</field>
</form>
<form name="AddCustRequestItemWorkEffort" type="single" target="createCustRequestItemWorkEffort" title=""
- 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="workEffort==null" target="createworkeffort"/>
<field name="custRequestId"><hidden/></field>
<field name="custRequestItemSeqId"><hidden/></field>
@@ -387,4 +379,4 @@

<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl Mon Jan 7 15:02:01 2008
@@ -16,26 +16,27 @@
specific language governing permissions and limitations
under the License.
-->
-
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign selected = tabButtonItem?default("void")>

<#if custRequest?exists>
-<div class="tabContainer">
- <a href="<@ofbizUrl>ViewRequest?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.ViewRequest?default(unselectedClassName)}">${uiLabelMap.OrderViewRequest}</a>
- <a href="<@ofbizUrl>EditRequest?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.request?default(unselectedClassName)}">${uiLabelMap.OrderRequest}</a>
- <a href="<@ofbizUrl>requestroles?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.requestroles?default(unselectedClassName)}">${uiLabelMap.OrderRequestRoles}</a>
- <a href="<@ofbizUrl>requestitems?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.requestitems?default(unselectedClassName)}">${uiLabelMap.OrderRequestItems}</a>
-</div>
-<#if custRequestItem?exists>
- <div class="tabContainer">
- <a href="<@ofbizUrl>EditRequestItem?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitem?default(unselectedClassName)}">${uiLabelMap.OrderRequestItem}</a>
- <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemnotes?default(unselectedClassName)}">${uiLabelMap.OrderNotes}</a>
- <#if custRequest.custRequestTypeId = "RF_QUOTE">
- <a href="<@ofbizUrl>RequestItemQuotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemquotes?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuotes}</a>
+ <div class="button-bar tab-bar">
+ <ul>
+ <li<#if selected="ViewRequest"> class="selected"</#if>><a href="<@ofbizUrl>ViewRequest?custRequestId=${custRequest.custRequestId}</@ofbizUrl>">${uiLabelMap.OrderViewRequest}</a></li>
+ <li<#if selected="request"> class="selected"</#if>><a href="<@ofbizUrl>EditRequest?custRequestId=${custRequest.custRequestId}</@ofbizUrl>">${uiLabelMap.OrderRequest}</a></li>
+ <li<#if selected="requestroles"> class="selected"</#if>><a href="<@ofbizUrl>requestroles?custRequestId=${custRequest.custRequestId}</@ofbizUrl>">${uiLabelMap.OrderRequestRoles}</a></li>
+ <li<#if selected="requestitems"> class="selected"</#if>><a href="<@ofbizUrl>requestitems?custRequestId=${custRequest.custRequestId}</@ofbizUrl>">${uiLabelMap.OrderRequestItems}</a></li>
+ </ul>
+ <br/>
+ </div>
+ <#if custRequestItem?exists>
+ <div class="tabContainer">
+ <a href="<@ofbizUrl>EditRequestItem?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitem?default(unselectedClassName)}">${uiLabelMap.OrderRequestItem}</a>
+ <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemnotes?default(unselectedClassName)}">${uiLabelMap.OrderNotes}</a>
+ <#if custRequest.custRequestTypeId = "RF_QUOTE">
+ <a href="<@ofbizUrl>RequestItemQuotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemquotes?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuotes}</a>
+ </#if>
+ <a href="<@ofbizUrl>requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemrequirements?default(unselectedClassName)}">${uiLabelMap.OrderRequirements}</a>
+ <a href="<@ofbizUrl>EditRequestItemWorkEfforts?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.EditRequestItemWorkEfforts?default(unselectedClassName)}">${uiLabelMap.WorkEffortWorkEfforts}</a>
+ </div>
</#if>
- <a href="<@ofbizUrl>requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemrequirements?default(unselectedClassName)}">${uiLabelMap.OrderRequirements}</a>
- <a href="<@ofbizUrl>EditRequestItemWorkEfforts?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.EditRequestItemWorkEfforts?default(unselectedClassName)}">${uiLabelMap.WorkEffortWorkEfforts}</a>
- </div>
-</#if>
</#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl Mon Jan 7 15:02:01 2008
@@ -22,33 +22,32 @@
<div class="boxhead">  ${uiLabelMap.OrderRequestItems}</div>
</div>
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="0">
- <tr align="left" valign="bottom">
- <td width="10%" align="left"><span class="tableheadtext"><b>${uiLabelMap.ProductItem}</b></span></td>
- <td width="35%" align="left"><span class="tableheadtext"><b>${uiLabelMap.EcommerceProduct}</b></span></td>
- <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.ProductQuantity}</b></span></td>
- <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderAmount}</b></span></td>
- <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderRequestMaximumAmount}</b></span></td>
+ <table cellspacing="0" class="basic-table">
+ <tr align="left" valign="bottom" class="header-row">
+ <td width="10%" align="left">${uiLabelMap.ProductItem}</td>
+ <td width="35%" align="left">${uiLabelMap.EcommerceProduct}</td>
+ <td width="10%" align="right">${uiLabelMap.ProductQuantity}</td>
+ <td width="10%" align="right">${uiLabelMap.OrderAmount}</td>
+ <td width="10%" align="right">${uiLabelMap.OrderRequestMaximumAmount}</td>
<td width="5%" align="right"> </td>
</tr>
+ <#assign alt_row = false>
<#list requestItems as requestItem>
<#if requestItem.productId?exists>
<#assign product = requestItem.getRelatedOne("Product")>
</#if>
-
- <tr><td colspan="6"><hr class="sepbar"/></td></tr>
- <tr>
+ <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td valign="top">
- <div class="tabletext" style="font-size: xx-small;">
- <#if showRequestManagementLinks?exists>
- <a href="<@ofbizUrl>EditRequestItem?custRequestId=${requestItem.custRequestId}&custRequestItemSeqId=${requestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${requestItem.custRequestItemSeqId}</a>
- <#else>
- ${requestItem.custRequestItemSeqId}
- </#if>
+ <div>
+ <#if showRequestManagementLinks?exists>
+ <a href="<@ofbizUrl>EditRequestItem?custRequestId=${requestItem.custRequestId}&custRequestItemSeqId=${requestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${requestItem.custRequestItemSeqId}</a>
+ <#else>
+ ${requestItem.custRequestItemSeqId}
+ </#if>
</div>
</td>
<td valign="top">
- <div class="tabletext">
+ <div>
${(product.internalName)?if_exists} 
<#if showRequestManagementLinks?exists>
<a href="/catalog/control/EditProduct?productId=${requestItem.productId?if_exists}" class="buttontext">${requestItem.productId?if_exists}</a>
@@ -57,11 +56,13 @@
</#if>
</div>
</td>
- <td align="right" valign="top"><div class="tabletext">${requestItem.quantity?if_exists}</div></td>
- <td align="right" valign="top"><div class="tabletext">${requestItem.selectedAmount?if_exists}</div></td>
- <td align="right" valign="top"><div class="tabletext"><@ofbizCurrency amount=requestItem.maximumAmount isoCode=request.maximumAmountUomId/></div></td>
+ <td align="right" valign="top">${requestItem.quantity?if_exists}</td>
+ <td align="right" valign="top">${requestItem.selectedAmount?if_exists}</td>
+ <td align="right" valign="top"><@ofbizCurrency amount=requestItem.maximumAmount isoCode=request.maximumAmountUomId/></td>
</tr>
+ <#-- toggle the row color -->
+ <#assign alt_row = !alt_row>
</#list>
</table>
</div>
-</div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl Mon Jan 7 15:02:01 2008
@@ -35,20 +35,19 @@
<div class="boxhead"> ${uiLabelMap.PartyContactInformation}</div>
</div>
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="1">
+ <table cellspacing="0" class="basic-table">
<tr>
- <td align="right" valign="top" width="25%">
- <div class="tabletext"> <b>${label?default(uiLabelMap.PartyUnknown)}</b></div>
+ <td align="right" valign="top" width="25%" class="label">
+  ${label?default(uiLabelMap.PartyUnknown)}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="70%">
- <div class="tabletext">
-
+ <div>
<#if emailAddress?has_content>${emailAddress}</#if>

<#if postalAddress?has_content>
- <#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br/></#if>
- <#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br/></#if>
+ <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span> ${postalAddress.toName}<br/></#if>
+ <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span> ${postalAddress.attnName}<br/></#if>
${postalAddress.address1?if_exists}<br/>
<#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
${postalAddress.city?if_exists},
@@ -67,16 +66,14 @@
${telecomNumber.countryCode?if_exists}
<#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")}
<#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
- <a target="_blank" href="http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8" class="linktext">(lookup:anywho.com)</a>
- <a target="_blank" href="http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode?if_exists}&s=&p=${telecomNumber.contactNumber?if_exists}&pt=b&x=40&y=9" class="linktext">(lookup:whitepages.com)</a>
+ <a target="_blank" href="http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8" class="buttontext">(lookup:anywho.com)</a>
+ <a target="_blank" href="http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode?if_exists}&s=&p=${telecomNumber.contactNumber?if_exists}&pt=b&x=40&y=9" class="buttontext">(lookup:whitepages.com)</a>
</#if>
</#if>
-
</div>
</td>
</tr>
</table>
</div>
</div>
-
-</#if>
+</#if>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl Mon Jan 7 15:02:01 2008
@@ -21,36 +21,36 @@
<div class="boxhead"> ${uiLabelMap.CommonDate}</div>
</div>
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="1">
+ <table cellspacing="0" class="basic-table">
<tr>
- <td align="right" valign="top" width="25%">
- <div class="tabletext"> <b>${uiLabelMap.OrderRequestDate}</b></div>
+ <td align="right" valign="top" width="25%" class="label">
+  ${uiLabelMap.OrderRequestDate}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="70%">
- <div class="tabletext">${(custRequest.custRequestDate.toString())?if_exists}</div>
+ ${(custRequest.custRequestDate.toString())?if_exists}
</td>
</tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="7"><hr/></td></tr>
<tr>
- <td align="right" valign="top" width="25%">
- <div class="tabletext"> <b>${uiLabelMap.OrderRequestCreatedDate}</b></div>
+ <td align="right" valign="top" width="25%" class="label">
+  ${uiLabelMap.OrderRequestCreatedDate}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="70%">
- <div class="tabletext">${(custRequest.createdDate.toString())?if_exists}</div>
+ ${(custRequest.createdDate.toString())?if_exists}
</td>
</tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="7"><hr/></td></tr>
<tr>
- <td align="right" valign="top" width="25%">
- <div class="tabletext"> <b>${uiLabelMap.OrderRequestLastModifiedDate}</b></div>
+ <td align="right" valign="top" width="25%" class="label">
+  ${uiLabelMap.OrderRequestLastModifiedDate}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="70%">
- <div class="tabletext">${(custRequest.lastModifiedDate.toString())?if_exists}</div>
+ ${(custRequest.lastModifiedDate.toString())?if_exists}
</td>
</tr>
</table>
</div>
-</div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestInfo.ftl Mon Jan 7 15:02:01 2008
@@ -21,83 +21,83 @@
<div class="boxhead">${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}</div>
</div>
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="1">
+ <table cellspacing="0" class="basic-table">
<#-- request header information -->
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.CommonType}</b></div>
+ <td align="right" valign="top" width="15%" class="label">
+  ${uiLabelMap.CommonType}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${(custRequestType.get("description",locale))?default(custRequest.custRequestTypeId?if_exists)}</div>
+ ${(custRequestType.get("description",locale))?default(custRequest.custRequestTypeId?if_exists)}
</td>
</tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="7"><hr/></td></tr>
<#-- request status information -->
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.CommonStatus}</b></div>
+ <td align="right" valign="top" width="15%" class="label">
+  ${uiLabelMap.CommonStatus}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${(statusItem.get("description", locale))?default(custRequest.statusId?if_exists)}</div>
+ ${(statusItem.get("description", locale))?default(custRequest.statusId?if_exists)}
</td>
</tr>
<#-- party -->
- <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>${uiLabelMap.PartyPartyId}</b></div>
+ <td align="right" valign="top" width="15%" class="label">
+  ${uiLabelMap.PartyPartyId}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${custRequest.fromPartyId?if_exists}</div>
+ ${custRequest.fromPartyId?if_exists}
</td>
</tr>
<#-- request name -->
- <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>${uiLabelMap.CommonName}</b></div>
+ <td align="right" valign="top" width="15%" class="label">
+  ${uiLabelMap.CommonName}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${custRequest.custRequestName?if_exists}</div>
+ ${custRequest.custRequestName?if_exists}
</td>
</tr>
<#-- request description -->
<tr><td colspan="7"><hr class="sepbar"/></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.CommonDescription}</b></div>
+ <td align="right" valign="top" width="15%" class="label">
+  ${uiLabelMap.CommonDescription}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${custRequest.description?if_exists}</div>
+ ${custRequest.description?if_exists}
</td>
</tr>
<#-- request currency -->
- <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>${uiLabelMap.CommonCurrency}</b></div>
+ <td align="right" valign="top" width="15%" class="label">
+  ${uiLabelMap.CommonCurrency}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext"><#if currency?exists>${currency.get("description", locale)?default(custRequest.maximumAmountUomId?if_exists)}</#if></div>
+ <#if currency?exists>${currency.get("description", locale)?default(custRequest.maximumAmountUomId?if_exists)}</#if>
</td>
</tr>
<#-- request currency -->
- <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>${uiLabelMap.ProductProductStore}</b></div>
+ <td align="right" valign="top" width="15%" class="label">
+  ${uiLabelMap.ProductProductStore}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext"><#if store?exists>${store.storeName?default(custRequest.productStoreId?if_exists)}</#if></div>
+ <#if store?exists>${store.storeName?default(custRequest.productStoreId?if_exists)}</#if>
</td>
</tr>
</table>
</div>
-</div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl Mon Jan 7 15:02:01 2008
@@ -21,21 +21,25 @@
<div class="boxhead"> ${uiLabelMap.OrderRequestRoles}</div>
</div>
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="1">
+ <table cellspacing="0" class="basic-table">
+ <#assign row = 1>
<#list requestRoles as requestRole>
<#assign roleType = requestRole.getRelatedOne("RoleType")>
<#assign party = requestRole.getRelatedOne("Party")>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${roleType.get("description", locale)?if_exists}</b></div>
+ <td align="right" valign="top" width="15%" class="label">
+  ${roleType.get("description", locale)?if_exists}
</td>
- <td width="5"> </td>
+ <td width="5%"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(party)}</div>
+ ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(party)}
</td>
</tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ <#if requestRoles.size() != row>
+ <tr><td colspan="3"><hr/></td></tr>
+ </#if>
+ <#assign row = row + 1>
</#list>
</table>
</div>
-</div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=609802&r1=609801&r2=609802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Mon Jan 7 15:02:01 2008
@@ -64,14 +64,37 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.OrderRequestList}</label>
- </container>
- <container>
- <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.OrderFindRequests}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
+ </container>
+ <include-form name="FindRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.OrderRequestList}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="FindRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -126,7 +149,20 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <include-form name="EditCustRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.OrderRequest}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditCustRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -147,8 +183,34 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <include-form name="ListRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- <include-form name="EditRequestRole" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleRequestRoles}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditRequestRoles}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditRequestRole" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -173,10 +235,23 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container>
- <link target="requestitem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
- </container>
- <include-form name="ListRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleRequestItems}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="requestitem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ </container>
+ <include-form name="ListRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -199,16 +274,26 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <container>
- <link target="requestitem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="requestitem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ </container>
+ <include-form name="EditCustRequestItem" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/request/CopyRequestItem.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="EditCustRequestItem" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/request/CopyRequestItem.ftl"/></html>
- </platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -230,14 +315,24 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/request/requestitemnotes.ftl"/></html>
- </platform-specific>
- <include-form name="ListRequestItemNotes" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- <include-form name="EditRequestItemNote" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/request/requestitemnotes.ftl"/></html>
+ </platform-specific>
+ <include-form name="ListRequestItemNotes" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <include-form name="EditRequestItemNote" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -261,14 +356,23 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <container>
- <link target="EditRequirement?custRequestId=${custRequestItem.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}" text="${uiLabelMap.OrderNewRequirement}" style="buttontext"/>
- </container>
-
- <include-form name="ListRequestItemRequirements" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditRequirement?custRequestId=${custRequestItem.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}" text="${uiLabelMap.OrderNewRequirement}" style="buttontext"/>
+ </container>
+ <include-form name="ListRequestItemRequirements" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -293,13 +397,23 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/request/QuoteLinks.ftl"/></html>
- </platform-specific>
- <include-form name="ListRequestQuoteItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/request/QuoteLinks.ftl"/></html>
+ </platform-specific>
+ <include-form name="ListRequestQuoteItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -326,10 +440,20 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <include-form name="EditQuoteItemForRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditQuoteItemForRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -355,10 +479,20 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <include-form name="CreateQuoteAndQuoteItemForRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="CreateQuoteAndQuoteItemForRequest" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -386,14 +520,37 @@
<widgets>
<decorator-screen name="CommonRequestDecorator">
<decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <container>
- <link target="EditRequestItem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container>
+ <link target="EditRequestItem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ </container>
+ <include-form name="ListCustRequestItemWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="PageTitleEditRequestItemWorkEffort"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddCustRequestItemWorkEffort" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="ListCustRequestItemWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- <include-form name="AddCustRequestItemWorkEffort" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -477,4 +634,4 @@
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file