Yes, Jacques also I like your suggestion but I cannot promise when I can do it
because I little busy with others.
Thanks
Marco
> It seems that this message never reached the ML
>
> Jacques
>
> ----- Original Message -----
> From: "Jacques Le Roux" <[EMAIL PROTECTED]>
> To: <dev@ofbiz.apache.org>
> Sent: Tuesday, January 08, 2008 10:54 PM
> Subject: Re: svn commit: r610161 - in /ofbiz/trunk/applications/order:
config/ webapp/ordermgr/requirement/ widget/ordermgr/
>
>
> > Marco,
> >
> > You are really doing a great work on this. Thanks for that !
> >
> > I have just a request, could we have the label just following the menu bar
on a new line and not appended at the menu bar ?
> >
> > For instance in catalog.product for "Tiny Gizmo" after "Parties" (last button on
menu bar) we have appendded "Product For:
> > Tiny
> > Gizmo [ID:GZ-1000]". I would prefer to have this on a new line.
> >
> > TIA ;o)
> >
> > Jacques
> >
> >
> >> Author: mrisaliti
> >> Date: Tue Jan 8 13:20:47 2008
> >> New Revision: 610161
> >>
> >> URL: http://svn.apache.org/viewvc?rev=610161&view=rev
> >> Log:
> >> Requirement forms (ftl/widgets screen) has now the same look and feel
(Part of issue OFBIZ-1545)
> >>
> >> Modified:
> >> ofbiz/trunk/applications/order/config/OrderUiLabels.properties
> >> ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
> >>
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
> >>
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementTabBar.ftl
> >>
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementsTabBar.ftl
> >> ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
> >>
> >> Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
> >> URL:
> >>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=610161&r1=610160&r2=610161&view=diff
> >>
==============================================================================
> >> --- ofbiz/trunk/applications/order/config/OrderUiLabels.properties
(original)
> >> +++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Tue Jan
8 13:20:47 2008
> >> @@ -291,6 +291,7 @@
> >> FacilityShippingAndHandling=Shipping and Handling
> >> FacilitySpecialInstructions=Special Instructions
> >> FacilityWaitEntireOrderReady=Please wait until the entire order is ready
before shipping.
> >> +FormFieldTitle_amountTotal=Amount Total
> >> FormFieldTitle_autoOrderShoppingListId=Auto Order Shopping List Id
> >> FormFieldTitle_billToCustomerPartyId=Bill To Customer Party Id
> >> FormFieldTitle_billingAccountId=Billing Account Id
> >> @@ -316,6 +317,7 @@
> >> FormFieldTitle_estimatedReadyDate=Estimated Ready Date
> >> FormFieldTitle_externalId=External Id
> >> FormFieldTitle_facilityId=Facility Id
> >> +FormFieldTitle_facilityQuantityOnHandTotal=Facility Quantity On Hand Total
> >> FormFieldTitle_firstAttemptOrderId=First Attempt Order Id
> >> FormFieldTitle_fixedAssetId=Fixed Asset Id
> >> FormFieldTitle_fulfillContactMechId=Fulfill Contact Mech Id
> >> @@ -352,6 +354,7 @@
> >> FormFieldTitle_productId=Product Id
> >> FormFieldTitle_productStoreId=Product Store Id
> >> FormFieldTitle_productPromoCodeId=Product Promo Code Id
> >> +FormFieldTitle_quantityTotal=Quantity Total
> >> FormFieldTitle_quoteId=Quote Id
> >> FormFieldTitle_reason=Reason
> >> FormFieldTitle_recurrenceInfoId=Recurrence Info Id
> >> @@ -765,6 +768,7 @@
> >> OrderRequirement=Requirement
> >> OrderRequirementByDate=Manufacturing Requirement By Date
> >> OrderRequirementId=RequirementId
> >> +OrderRequirementNumberOfProducts=Number of Products
> >> OrderRequirementStartDate=Manufacturing Requirement Start Date
> >> OrderRequirementStatusId=Order Requirement Status Id
> >> OrderRequirements=Requirements
> >> @@ -898,6 +902,9 @@
> >> PageTitleEditRequestItem=Edit a Request Item
> >> PageTitleEditRequestItemWorkEffort=Edit a Request Item WorkEffort
> >> PageTitleEditRequirement=Edit Requirement
> >> +PageTitleFindApprovedProductRequirements=Find Approved Product
Requirements
> >> +PageTitleFindApprovedRequirements=Find Approved Requirements
> >> +PageTitleFindApprovedRequirementsByVendor=Find Approved Requirements By
Vendor
> >> PageTitleFindQuickReturn=Quick Return
> >> PageTitleFindReturn=Find Return
> >> PageTitleListRequirementCustRequests=List Requirement Cust Requests
> >>
> >> Modified: ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
> >> URL:
> >>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties?rev=610161&r1=610160&r2=610161&view=diff
> >>
==============================================================================
> >> --- ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
(original)
> >> +++ ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties Tue
Jan 8 13:20:47 2008
> >> @@ -293,8 +293,8 @@
> >> OrderAmountAlreadyRefunded=Importo Gi\u00e0 Rimborsato
> >> OrderApproved=Approvato
> >> OrderApproveOrder=Approva Ordine(i)
> >> -OrderApprovedProductRequirements=Approva Fabbisogni Prodotto
> >> -OrderApprovedProductRequirementsByVendor=Approva Fabbisogni Per Fornitore
> >> +OrderApprovedProductRequirements=Fabbisogni Prodotto Approvati
> >> +OrderApprovedProductRequirementsByVendor=Fabbisogni Per Fornitore
Approvati
> >> OrderApproveRequirements=Approva Fabbisogni
> >> OrderAutoAssign=Assegnazione Automatica
> >> OrderAutoCreateQuoteAdjustments=Creazione Automatica Aggiustamenti
> >> @@ -618,9 +618,11 @@
> >> OrderRequirement = Fabbisogno
> >> OrderRequirementByDate = Fabbisogni Produzione Per Data
> >> OrderRequirementId = Numero Fabbisogno
> >> +OrderRequirementNumberOfProducts=Numero di Prodotti
> >> OrderRequirementStartDate = Data Inizio Fabbisogno Produzione
> >> OrderRequirements = Fabbisogni
> >> OrderRequirementsForRequestItem = Fabbisogno Per Riga Richiesta
> >> +OrderRequirementsList=Lista Fabbisogni
> >> OrderRequirementStatusId=Stato Ordine Fabbisogno
> >> OrderReturnAccept=Accetta Reso
> >> OrderReturnAdjustments=Reso Aggiustamento(i) Ordine Per l'Ordine
> >> @@ -744,6 +746,9 @@
> >> PageTitleEditRequestItem=Aggiorna Riga Richiesta
> >> PageTitleEditRequestItemWorkEffort=Aggiorna Riga Richiesta Impegno di
Lavoro
> >> PageTitleEditQuoteItemForCustRequest=Aggiorna Riga Preventivo Per una
Richiesta Cliente
> >> +PageTitleFindApprovedProductRequirements=Ricerca Fabbisogni Approvati Per
Prodotto
> >> +PageTitleFindApprovedRequirements=Ricerca Fabbisogni Approvati
> >> +PageTitleFindApprovedRequirementsByVendor=Ricerca Fabbisogni Approvati
Per Fornitore
> >> PageTitleFindReturn=Ricerca Reso
> >> PageTitleFindQuickReturn=Reso Veloce
> >> PageTitleListRequirementCustRequests=Lista Fabbisogni Richieste Clienti
> >> @@ -960,4 +965,7 @@
> >> FormFieldTitle_reservStart=Inizio Riserva
> >> FormFieldTitle_reservLength=Lunghezza Riserva
> >> FormFieldTitle_reservPersons=Persone Riserva
> >> -FormFieldTitle_productPromoCodeId=Codice Promozione Prodotto
> >> \ No newline at end of file
> >> +FormFieldTitle_productPromoCodeId=Codice Promozione Prodotto
> >> +FormFieldTitle_facilityQuantityOnHandTotal=Totale Quantit\u00e0
Disponibile Stabilimento
> >> +FormFieldTitle_quantityTotal=Quantit\u00e0 Totale
> >> +FormFieldTitle_amountTotal=Importo Totale
> >> \ No newline at end of file
> >>
> >> Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
> >> URL:
> >>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=610161&r1=610160&r2=610161&view=diff
> >>
==============================================================================
> >> ---
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
(original)
> >> +++
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Tue Jan
8 13:20:47 2008
> >> @@ -1,4 +1,4 @@
> >> -<?xml version="1.0" encoding="UTF-8" ?>
> >> +<?xml version="1.0" encoding="UTF-8"?>
> >> <!--
> >> Licensed to the Apache Software Foundation (ASF) under one
> >> or more contributor license agreements. See the NOTICE file
> >> @@ -20,7 +20,8 @@
> >>
> >> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> >>
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
> >> - <form name="FindRequirements" type="single" target="FindRequirements"
title="">
> >> + <form name="FindRequirements" type="single" target="FindRequirements"
title=""
> >> + header-row-style="header-row" default-table-style="basic-table">
> >> <field name="noConditionFind"><hidden value="Y"/></field>
> >> <field name="hideSearch"><hidden value="Y"/></field>
> >> <field name="requirementId"><text-find/></field>
> >> @@ -52,7 +53,8 @@
> >> <submit button-type="button"/>
> >> </field>
> >> </form>
> >> - <form name="ListRequirements" type="list" target="" title="" list-name="listIt"
paginate-target="FindRequirements">
> >> + <form name="ListRequirements" type="list" target="" title="" list-name="listIt"
paginate-target="FindRequirements"
> >> + odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
> >> <actions>
> >> <service service-name="performFind" result-map-name="result"
result-map-list-name="listIt">
> >> <field-map field-name="inputFields"
env-name="requestParameters"/>
> >> @@ -99,7 +101,8 @@
> >> <hyperlink description="${uiLabelMap.CommonRemove}"
target="deleteRequirement?requirementId=${requirementId}"/>
> >> </field>
> >> </form>
> >> - <form name="EditRequirement" type="single" target="updateRequirement" title=""
default-map-name="requirement">
> >> + <form name="EditRequirement" type="single" target="updateRequirement" title=""
default-map-name="requirement"
> >> + header-row-style="header-row" default-table-style="basic-table">
> >> <alt-target use-when="requirement==null"
target="createRequirement"/>
> >> <auto-fields-service service-name="updateRequirement"
default-field-type="edit"/>
> >> <field name="requirementId"><hidden/></field>
> >> @@ -129,7 +132,8 @@
> >> <submit button-type="button"/>
> >> </field>
> >> </form>
> >> - <form name="ListRequirementCustRequests" type="list" title=""
list-name="requirementCustRequests"
> >> paginate-target="ListRequirementCustRequests">
> >> + <form name="ListRequirementCustRequests" type="list" title=""
list-name="requirementCustRequests"
> >> paginate-target="ListRequirementCustRequests"
> >> + odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
> >> <auto-fields-entity entity-name="RequirementCustRequest"
default-field-type="display"/>
> >> <field name="requirementId"><hidden/></field>
> >> <field name="custRequestId" widget-style="buttontext">
> >> @@ -141,14 +145,16 @@
> >> </form>
> >>
> >> <!-- lists the orders associated with a requirement -->
> >> - <form name="ListRequirementOrders" type="list" title=""
list-name="orderRequirements"
> >> paginate-target="ListRequirementOrders">
> >> + <form name="ListRequirementOrders" type="list" title=""
list-name="orderRequirements"
> >> paginate-target="ListRequirementOrders"
> >> + odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
> >> <auto-fields-entity entity-name="OrderRequirementCommitment"
default-field-type="display"/>
> >> <field name="orderId" widget-style="buttontext">
> >> <hyperlink description="${orderId}" target-type="inter-app"
> >> target="/ordermgr/control/orderview?orderId=${orderId}"/>
> >> </field>
> >> </form>
> >> <!-- lists the roles associated with a requirement -->
> >> - <form name="ListRequirementRoles" type="list" title=""
list-name="requirementRoles"
> >> paginate-target="ListRequirementRoles">
> >> + <form name="ListRequirementRoles" type="list" title=""
list-name="requirementRoles"
> >> paginate-target="ListRequirementRoles"
> >> + odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
> >> <auto-fields-entity entity-name="RequirementRole"
default-field-type="display"/>
> >> <field name="requirementId"><hidden/></field>
> >> <field name="editLink" widget-style="buttontext"
title="${uiLabelMap.CommonEdit}">
> >> @@ -158,7 +164,8 @@
> >> <hyperlink description="${uiLabelMap.CommonRemove}"
> >>
target="removeRequirementRole?requirementId=${requirementId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}"/>
> >> </field>
> >> </form>
> >> - <form name="EditRequirementRole" type="single" target="updateRequirementRole"
title=""
> >> default-map-name="requirementRole">
> >> + <form name="EditRequirementRole" type="single" target="updateRequirementRole"
title=""
> >> default-map-name="requirementRole"
> >> + header-row-style="header-row" default-table-style="basic-table">
> >> <alt-target use-when="requirementRole==null"
target="createRequirementRole"/>
> >> <field name="requirementId"><hidden/></field>
> >> <field name="partyId"
use-when="requirementRole!=null"><display/></field>
> >> @@ -176,7 +183,8 @@
> >> <submit button-type="button"/>
> >> </field>
> >> </form>
> >> - <form name="FindNotApprovedRequirements" type="single"
target="ApproveRequirements" title="">
> >> + <form name="FindNotApprovedRequirements" type="single"
target="ApproveRequirements" title=""
> >> + header-row-style="header-row" default-table-style="basic-table">
> >> <field name="hideSearch"><hidden value="Y"/></field>
> >> <field name="requirementId"><text-find/></field>
> >> <field name="requirementTypeId">
> >> @@ -200,7 +208,7 @@
> >> </field>
> >> </form>
> >> <form name="ApproveRequirements" type="multi" use-row-submit="true"
target="approveRequirements" title=""
> >> list-name="requirements"
> >> - paginate-target="ApproveRequirements">
> >> + paginate-target="ApproveRequirements" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar">
> >> <field name="requirementId" widget-style="buttontext">
> >> <hyperlink also-hidden="true" description="${requirementId}"
> >> target="EditRequirement?requirementId=${requirementId}"/>
> >> </field>
> >> @@ -219,7 +227,8 @@
> >> <submit/>
> >> </field>
> >> </form>
> >> - <form name="FindApprovedProductRequirements" type="single"
target="ApprovedProductRequirements" title="">
> >> + <form name="FindApprovedProductRequirements" type="single"
target="ApprovedProductRequirements" title=""
> >> + header-row-style="header-row" default-table-style="basic-table">
> >> <field name="showList"><hidden value="Y"/></field>
> >> <field name="requirementId"><text-find/></field>
> >> <field name="billToCustomerPartyId">
> >> @@ -247,7 +256,8 @@
> >> <field name="requirementByDate"><date-find type="date"/></field>
> >> <field name="submitButton" title="${uiLabelMap.CommonLookup}"
widget-style="smallSubmit"><submit
> >> button-type="button"/></field>
> >> </form>
> >> - <form name="ApprovedProductRequirementsList" type="list" title=""
list-name="requirementsForSupplier"
> >> paginate-target="RequirementsForSupplier">
> >> + <form name="ApprovedProductRequirementsList" type="list" title=""
list-name="requirementsForSupplier"
> >> paginate-target="RequirementsForSupplier"
> >> + odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
> >> <actions>
> >> <service service-name="prepareFind"
result-map-name="resultConditions">
> >> <field-map field-name="inputFields"
env-name="requestParameters"/>
> >> @@ -282,7 +292,7 @@
> >> <field name="comments"><display/></field>
> >> </form>
> >> <form name="ApprovedProductRequirements" type="multi" use-row-submit="true"
target="quickPurchaseOrderEntry" title=""
> >> list-name="requirementsForSupplier"
> >> - paginate-target="RequirementsForSupplier">
> >> + paginate-target="RequirementsForSupplier"
odd-row-style="alternate-row" default-table-style="basic-table
> >> hover-bar">
> >> <field name="billToCustomerPartyId"><hidden
value="${parameters.billToCustomerPartyId}"/></field>
> >> <field name="supplierPartyId"><hidden
value="${parameters.partyId}"/></field>
> >> <field name="requirementId" widget-style="buttontext">
> >> @@ -310,18 +320,20 @@
> >> <field name="comments"><display/></field>
> >> <field name="_rowSubmit"
title="${uiLabelMap.CommonSelect}"><check/></field>
> >> </form>
> >> - <form name="ApprovedProductRequirementsSubmit" type="single">
> >> + <form name="ApprovedProductRequirementsSubmit" type="single"
> >> + header-row-style="header-row" default-table-style="basic-table">
> >> <field name="submitButton" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
> >> <hyperlink also-hidden="false" target-type="plain"
description="${uiLabelMap.OrderInputQuickPurchaseOrder}"
> >> target="javascript:document.ApprovedProductRequirements.submit()"/>
> >> </field>
> >> </form>
> >> - <form name="ApprovedProductRequirementsSummary" type="single"
default-map-name="quantityReport"
> >> target="ApprovedProductRequirements">
> >> - <field name="distinctProductCount" title="Number of
Products"><display/></field>
> >> + <form name="ApprovedProductRequirementsSummary" type="single"
default-map-name="quantityReport"
> >> target="ApprovedProductRequirements"
> >> + header-row-style="header-row" default-table-style="basic-table">
> >> + <field name="distinctProductCount"
title="${uiLabelMap.OrderRequirementNumberOfProducts}"><display/></field>
> >> <field name="quantityTotal"><display/></field>
> >> <field name="amountTotal"><display type="currency"
currency="${currencyUomId}"/></field>
> >> </form>
> >> <form name="ApprovedProductRequirementsByVendor" type="list"
use-row-submit="true" list-name="requirements"
> >> target="ApprovedProductRequirements" separate-columns="true"
> >> - paginate-target="ApprovedProductRequirementsByVendor">
> >> + paginate-target="ApprovedProductRequirementsByVendor"
odd-row-style="alternate-row"
> >> default-table-style="basic-table
> >> hover-bar">
> >> <field name="partyId">
> >> <display description="${bsh:
org.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false);}"/>
> >> </field>
> >> @@ -348,4 +360,4 @@
> >> <submit button-type="button"/>
> >> </field>
> >> </form>
> >> -</forms>
> >> +</forms>
> >> \ No newline at end of file
> >>
> >> Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementTabBar.ftl
> >> URL:
> >>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementTabBar.ftl?rev=610161&r1=610160&r2=610161&view=diff
> >>
==============================================================================
> >> ---
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementTabBar.ftl
(original)
> >> +++
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementTabBar.ftl Tue Jan
8 13:20:47 2008
> >> @@ -16,15 +16,16 @@
> >> specific language governing permissions and limitations
> >> under the License.
> >> -->
> >> +<#assign selected = tabButtonItem?default("void")>
> >>
> >> -<#assign unselectedClassName = "tabButton">
> >> -<#assign selectedClassMap = {page.tabButtonItem?default("void") :
"tabButtonSelected"}>
> >> -
> >> -<#if requirement?exists>
> >> -<div class='tabContainer'>
> >> - <a
href="<@ofbizUrl>EditRequirement?requirementId=${requirement.requirementId}</@ofbizUrl>"
> >>
class="${selectedClassMap.EditRequirement?default(unselectedClassName)}">${uiLabelMap.OrderRequirement}</a>
> >> - <a
href="<@ofbizUrl>ListRequirementCustRequests?requirementId=${requirement.requirementId}</@ofbizUrl>"
> >>
class="${selectedClassMap.ListRequirementCustRequests?default(unselectedClassName)}">${uiLabelMap.OrderRequests}</a>
> >> - <a
href="<@ofbizUrl>ListRequirementOrders?requirementId=${requirement.requirementId}</@ofbizUrl>"
> >>
class="${selectedClassMap.ListRequirementOrdersTab?default(unselectedClassName)}">${uiLabelMap.OrderOrders}</a>
> >> - <a
href="<@ofbizUrl>ListRequirementRoles?requirementId=${requirement.requirementId}</@ofbizUrl>"
> >>
class="${selectedClassMap.ListRequirementRolesTab?default(unselectedClassName)}">${uiLabelMap.PartyRoles}</a>
> >> -</div>
> >> -</#if>
> >> +<#if requirement?has_content>
> >> + <div class="button-bar tab-bar">
> >> + <ul>
> >> + <li<#if selected="EditRequirement"> class="selected"</#if>><a
> >>
href="<@ofbizUrl>EditRequirement?requirementId=${requirement.requirementId}</@ofbizUrl>">${uiLabelMap.OrderRequirement}</a></li>
> >> + <li<#if selected="ListRequirementCustRequests">
class="selected"</#if>><a
> >>
href="<@ofbizUrl>ListRequirementCustRequests?requirementId=${requirement.requirementId}</@ofbizUrl>">${uiLabelMap.OrderRequests}</a></li>
> >> + <li<#if selected="ListRequirementOrdersTab">
class="selected"</#if>><a
> >>
href="<@ofbizUrl>ListRequirementOrders?requirementId=${requirement.requirementId}</@ofbizUrl>">${uiLabelMap.OrderOrders}</a></li>
> >> + <li<#if selected="ListRequirementRolesTab">
class="selected"</#if>><a
> >>
href="<@ofbizUrl>ListRequirementRoles?requirementId=${requirement.requirementId}</@ofbizUrl>">${uiLabelMap.PartyRoles}</a></li>
> >> + </ul>
> >> + <br/>
> >> + </div>
> >> +</#if>
> >> \ No newline at end of file
> >>
> >> Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementsTabBar.ftl
> >> URL:
> >>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementsTabBar.ftl?rev=610161&r1=610160&r2=610161&view=diff
> >>
==============================================================================
> >> ---
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementsTabBar.ftl
(original)
> >> +++
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementsTabBar.ftl Tue
Jan 8 13:20:47 2008
> >> @@ -16,13 +16,14 @@
> >> specific language governing permissions and limitations
> >> under the License.
> >> -->
> >> +<#assign selected = tabButtonItem?default("void")>
> >>
> >> -<#assign unselectedClassName = "tabButton">
> >> -<#assign selectedClassMap = {page.tabButtonItem?default("void") :
"tabButtonSelected"}>
> >> -
> >> -<div class='tabContainer'>
> >> - <a href="<@ofbizUrl>FindRequirements</@ofbizUrl>"
> >>
class="${selectedClassMap.FindRequirements?default(unselectedClassName)}">${uiLabelMap.OrderRequirements}</a>
> >> - <a href="<@ofbizUrl>ApproveRequirements</@ofbizUrl>"
> >>
class="${selectedClassMap.ApproveRequirements?default(unselectedClassName)}">${uiLabelMap.OrderApproveRequirements}</a>
> >> - <a href="<@ofbizUrl>ApprovedProductRequirementsByVendor</@ofbizUrl>"
> >>
class="${selectedClassMap.ApprovedProductRequirementsByVendor?default(unselectedClassName)}">${uiLabelMap.OrderApprovedProductRequirementsByVendor}</a>
> >> - <a href="<@ofbizUrl>ApprovedProductRequirements</@ofbizUrl>"
> >>
class="${selectedClassMap.ApprovedProductRequirements?default(unselectedClassName)}">${uiLabelMap.OrderApprovedProductRequirements}</a>
> >> -</div>
> >> +<div class="button-bar tab-bar">
> >> + <ul>
> >> + <li<#if selected="FindRequirements"> class="selected"</#if>><a
> >>
href="<@ofbizUrl>FindRequirements</@ofbizUrl>">${uiLabelMap.OrderRequirements}</a></li>
> >> + <li<#if selected="ApproveRequirements"> class="selected"</#if>><a
> >>
href="<@ofbizUrl>ApproveRequirements</@ofbizUrl>">${uiLabelMap.OrderApproveRequirements}</a></li>
> >> + <li<#if selected="ApprovedProductRequirementsByVendor">
class="selected"</#if>><a
> >>
href="<@ofbizUrl>ApprovedProductRequirementsByVendor</@ofbizUrl>">${uiLabelMap.OrderApprovedProductRequirementsByVendor}</a></li>
> >> + <li<#if selected="ApprovedProductRequirements">
class="selected"</#if>><a
> >>
href="<@ofbizUrl>ApprovedProductRequirements</@ofbizUrl>">${uiLabelMap.OrderApprovedProductRequirements}</a></li>
> >> + </ul>
> >> + <br/>
> >> +</div>
> >> \ No newline at end of file
> >>
> >> Modified:
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
> >> URL:
> >>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=610161&r1=610160&r2=610161&view=diff
> >>
==============================================================================
> >> --- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
(original)
> >> +++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Tue Jan 8 13:20:47 2008
> >> @@ -22,10 +22,6 @@
> >>
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
> >> <screen name="CommonRequirementDecorator">
> >> <section>
> >> - <actions>
> >> - <!-- <set field="leftbarScreenName" value="leftbar"/> -->
> >> - <!-- <set field="leftbarScreenLocation" value=""/> -->
> >> - </actions>
> >> <widgets>
> >> <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
> >> <decorator-section name="body">
> >> @@ -41,7 +37,9 @@
> >> <container>
> >> <label
style="head1">${uiLabelMap.OrderRequirement} [${requirementId}]</label>
> >> </container>
> >> +
> >> <decorator-section-include name="body"/>
> >> +
> >> </widgets>
> >> <fail-widgets>
> >> <label
style="head3">${uiLabelMap.OrderViewPermissionError}</label>
> >> @@ -54,10 +52,6 @@
> >> </screen>
> >> <screen name="CommonRequirementsDecorator">
> >> <section>
> >> - <actions>
> >> - <!-- <set field="leftbarScreenName" value="leftbar"/> -->
> >> - <!-- <set field="leftbarScreenLocation" value=""/> -->
> >> - </actions>
> >> <widgets>
> >> <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
> >> <decorator-section name="body">
> >> @@ -87,7 +81,6 @@
> >> <screen name="FindRequirements">
> >> <section>
> >> <actions>
> >> - <set field="title"
value="${uiLabelMap.OrderFindRequirements}"/>
> >> <set field="titleProperty"
value="PageTitleFindRequirements"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem" value="FindRequirements"/>
> >> @@ -97,8 +90,34 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementsDecorator">
> >> <decorator-section name="body">
> >> - <include-form name="FindRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> - <include-form name="ListRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleFindRequirements}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="FindRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleFindRequirements}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="ListRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </decorator-section>
> >> </decorator-screen>
> >> </widgets>
> >> @@ -107,7 +126,6 @@
> >> <screen name="ApproveRequirements">
> >> <section>
> >> <actions>
> >> - <set field="title"
value="${uiLabelMap.OrderFindRequirements}"/>
> >> <set field="titleProperty"
value="PageTitleFindRequirements"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem" value="ApproveRequirements"/>
> >> @@ -118,8 +136,34 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementsDecorator">
> >> <decorator-section name="body">
> >> - <include-form name="FindNotApprovedRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> - <include-form name="ApproveRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleFindApprovedRequirements}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="FindNotApprovedRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleFindApprovedRequirements}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="ApproveRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </decorator-section>
> >> </decorator-screen>
> >> </widgets>
> >> @@ -128,8 +172,7 @@
> >> <screen name="ApprovedProductRequirements">
> >> <section>
> >> <actions>
> >> - <set field="title"
value="${uiLabelMap.OrderFindRequirements}"/>
> >> - <set field="titleProperty"
value="PageTitleFindRequirements"/>
> >> + <set field="titleProperty"
value="PageTitleFindApprovedProductRequirements"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem"
value="ApprovedProductRequirements"/>
> >> <set field="viewIndex" from-field="parameters.VIEW_INDEX"
type="Integer"/>
> >> @@ -140,7 +183,20 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementsDecorator">
> >> <decorator-section name="body">
> >> - <include-form
name="FindApprovedProductRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleFindApprovedProductRequirements}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="FindApprovedProductRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> <section>
> >> <actions>
> >> <set field="genericLinkName"
value="print"/>
> >> @@ -158,17 +214,40 @@
> >> <not><if-empty
field-name="parameters.partyId"/></not>
> >> </condition>
> >> <widgets>
> >> - <container>
> >> - <label style="head2"
text="${uiLabelMap.OrderRequirementsList}"/>
> >> - </container>
> >> - <include-form
name="ApprovedProductRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> <container style="screenlet">
> >> - <include-form
name="ApprovedProductRequirementsSummary"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container
style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.OrderRequirementsList}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="ApprovedProductRequirements"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container
style="screenlet">
> >> + <include-form
name="ApprovedProductRequirementsSummary"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </container>
> >> + <include-form
name="ApprovedProductRequirementsSubmit"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> </container>
> >> - <include-form
name="ApprovedProductRequirementsSubmit"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> </widgets>
> >> <fail-widgets>
> >> - <include-form
name="ApprovedProductRequirementsList"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container
style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleFindApprovedProductRequirements}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="ApprovedProductRequirementsList"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </fail-widgets>
> >> </section>
> >> </decorator-section>
> >> @@ -198,8 +277,7 @@
> >> <screen name="ApprovedProductRequirementsByVendor">
> >> <section>
> >> <actions>
> >> - <set field="title" value="Approved Product Requirements By
Vendor"/>
> >> - <set field="titleProperty"
value="PageTitleFindRequirements"/>
> >> + <set field="titleProperty"
value="PageTitleFindApprovedRequirementsByVendor"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem"
value="ApprovedProductRequirementsByVendor"/>
> >> <set field="viewIndex" from-field="parameters.VIEW_INDEX"
type="Integer"/>
> >> @@ -209,7 +287,20 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementsDecorator">
> >> <decorator-section name="body">
> >> - <include-form
name="ApprovedProductRequirementsByVendor"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleFindApprovedRequirementsByVendor}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="ApprovedProductRequirementsByVendor"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </decorator-section>
> >> </decorator-screen>
> >> </widgets>
> >> @@ -237,7 +328,6 @@
> >> <screen name="EditRequirement">
> >> <section>
> >> <actions>
> >> - <set field="title" value="Edit Requirement"/>
> >> <set field="titleProperty"
value="PageTitleEditRequirement"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem" value="EditRequirement"/>
> >> @@ -249,10 +339,20 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementDecorator">
> >> <decorator-section name="body">
> >> - <container>
> >> - <link target="EditRequirement"
text="${uiLabelMap.OrderNewRequirement}" style="buttontext"/>
> >> - </container>
> >> - <include-form name="EditRequirement"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleEditRequirement}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="EditRequirement"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </decorator-section>
> >> </decorator-screen>
> >> </widgets>
> >> @@ -261,7 +361,6 @@
> >> <screen name="ListRequirementCustRequests">
> >> <section>
> >> <actions>
> >> - <set field="title" value="List RequirementCustRequests"/>
> >> <set field="titleProperty"
value="PageTitleListRequirementCustRequests"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem"
value="ListRequirementCustRequests"/>
> >> @@ -276,7 +375,20 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementDecorator">
> >> <decorator-section name="body">
> >> - <include-form name="ListRequirementCustRequests"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleListRequirementCustRequests}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="ListRequirementCustRequests"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </decorator-section>
> >> </decorator-screen>
> >> </widgets>
> >> @@ -287,7 +399,6 @@
> >> <screen name="ListRequirementOrders">
> >> <section>
> >> <actions>
> >> - <set field="title" value="ListRequirementOrders"/>
> >> <set field="titleProperty"
value="PageTitleListRequirementOrders"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem"
value="ListRequirementOrdersTab"/>
> >> @@ -301,7 +412,20 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementDecorator">
> >> <decorator-section name="body">
> >> - <include-form name="ListRequirementOrders"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleListRequirementOrders}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="ListRequirementOrders"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </decorator-section>
> >> </decorator-screen>
> >> </widgets>
> >> @@ -312,7 +436,6 @@
> >> <screen name="ListRequirementRoles">
> >> <section>
> >> <actions>
> >> - <set field="title" value="ListRequirementRoles"/>
> >> <set field="titleProperty"
value="PageTitleListRequirementRoles"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem"
value="ListRequirementRolesTab"/>
> >> @@ -326,11 +449,24 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementDecorator">
> >> <decorator-section name="body">
> >> - <container>
> >> - <link
target="EditRequirementRole?requirementId=${requirementId}"
> >> text="${uiLabelMap.CommonNew}"
> >> style="buttontext"/>
> >> - <link
target="autoAssignRequirementToSupplier?requirementId=${requirementId}"
> >> text="${uiLabelMap.OrderAutoAssign}" style="buttontext"/>
> >> - </container>
> >> - <include-form name="ListRequirementRoles"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleListRequirementRoles}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <container>
> >> + <link
target="EditRequirementRole?requirementId=${requirementId}"
> >> text="${uiLabelMap.CommonNew}" style="buttontext"/>
> >> + <link
target="autoAssignRequirementToSupplier?requirementId=${requirementId}"
> >> text="${uiLabelMap.OrderAutoAssign}" style="buttontext"/>
> >> + </container>
> >> + <include-form
name="ListRequirementRoles"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </decorator-section>
> >> </decorator-screen>
> >> </widgets>
> >> @@ -339,7 +475,6 @@
> >> <screen name="EditRequirementRole">
> >> <section>
> >> <actions>
> >> - <set field="title" value="Edit Requirement Role"/>
> >> <set field="titleProperty"
value="PageTitleEditRequirementRole"/>
> >> <set field="headerItem" value="requirement"/>
> >> <set field="tabButtonItem"
value="ListRequirementRolesTab"/>
> >> @@ -350,12 +485,23 @@
> >> <widgets>
> >> <decorator-screen name="CommonRequirementDecorator">
> >> <decorator-section name="body">
> >> - <include-form name="EditRequirementRole"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + <container style="screenlet">
> >> + <container style="screenlet-title-bar">
> >> + <container style="head4">
> >> + <label
text="${uiLabelMap.PageTitleEditRequirementRole}"/>
> >> + </container>
> >> + </container>
> >> + <container style="screenlet-body">
> >> + <section>
> >> + <widgets>
> >> + <include-form
name="EditRequirementRole"
> >>
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
> >> + </widgets>
> >> + </section>
> >> + </container>
> >> + </container>
> >> </decorator-section>
> >> </decorator-screen>
> >> </widgets>
> >> </section>
> >> </screen>
> >> -
> >> -</screens>
> >> -
> >> +</screens>
> >> \ No newline at end of file
> >>
> >>
> >>
> >
>
>