ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrisal...@apache.org
Subject svn commit: r609796 - in /ofbiz/trunk/applications/order: webapp/ordermgr/quote/ widget/ordermgr/
Date Mon, 07 Jan 2008 22:29:59 GMT
Author: mrisaliti
Date: Mon Jan  7 14:29:58 2008
New Revision: 609796

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

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl
    ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl Mon Jan  7 14:29:58 2008
@@ -17,10 +17,10 @@
 under the License.
 -->
 <#if quote?exists>
-<form action="<@ofbizUrl>copyQuote</@ofbizUrl>" method="post" style="margin: 0;">
+<form action="<@ofbizUrl>copyQuote</@ofbizUrl>" method="post">
     <input type="hidden" name="quoteId" value="${quoteId}"/>
-    <div class="tabletext">
-        <b>${uiLabelMap.OrderCopyQuote}:</b>
+    <div>
+        <span class="label">${uiLabelMap.OrderCopyQuote}</span>
         ${uiLabelMap.OrderOrderQuoteItems}&nbsp;<input type="checkbox" class="checkBox" name="copyQuoteItems" value="Y" checked/>
         ${uiLabelMap.OrderOrderQuoteAdjustments}&nbsp;<input type="checkbox" class="checkBox" name="copyQuoteAdjustments" value="Y" checked/>
         ${uiLabelMap.OrderOrderQuoteRoles}&nbsp;<input type="checkbox" class="checkBox" name="copyQuoteRoles" value="Y" checked/>
@@ -29,4 +29,4 @@
     </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/quote/ManageQuotePrices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl Mon Jan  7 14:29:58 2008
@@ -16,10 +16,11 @@
 specific language governing permissions and limitations
 under the License.
 -->
+<span class="label">${uiLabelMap.OrderOrderQuoteCoefficients}</span>
+<br/>
 <#list quoteCoefficients as quoteCoefficient>
-    <div class="tabletext">${quoteCoefficient.coeffName}:&nbsp;${quoteCoefficient.coeffValue}</div>
+    <div>${quoteCoefficient.coeffName}&nbsp;${quoteCoefficient.coeffValue}</div>
 </#list>
 <br/>
-<div class="tabletext">${uiLabelMap.CommonTotalCostMult}:&nbsp;${costMult}</div>
-<div class="tabletext">${uiLabelMap.CommonTotalCostToPriceMult}:&nbsp;${costToPriceMult}</div>
-<br/>
+<div><span class="label">${uiLabelMap.CommonTotalCostMult}</span>&nbsp;${costMult}</div>
+<div><span class="label">${uiLabelMap.CommonTotalCostToPriceMult}</span>&nbsp;${costToPriceMult}</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl Mon Jan  7 14:29:58 2008
@@ -17,9 +17,6 @@
 under the License.
 -->
 <br/>
-<div class="tableheadtext">${uiLabelMap.CommonTotalCost}:</div>
-<div class="tabletext">${totalCost}</div>
-<div class="tableheadtext">${uiLabelMap.CommonTotalPrice}:</div>
-<div class="tabletext">${totalPrice}</div>
-<div class="tableheadtext">${uiLabelMap.CommonTotalCostMult}:</div>
-<div class="tabletext">${totalCostMult}</div>
+<div><span class="label">${uiLabelMap.CommonTotalCost}</span>&nbsp;${totalCost}</div>
+<div><span class="label">${uiLabelMap.CommonTotalPrice}</span>&nbsp;${totalPrice}</div>
+<div><span class="label">${uiLabelMap.CommonTotalCostMult}</span>&nbsp;${totalCostMult}</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml Mon Jan  7 14:29:58 2008
@@ -21,7 +21,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
     <form name="FindQuotes" target="FindQuote" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="Quote" default-field-type="find"/> 
         <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field>
         <field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
@@ -74,14 +74,13 @@
         <field name="noConditionFind"><hidden value="Y"/></field>
     </form>
     <form name="ListQuotes" list-name="listIt" target="" title="" type="list" 
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="FindQuote">
-      	<actions>
-      	    <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-      	        <field-map field-name="inputFields" env-name="parameters"/>
-      	        <field-map field-name="entityName" value="Quote"/>
-      	    </service>
-      	</actions>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="FindQuote">
+          <actions>
+              <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                  <field-map field-name="inputFields" env-name="parameters"/>
+                  <field-map field-name="entityName" value="Quote"/>
+              </service>
+          </actions>
         <auto-fields-entity entity-name="Quote" default-field-type="display"/>
         <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${quoteId}" target="ViewQuote?quoteId=${quoteId}"/>
@@ -98,7 +97,7 @@
         <field name="validThruDate" title="${uiLabelMap.CommonValidThruDate}"></field>
     </form>
     <form name="EditQuote" type="single" target="updateQuote" title="" default-map-name="quote"
-        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="quote.statusId"/>
@@ -154,8 +153,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListQuoteRoles" target="" title="" type="list" list-name="quoteRoles"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="ListQuoteRoles">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteRoles">
         <auto-fields-entity entity-name="QuoteRole" default-field-type="display"/>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"><display-entity also-hidden="false" entity-name="RoleType"/></field>
@@ -165,7 +163,7 @@
         </field>
     </form>
     <form name="EditQuoteRole" type="single" target="createQuoteRole" title="" default-map-name="quoteRole"
-        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="QuoteRole" default-field-type="edit"/>
         <field name="quoteId"><hidden/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
@@ -179,8 +177,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListQuoteItems" list-name="quoteItems" target="" title="" type="list"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="ListQuoteItems">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteItems">
         <auto-fields-entity entity-name="QuoteItem" default-field-type="display"/>
         <field name="quoteId"><hidden/></field>
         <field name="quoteItemSeqId"><hidden/></field>
@@ -213,7 +210,7 @@
         </field>
     </form>
     <form name="EditQuoteItem" type="single" target="updateQuoteItem" 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="createQuoteItem"/>
         <auto-fields-entity entity-name="QuoteItem" default-field-type="edit"/>
         <field name="quoteId"><hidden/></field>
@@ -260,8 +257,7 @@
     </form>
 
     <form name="ListQuoteAttributes" target="" title="" type="list" list-name="quoteAttributes"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="ListQuoteAttributes">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteAttributes">
         <auto-fields-entity entity-name="QuoteAttribute" default-field-type="display"/>
         <field name="attrName" title="${uiLabelMap.OrderOrderQuoteAttributeName}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${attrName}" target="EditQuoteAttribute?quoteId=${quoteId}&amp;attrName=${attrName}"/>
@@ -284,8 +280,7 @@
     </form>
 
     <form name="ListQuoteCoefficients" target="" title="" type="list" list-name="quoteCoefficients"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="ListQuoteCoefficients">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteCoefficients">
         <auto-fields-entity entity-name="QuoteCoefficient" default-field-type="display"/>
         <field name="coeffName" title="${uiLabelMap.OrderOrderQuoteCoeffName}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${coeffName}" target="EditQuoteCoefficient?quoteId=${quoteId}&amp;coeffName=${coeffName}"/>
@@ -307,8 +302,7 @@
     </form>
     
     <form name="ManageQuotePrices"  title="" type="multi" list-name="quoteItemAndCostInfos" target="autoUpdateQuotePrices?quoteId=${quoteId}" use-row-submit="true"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="ManageQuotePrices">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ManageQuotePrices">
         <field name="custRequestId" title="${uiLabelMap.OrderOrderQuoteViewRequest}" widget-style="buttontext">
             <hyperlink target-type="inter-app" also-hidden="false" description="${custRequestId}-${custRequestItemSeqId}" target="/workeffort/control/requestitem?custRequestId=${custRequestId}&amp;custRequestItemSeqId=${custRequestItemSeqId}"/>
         </field>
@@ -330,8 +324,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
     </form>
     <form name="ListQuoteAdjustments" target="" title="" type="list" list-name="quoteAdjustments"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="ListQuoteAdjustments">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteAdjustments">
         <auto-fields-entity entity-name="QuoteAdjustment" default-field-type="display"/>
         <field name="quoteId"><hidden/></field>
         <field name="quoteAdjustmentId"><hidden/></field>
@@ -358,7 +351,7 @@
         </field>
     </form>
     <form name="EditQuoteAdjustment" type="single" target="updateQuoteAdjustment" title="" default-map-name="quoteAdjustment"
-        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="quoteAdjustment==null" target="createQuoteAdjustment"/>
         <auto-fields-entity entity-name="QuoteAdjustment" default-field-type="edit"/>
         <field name="quoteId"><hidden/></field>
@@ -386,8 +379,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ViewQuoteProfit" title="" type="list" list-name="quoteItemAndCostInfos" target="" 
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        paginate-target="ViewQuoteProfit">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ViewQuoteProfit">
         <field name="custRequestId" title="${uiLabelMap.OrderOrderQuoteViewRequest}" widget-style="buttontext">
             <hyperlink target-type="inter-app" also-hidden="false" description="${custRequestId}-${custRequestItemSeqId}" target="/workeffort/control/requestitem?custRequestId=${custRequestId}&amp;custRequestItemSeqId=${custRequestItemSeqId}"/>
         </field>
@@ -406,7 +398,7 @@
         <field name="percProfit" title="${uiLabelMap.OrderOrderQuotePercProfit}"><display/></field>
     </form>
     <form name="EditQuoteReportMail" type="single" target="sendQuoteReportMail" 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="quoteId"><hidden/></field>
         <field name="emailType"><hidden/></field>
         <field name="sendTo"><text/></field>
@@ -414,4 +406,4 @@
         <field name="note"><textarea/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteTabBar.ftl Mon Jan  7 14:29:58 2008
@@ -16,22 +16,24 @@
 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 quote?has_content>
-    <div class='tabContainer'>
-        <a href="<@ofbizUrl>ViewQuote?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.ViewQuote?default(unselectedClassName)}">${uiLabelMap.OrderViewQuote}</a>
-        <a href="<@ofbizUrl>EditQuote?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.EditQuote?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuote}</a>
-        <a href="<@ofbizUrl>ListQuoteRoles?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.ListQuoteRoles?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuoteRoles}</a>
-        <a href="<@ofbizUrl>ListQuoteItems?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.ListQuoteItems?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuoteItems}</a>
-        <a href="<@ofbizUrl>ListQuoteAttributes?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.ListQuoteAttributes?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuoteAttributes}</a>
-        <#if security.hasEntityPermission("ORDERMGR", "_QUOTE_PRICE", session)>
-        <a href="<@ofbizUrl>ListQuoteCoefficients?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.ListQuoteCoefficients?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuoteCoefficients}</a>
-        <a href="<@ofbizUrl>ManageQuotePrices?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.ManageQuotePrices?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuotePrices}</a>
-        <a href="<@ofbizUrl>ListQuoteAdjustments?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.ListQuoteAdjustments?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuoteAdjustments}</a>
-        <a href="<@ofbizUrl>ViewQuoteProfit?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.ViewQuoteProfit?default(unselectedClassName)}">${uiLabelMap.OrderViewQuoteProfit}</a>
-        </#if>
-        <a href="<@ofbizUrl>ListQuoteWorkEfforts?quoteId=${quote.quoteId}</@ofbizUrl>" class="${selectedClassMap.QuoteWorkEfforts?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuoteWorkEfforts}</a>
+    <div class="button-bar tab-bar">
+        <ul>
+            <li<#if selected="ViewQuote"> class="selected"</#if>><a href="<@ofbizUrl>ViewQuote?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderViewQuote}</a></li>
+            <li<#if selected="EditQuote"> class="selected"</#if>><a href="<@ofbizUrl>EditQuote?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuote}</a></li>
+            <li<#if selected="ListQuoteRoles"> class="selected"</#if>><a href="<@ofbizUrl>ListQuoteRoles?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuoteRoles}</a></li>
+            <li<#if selected="ListQuoteItems"> class="selected"</#if>><a href="<@ofbizUrl>ListQuoteItems?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuoteItems}</a></li>
+            <li<#if selected="ListQuoteAttributes"> class="selected"</#if>><a href="<@ofbizUrl>ListQuoteAttributes?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuoteAttributes}</a></li>
+            <#if security.hasEntityPermission("ORDERMGR", "_QUOTE_PRICE", session)>
+            <li<#if selected="ListQuoteCoefficients"> class="selected"</#if>><a href="<@ofbizUrl>ListQuoteCoefficients?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuoteCoefficients}</a></li>
+            <li<#if selected="ManageQuotePrices"> class="selected"</#if>><a href="<@ofbizUrl>ManageQuotePrices?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuotePrices}</a></li>
+            <li<#if selected="ListQuoteAdjustments"> class="selected"</#if>><a href="<@ofbizUrl>ListQuoteAdjustments?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuoteAdjustments}</a></li>
+            <li<#if selected="ViewQuoteProfit"> class="selected"</#if>><a href="<@ofbizUrl>ViewQuoteProfit?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderViewQuoteProfit}</a></li>
+            </#if>
+            <li<#if selected="QuoteWorkEfforts"> class="selected"</#if>><a href="<@ofbizUrl>ListQuoteWorkEfforts?quoteId=${quote.quoteId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuoteWorkEfforts}</a></li>
+        </ul>
+        <br/>
     </div>
 </#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Mon Jan  7 14:29:58 2008
@@ -26,18 +26,19 @@
         <div class="boxhead">&nbsp; ${uiLabelMap.OrderOrderQuoteItems}</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.OrderOrderQuoteUnitPrice}</b></span></td>
-                <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderAdjustments}</b></span></td>
-                <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.CommonSubtotal}</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.OrderOrderQuoteUnitPrice}</td>
+                <td width="10%" align="right">${uiLabelMap.OrderAdjustments}</td>
+                <td width="10%" align="right">${uiLabelMap.CommonSubtotal}</td>
                 <td width="5%" align="right">&nbsp;</td>
             </tr>
             <#assign totalQuoteAmount = 0.0>
+            <#assign alt_row = false>
             <#list quoteItems as quoteItem>
                 <#if quoteItem.productId?exists>
                     <#assign product = quoteItem.getRelatedOne("Product")>
@@ -50,11 +51,9 @@
                 </#list>
                 <#assign totalQuoteItemAmount = quoteItemAmount + totalQuoteItemAdjustmentAmount>
                 <#assign totalQuoteAmount = totalQuoteAmount + totalQuoteItemAmount>
-
-                <tr><td colspan="10"><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;">
+                        <div>
                         <#if showQuoteManagementLinks?exists && quoteItem.isPromo?default("N") == "N">
                             <a href="<@ofbizUrl>EditQuoteItem?quoteId=${quoteItem.quoteId}&amp;quoteItemSeqId=${quoteItem.quoteItemSeqId}</@ofbizUrl>" class="buttontext">${quoteItem.quoteItemSeqId}</a>
                         <#else>
@@ -63,7 +62,7 @@
                         </div>
                     </td>
                     <td valign="top">
-                        <div class="tabletext">
+                        <div>
                             ${(product.internalName)?if_exists}&nbsp;
                             <#if showQuoteManagementLinks?exists>
                                 <a href="/catalog/control/EditProduct?productId=${quoteItem.productId?if_exists}" class="buttontext">${quoteItem.productId?if_exists}</a>
@@ -72,51 +71,53 @@
                             </#if>
                         </div>
                     </td>
-                    <td align="right" valign="top"><div class="tabletext">${quoteItem.quantity?if_exists}</div></td>
-                    <td align="right" valign="top"><div class="tabletext">${quoteItem.selectedAmount?if_exists}</div></td>
-                    <td align="right" valign="top"><div class="tabletext"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></div></td>
-                    <td align="right" valign="top"><div class="tabletext"><@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/></div></td>                    
-                    <td align="right" valign="top"><div class="tabletext"><@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/></div></td>                    
+                    <td align="right" valign="top">${quoteItem.quantity?if_exists}</td>
+                    <td align="right" valign="top">${quoteItem.selectedAmount?if_exists}</td>
+                    <td align="right" valign="top"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></td>
+                    <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/></td>                    
+                    <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/></td>                    
                 </tr>
                 <#-- now show adjustment details per line item -->
                 <#list quoteItemAdjustments as quoteItemAdjustment>
                     <#assign adjustmentType = quoteItemAdjustment.getRelatedOne("OrderAdjustmentType")>
                     <tr>
-                        <td align="right" colspan="5"><div class="tabletext" style="font-size: xx-small;"><b>${adjustmentType.get("description",locale)?if_exists}</b></div></td>
-                        <td align="right">
-                          <div class="tabletext" style="font-size: xx-small;"><@ofbizCurrency amount=quoteItemAdjustment.amount isoCode=quote.currencyUomId/></div>
-                        </td>
+                        <td align="right" colspan="5"><span class="label">${adjustmentType.get("description",locale)?if_exists}</span></td>
+                        <td align="right"><@ofbizCurrency amount=quoteItemAdjustment.amount isoCode=quote.currencyUomId/></td>
                         <td>&nbsp;</td>
                     </tr>
                 </#list>
+                <#-- toggle the row color -->
+                <#assign alt_row = !alt_row>
             </#list>
-
-            <tr><td colspan="10"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="10"><hr/></td></tr>
             <tr>
-                <td align="right" colspan="6"><div class="tabletext"><b>${uiLabelMap.CommonSubtotal}</b></div></td>
-                <td align="right"><div class="tabletext"><@ofbizCurrency amount=totalQuoteAmount isoCode=quote.currencyUomId/></div></td>
+                <td align="right" colspan="6" class="label">${uiLabelMap.CommonSubtotal}</td>
+                <td align="right"><@ofbizCurrency amount=totalQuoteAmount isoCode=quote.currencyUomId/></td>
             </tr>
-            <tr><td colspan="5"></td><td colspan="6"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="5"></td><td colspan="6"><hr/></td></tr>
             <#assign totalQuoteHeaderAdjustmentAmount = 0.0>
+            <#assign findAdjustment = false>
             <#list quoteAdjustments as quoteAdjustment>
                 <#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType")>
                 <#if !quoteAdjustment.quoteItemSeqId?exists>
                     <#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount>
                     <tr>
-                      <td align="right" colspan="6"><div class="tabletext"><b>${adjustmentType.get("description",locale)?if_exists}</b></div></td>
-                      <td align="right"><div class="tabletext"><@ofbizCurrency amount=quoteAdjustment.amount isoCode=quote.currencyUomId/></div></td>
+                      <td align="right" colspan="6"><span class="label">${adjustmentType.get("description",locale)?if_exists}</span></td>
+                      <td align="right"><@ofbizCurrency amount=quoteAdjustment.amount isoCode=quote.currencyUomId/></td>
                     </tr>
                 </#if>
+                <#assign findAdjustment = true>
             </#list>
             <#assign grandTotalQuoteAmount = totalQuoteAmount + totalQuoteHeaderAdjustmentAmount>
-
-            <tr><td colspan="5"></td><td colspan="6"><hr class="sepbar"/></td></tr>
+            <#if findAdjustment>
+            <tr><td colspan="5"></td><td colspan="6"><hr/></td></tr>
+            </#if>
             <tr>
-                <td align="right" colspan="6"><div class="tabletext"><b>${uiLabelMap.OrderGrandTotal}</b></div></td>
+                <td align="right" colspan="6" class="label">${uiLabelMap.OrderGrandTotal}</td>
                 <td align="right">
-                    <div class="tabletext"><@ofbizCurrency amount=grandTotalQuoteAmount isoCode=quote.currencyUomId/></div>
+                    <@ofbizCurrency amount=grandTotalQuoteAmount isoCode=quote.currencyUomId/>
                 </td>
             </tr>
         </table>
     </div>
-</div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl Mon Jan  7 14:29:58 2008
@@ -16,16 +16,17 @@
 specific language governing permissions and limitations
 under the License.
 -->
+<span class="label">${uiLabelMap.OrderOrderQuoteCoefficients}</span>
 <#list quoteCoefficients as quoteCoefficient>
-    <div class="tabletext">${quoteCoefficient.coeffName}:&nbsp;${quoteCoefficient.coeffValue}</div>
+    <div>${quoteCoefficient.coeffName}:&nbsp;${quoteCoefficient.coeffValue}</div>
 </#list>
 <br/>
-<div class="tableheadtext">${uiLabelMap.CommonTotalCostMult}:&nbsp;${costMult}</div>
-<div class="tableheadtext">${uiLabelMap.CommonTotalCostToPriceMult}:&nbsp;${costToPriceMult}</div>
+<div><span class="label">${uiLabelMap.CommonTotalCostMult}</span>&nbsp;${costMult}</div>
+<div><span class="label">${uiLabelMap.CommonTotalCostToPriceMult}</span>&nbsp;${costToPriceMult}</div>
 <br/>
-<div class="tableheadtext">${uiLabelMap.CommonTotalCost}:&nbsp;<@ofbizCurrency amount=totalCost isoCode=quote.currencyUomId/></div>
-<div class="tableheadtext">${uiLabelMap.CommonTotalAmount}:&nbsp;<@ofbizCurrency amount=totalPrice isoCode=quote.currencyUomId/></div>
-<br/>
-<div class="tableheadtext">${uiLabelMap.CommonTotalProfit}:&nbsp;<@ofbizCurrency amount=totalProfit isoCode=quote.currencyUomId/></div>
-<div class="tableheadtext">${uiLabelMap.CommonTotalPercProfit}:&nbsp;${totalPercProfit}%</div>
+<div><span class="label">${uiLabelMap.CommonTotalCost}</span>&nbsp;<@ofbizCurrency amount=totalCost isoCode=quote.currencyUomId/></div>
+<div><span class="label">${uiLabelMap.CommonTotalAmount}</span>&nbsp;<@ofbizCurrency amount=totalPrice isoCode=quote.currencyUomId/></div>
 <br/>
+<div><span class="label">${uiLabelMap.CommonTotalProfit}</span>&nbsp;<@ofbizCurrency amount=totalProfit isoCode=quote.currencyUomId/></div>
+<div><span class="label">${uiLabelMap.CommonTotalPercProfit}</span>&nbsp;${totalPercProfit}%</div>
+<br/>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl Mon Jan  7 14:29:58 2008
@@ -21,36 +21,36 @@
         <div class="boxhead">&nbsp;${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="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.OrderOrderQuoteIssueDate}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.OrderOrderQuoteIssueDate}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${(quote.issueDate.toString())?if_exists}</div>
+                    ${(quote.issueDate.toString())?if_exists}
                 </td>
             </tr>
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonValidFromDate}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.CommonValidFromDate}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${(quote.validFromDate.toString())?if_exists}</div>
+                    ${(quote.validFromDate.toString())?if_exists}
                 </td>
             </tr>
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonValidThruDate}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.CommonValidThruDate}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${(quote.validThruDate.toString())?if_exists}</div>
+                    ${(quote.validThruDate.toString())?if_exists}
                 </td>
             </tr>
         </table>
     </div>
-</div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Mon Jan  7 14:29:58 2008
@@ -21,96 +21,96 @@
         <div class="boxhead">${uiLabelMap.OrderOrderQuoteId}&nbsp;${quote.quoteId}&nbsp;${uiLabelMap.CommonInformation}</div>
     </div>
     <div class="screenlet-body">
-        <table width="100%" border="0" cellpadding="1">
+        <table cellspacing="0" class="basic-table">
             <#-- quote header information -->
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonType}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.CommonType}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)}</div>
+                    ${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)}
                 </td>
             </tr>
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
 
             <#-- quote Channel information -->
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.OrderSalesChannel}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.OrderSalesChannel}</div>
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId?if_exists)}</div>
+                    ${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId?if_exists)}
                 </td>
             </tr>
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
 
             <#-- quote status information -->
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonStatus}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.CommonStatus}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${(statusItem.get("description", locale))?default(quote.statusId?if_exists)}</div>
+                    ${(statusItem.get("description", locale))?default(quote.statusId?if_exists)}
                 </td>
             </tr>
             <#-- party -->
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.PartyPartyId}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.PartyPartyId}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${quote.partyId?if_exists}</div>
+                    ${quote.partyId?if_exists}
                 </td>
             </tr>
             <#-- quote name -->
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.OrderOrderQuoteName}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.OrderOrderQuoteName}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${quote.quoteName?if_exists}</div>
+                    ${quote.quoteName?if_exists}
                 </td>
             </tr>
             <#-- quote description -->
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonDescription}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.CommonDescription}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext">${quote.description?if_exists}</div>
+                    ${quote.description?if_exists}
                 </td>
             </tr>
             <#-- quote currency -->
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonCurrency}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.CommonCurrency}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext"><#if currency?exists>${currency.get("description",locale)?default(quote.currencyUomId?if_exists)}</#if></div>
+                    <#if currency?exists>${currency.get("description",locale)?default(quote.currencyUomId?if_exists)}</#if>
                 </td>
             </tr>
             <#-- quote currency -->
-            <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <tr><td colspan="3"><hr/></td></tr>
             <tr>
-                <td align="right" valign="top" width="15%">
-                    <div class="tabletext">&nbsp;<b>${uiLabelMap.ProductProductStore}</b></div>
+                <td align="right" valign="top" width="15%" class="label">
+                    &nbsp;${uiLabelMap.ProductProductStore}
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="5%">&nbsp;</td>
                 <td align="left" valign="top" width="80%">
-                    <div class="tabletext"><#if store?exists>${store.storeName?default(quote.productStoreId?if_exists)}</#if></div>
+                    <#if store?exists>${store.storeName?default(quote.productStoreId?if_exists)}</#if>
                 </td>
             </tr>
         </table>
     </div>
-</div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Mon Jan  7 14:29:58 2008
@@ -21,22 +21,26 @@
         <div class="boxhead">&nbsp;${uiLabelMap.OrderOrderQuoteRoles}</div>
     </div>
     <div class="screenlet-body">
-        <table width="100%" border="0" cellpadding="1">
+        <table cellspacing="0" class="basic-table">
+            <#assign row = 1>
             <#list quoteRoles as quoteRole>
                 <#assign roleType = quoteRole.getRelatedOne("RoleType")>
                 <#assign party = quoteRole.getRelatedOne("Party")>
                 <#assign rolePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quoteRole.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/>
                 <tr>
-                    <td align="right" valign="top" width="15%">
-                        <div class="tabletext">&nbsp;<b>${roleType.get("description",locale)?if_exists}</b></div>
+                    <td align="right" valign="top" width="15%" class="label">
+                        &nbsp;${roleType.get("description",locale)?if_exists}
                     </td>
-                    <td width="5">&nbsp;</td>
+                    <td width="5%">&nbsp;</td>
                     <td align="left" valign="top" width="80%">
-                        <div class="tabletext">${rolePartyNameResult.fullName?default("Name Not Found")}</div>
+                        ${rolePartyNameResult.fullName?default("Name Not Found")}
                     </td>
                 </tr>
-                <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+            <#if quoteRoles.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/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Mon Jan  7 14:29:58 2008
@@ -32,14 +32,24 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <label style="head1">${uiLabelMap.OrderOrderQuotes}</label>
-                        </container>
-                        <container>
-                            <link target="EditQuote" text="${uiLabelMap.OrderCreateOrderQuote}" style="buttontext"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuotes}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuote" text="${uiLabelMap.OrderCreateOrderQuote}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="FindQuotes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                        <include-form name="ListQuotes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="FindQuotes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
-                        <include-form name="ListQuotes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -82,9 +92,22 @@
                             <html><html-template location="component://order/webapp/ordermgr/quote/CreateOrderQuote.ftl"/></html>
                         </platform-specific>
                         <include-screen name="ViewQuoteTemplate"/>
-                        <platform-specific>
-                            <html><html-template location="component://order/webapp/ordermgr/quote/CopyQuote.ftl"/></html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderCopyQuote}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <platform-specific>
+                                            <html><html-template location="component://order/webapp/ordermgr/quote/CopyQuote.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -199,7 +222,20 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="EditQuote" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteEdit}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditQuote" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -221,10 +257,23 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteRole?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext"/>
-                        </container>
-                        <include-form name="ListQuoteRoles" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteListRoles}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteRole?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="ListQuoteRoles" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>                                        
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>    
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -246,10 +295,23 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteRole?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext"/>
-                        </container>
-                        <include-form name="EditQuoteRole" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteEditRoles}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteRole?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="EditQuoteRole" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>    
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -274,10 +336,23 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteItem?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext"/>
-                        </container>
-                        <include-form name="ListQuoteItems" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteListItems}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteItem?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="ListQuoteItems" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -299,10 +374,23 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteItem?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext"/>
-                        </container>
-                        <include-form name="EditQuoteItem" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteEditItems}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteItem?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="EditQuoteItem" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>    
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -323,10 +411,23 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteAttribute?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext"/>
-                        </container>
-                        <include-form name="ListQuoteAttributes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteListAttributes}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteAttribute?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="ListQuoteAttributes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -348,10 +449,23 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteAttribute?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext"/>
-                        </container>
-                        <include-form name="EditQuoteAttribute" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteEditAttributes}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteAttribute?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="EditQuoteAttribute" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>    
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -372,10 +486,23 @@
             <widgets>
                 <decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteCoefficient?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteListCoefficients}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteCoefficient?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="ListQuoteCoefficients" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="ListQuoteCoefficients" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -397,10 +524,23 @@
             <widgets>
                 <decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteCoefficient?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteEditCoefficients}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteCoefficient?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="EditQuoteCoefficient" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="EditQuoteCoefficient" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -432,13 +572,39 @@
             <widgets>
                 <decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePrices.ftl"/></html>
-                        </platform-specific>
-                        <include-form name="ManageQuotePrices" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
-                        <platform-specific>
-                            <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl"/></html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuotePrices}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <platform-specific>
+                                            <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePrices.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuotePrices}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="ManageQuotePrices" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                        <platform-specific>
+                                            <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -462,11 +628,24 @@
             <widgets>
                 <decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="autoCreateQuoteAdjustments?quoteId=${quoteId}" text="${uiLabelMap.OrderRunStorePromotions}" style="buttontext"/>
-                            <link target="EditQuoteAdjustment?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteListAdjustments}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="autoCreateQuoteAdjustments?quoteId=${quoteId}" text="${uiLabelMap.OrderRunStorePromotions}" style="buttontext"/>
+                                            <link target="EditQuoteAdjustment?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="ListQuoteAdjustments" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
                         </container>
-                        <include-form name="ListQuoteAdjustments" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -488,10 +667,23 @@
             <widgets>
                 <decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditQuoteAdjustment?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext"/>
-                        </container>
-                        <include-form name="EditQuoteAdjustment" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteEditAdjustments}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="EditQuoteAdjustment?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="EditQuoteAdjustment" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -523,10 +715,23 @@
             <widgets>
                 <decorator-screen name="CommonQuotePriceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteProfit.ftl"/></html>
-                        </platform-specific>
-                        <include-form name="ViewQuoteProfit" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteViewProfit}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <platform-specific>
+                                            <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteProfit.ftl"/></html>
+                                        </platform-specific>
+                                        <include-form name="ViewQuoteProfit" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -547,7 +752,20 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="EditQuoteReportMail" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteEditReportMail}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditQuoteReportMail" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -622,5 +840,4 @@
             </widgets>
         </section>
     </screen>
-</screens>
-
+</screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Mon Jan  7 14:29:58 2008
@@ -20,7 +20,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
     <form name="ListQuoteWorkEfforts" separate-columns="true" title="" type="list"  target="ListQuoteWorkEfforts"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="QuoteWorkEffortView">
                 <field-map field-name="quoteId"/>
@@ -36,19 +36,19 @@
         <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType" description="${description}"/></field>
         <field name="actualStartDate"><display/></field>
         <field name="actualEndDate"><display/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="linktext">
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteQuoteWorkEffort?workEffortId=${workEffortId}&amp;quoteId=${quoteId}"/>
         </field>
     </form>
 
     <form name="AddQuoteWorkEffort" extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml" target="/ordermgr/control/createQuoteWorkEffort" target-type="inter-app" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        header-row-style="header-row" default-table-style="basic-table">
 
         <field name="quoteId" map-name="parameters"><display/></field>
         <field name="workEffortId" use-when="workEffort==null&amp;&amp;workEffortId!=null">
             <lookup target-form-name="/workeffort/control/LookupWorkEffort"/>
         </field>
-        <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext">
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext">
             <submit button-type="text-link"/>
         </field>
         <sort-order>
@@ -60,7 +60,7 @@
     </form>
 
     <form name="EditQuoteWorkEffort" target="updateQuoteWorkEffort" title="" type="single" extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext"  default-widget-style="inputBox">
+        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="quote.statusId"/>
@@ -69,8 +69,8 @@
         <field name="quoteId" field-name="quoteId" map-name="parameters">
             <hidden/>
         </field>
-        <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext">
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext">
             <submit button-type="text-link"/>
         </field>
     </form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml?rev=609796&r1=609795&r2=609796&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml Mon Jan  7 14:29:58 2008
@@ -36,7 +36,20 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="AddQuoteWorkEffort" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderCreateOrderQuoteWorkEfforts}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="AddQuoteWorkEffort" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                                
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -59,7 +72,20 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="EditQuoteWorkEffort" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteEditWorkEfforts}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="EditQuoteWorkEffort" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -80,16 +106,26 @@
             <widgets>
                 <decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="AddQuoteWorkEffort?quoteId=${quoteId}" text="[${uiLabelMap.OrderCreateQuoteWorkEffort}]" style="linktext"></link>
-                        </container>
-                        <include-form name="ListQuoteWorkEfforts" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.OrderOrderQuoteWorkEfforts}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container>
+                                            <link target="AddQuoteWorkEffort?quoteId=${quoteId}" text="${uiLabelMap.OrderCreateQuoteWorkEffort}" style="buttontext"/>
+                                        </container>
+                                        <include-form name="ListQuoteWorkEfforts" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>                            
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-
-
-</screens>
-
+</screens>
\ No newline at end of file



Mime
View raw message