svn commit: r829418 [1/4] - in /ofbiz/trunk: applications/accounting/widget
Locked
svn commit: r829418 [1/4] - in /ofbiz/trunk: applications/accounting/widget
 
|
Author: buscob
Date: Sat Oct 24 17:41:31 2009 New Revision: 829418 URL: http://svn.apache.org/viewvc?rev=829418&view=rev Log: Part of OFBIZ-3067 - Menus and form widget files location Party and Product components Moved forms from webapp to widget folder Removed empty folders Added: ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/applications/product/widget/catalog/FacilityForms.xml ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml - copied, changed from r829377, ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml - copied unchanged from r829377, ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Removed: ofbiz/trunk/applications/party/webapp/partymgr/contactlist/ ofbiz/trunk/applications/party/webapp/partymgr/lookup/ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml ofbiz/trunk/applications/product/webapp/catalog/shipping/ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml ofbiz/trunk/applications/product/webapp/facility/labels/ ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Sat Oct 24 17:41:31 2009 @@ -524,7 +524,7 @@ <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="InventoryValuationList" extends="ListInventoryAverageCosts" extends-resource="component://product/webapp/facility/facility/FacilityForms.xml" + <form name="InventoryValuationList" extends="ListInventoryAverageCosts" extends-resource="component://product/widget/facility/FacilityForms.xml" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" list-name="inventoryValuationList" paginate-target="InventoryValuation"> <field name="productAverageCost" use-when="currencyUomId!=null"><display type="currency" currency="${currencyUomId}"/></field> <field name="productAverageCost" use-when="currencyUomId==null" title="${uiLabelMap.FormFieldTitle_unitCost}"><display description="${uiLabelMap.ProductDifferentCurrencies}"/></field> Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (original) +++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Sat Oct 24 17:41:31 2009 @@ -163,26 +163,26 @@ <widgets> <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel"> <include-menu name="personUpdate" location="component://commonext/widget/ofbizsetup/Menus.xml"/> - <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyPerson" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <not><if-empty field="partyNameHistoryList"/></not> </condition> <widgets> - <include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyPersonHistory" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel"> - <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyPerson" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <not><if-empty field="partyNameHistoryList"/></not> </condition> <widgets> - <include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyPersonHistory" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -211,7 +211,7 @@ <not><if-empty field="partyNameHistoryList"/></not> </condition> <widgets> - <include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyGroupHistory" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -224,7 +224,7 @@ <not><if-empty field="partyNameHistoryList"/></not> </condition> <widgets> - <include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyGroupHistory" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -268,7 +268,7 @@ <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.SetupEditOrganizationInformation}"> - <include-form name="EditPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="EditPartyGroup" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml (original) +++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Sat Oct 24 17:41:31 2009 @@ -68,7 +68,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> </form> - <form name="NewCustomer" extends="NewUser" extends-resource="component://party/webapp/partymgr/party/PartyForms.xml"> + <form name="NewCustomer" extends="NewUser" extends-resource="component://party/widget/partymgr/PartyForms.xml"> <field name="partyId"><hidden value="${partyId}"/></field> <field name="customerPartyId"><hidden value="CUST${partyId}"/></field> <field use-when="displayPassword!=null" name="USERNAME" title="${uiLabelMap.CommonUsername}"><text size="30" maxlength="250"/></field> @@ -212,7 +212,7 @@ <field name="allowProductStoreChange"><hidden/></field> </form> - <form name="EditProdCatalog" extends="EditProdCatalog" extends-resource="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"> + <form name="EditProdCatalog" extends="EditProdCatalog" extends-resource="component://product/widget/catalog/ProdCatalogForms.xml"> <field use-when="prodCatalog==null&&prodCatalogId==null" name="prodCatalogId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="${partyId}"/></field> <field name="catalogName" title="${uiLabelMap.ProductCatalogName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> <field name="partyId"><hidden value="${partyId}"/></field> @@ -293,7 +293,7 @@ </field> </form> - <form name="EditCustomer" extends="EditPerson" extends-resource="component://party/webapp/partymgr/party/PartyForms.xml"> + <form name="EditCustomer" extends="EditPerson" extends-resource="component://party/widget/partymgr/PartyForms.xml"> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> <parameter param-name="partyId" from-field="parameters.partyId"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml Sat Oct 24 17:41:31 2009 @@ -35,10 +35,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPartyName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupPartyName" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPartyName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPartyName" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -59,10 +59,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPartyEmail" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupPartyEmail" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPartyEmail" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPartyEmail" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -83,10 +83,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupCustomerName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupCustomerName" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupCustomerName" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupCustomerName" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -108,10 +108,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupCustomerNameForSalesRep" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupCustomerNameForSalesRep" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupCustomerNameForSalesRep" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupCustomerNameForSalesRep" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -132,10 +132,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupPerson" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPerson" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -156,10 +156,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupPerson" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPerson" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -179,10 +179,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupPerson" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPerson" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -206,10 +206,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPartyAndUserLoginAndPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupPartyAndUserLoginAndPerson" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPartyAndUserLoginAndPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPartyAndUserLoginAndPerson" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -232,10 +232,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupUserLoginAndPartyDetails" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupUserLoginAndPartyDetails" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupUserLoginAndPartyDetails" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupUserLoginAndPartyDetails" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -254,10 +254,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupPartyGroup" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPartyGroup" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -277,10 +277,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupPartyGroup" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPartyGroup" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -304,10 +304,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="LookupPartyClassificationGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="LookupPartyClassificationGroup" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPartyClassificationGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPartyClassificationGroup" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -326,10 +326,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="LookupCommEvent" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="LookupCommEvent" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListLookupCommEvent" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="ListLookupCommEvent" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -349,10 +349,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupContactMech" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="lookupContactMech" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupContactMech" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupContactMech" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -373,10 +373,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="LookupInternalOrganization" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="LookupInternalOrganization" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupPartyGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupPartyGroup" location="component://party/widget/partymgr/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml Sat Oct 24 17:41:31 2009 @@ -39,9 +39,9 @@ </condition> <widgets> <screenlet id="AddPartyContactListPanel" title="${uiLabelMap.PartyContactListPartyCreate}" collapsible="true"> - <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="AddPartyContactList"/> + <include-form location="component://party/widget/partymgr/PartyContactListForms.xml" name="AddPartyContactList"/> </screenlet> - <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListPartyContactLists"/> + <include-form location="component://party/widget/partymgr/PartyContactListForms.xml" name="ListPartyContactLists"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> @@ -67,7 +67,7 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-results"> - <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListLookupContactList"/> + <include-form location="component://party/widget/partymgr/PartyContactListForms.xml" name="ListLookupContactList"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Oct 24 17:41:31 2009 @@ -179,7 +179,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyMemberRoles}" navigation-form-name="ViewPartyRoles"> - <include-form name="ViewPartyRoles" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyRoles" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> <section> <condition> @@ -187,7 +187,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PartyAddToRole}"> - <include-form name="AddPartyRole" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddPartyRole" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -203,7 +203,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.PartyNewRoleType}"> - <include-form name="AddRoleType" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddRoleType" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -270,7 +270,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyRelationships}" navigation-form-name="ListPartyRelationships"> - <include-form name="ListPartyRelationships" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListPartyRelationships" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> <container style="lefthalf"> <section> @@ -279,14 +279,14 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PartyNewRelationshipType}"> - <include-form name="AddPartyRelationshipType" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddPartyRelationshipType" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> </container> <container style="righthalf"> <screenlet title="${uiLabelMap.PartyAddOtherRelationship}"> - <include-form name="AddOtherPartyRelationship" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddOtherPartyRelationship" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </container> <container style="clear"/> @@ -313,7 +313,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyVendorInformation}"> - <include-form name="EditVendor" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="EditVendor" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -339,7 +339,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyAttribute}"> - <include-form name="EditPartyAttribute" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="EditPartyAttribute" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -368,9 +368,9 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="AddPartyTaxAuthInfospanel" title="${uiLabelMap.PageTitleAddPartyTaxAuthInfos}" collapsible="true"> - <include-form name="AddPartyTaxAuthInfo" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddPartyTaxAuthInfo" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> - <include-form name="UpdatePartyTaxAuthInfo" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="UpdatePartyTaxAuthInfo" location="component://party/widget/partymgr/PartyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -460,7 +460,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditPersonalInformation}"> - <include-form name="EditPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="EditPerson" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -483,7 +483,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditGroupInformation}"> - <include-form name="EditPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="EditPartyGroup" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -506,10 +506,10 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyUserLoginChangePassword}"> - <include-form name="updatePassword" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="updatePassword" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyUserLoginUpdateSecuritySettings}"> - <include-form name="updateUserLoginSecurity" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="updateUserLoginSecurity" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -530,7 +530,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyCreateUserLogin}"> - <include-form name="AddUserLogin" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddUserLogin" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -575,7 +575,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleNewPartyNote}"> - <include-form name="AddPartyNote" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddPartyNote" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -597,9 +597,9 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="AddPartyRatesPanel" title="${uiLabelMap.PageTitleEditPartyRates}" collapsible="true"> - <include-form name="AddPartyRate" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddPartyRate" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> - <include-form name="ListPartyRates" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListPartyRates" location="component://party/widget/partymgr/PartyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -622,9 +622,9 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="AddSegmentRolePanel" title="${uiLabelMap.PageTitleAddPartySegmentRoles}" collapsible="true"> - <include-form name="AddSegmentRole" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddSegmentRole" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> - <include-form name="ListSegmentRoles" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListSegmentRoles" location="component://party/widget/partymgr/PartyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -679,7 +679,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PartyCreateNewCustomer}"> - <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -711,7 +711,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PartyCreateNewProspect}"> - <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -743,7 +743,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PartyCreateNewEmployee}"> - <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -817,10 +817,10 @@ <parameter param-name="partyId"/> </link> </container> - <include-form name="ListPartyContents" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListPartyContents" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleAddPartyContent}"> - <include-form name="AddPartyContent" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddPartyContent" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -836,7 +836,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyShipperAccount}"> - <include-form name="EditCarrierAccount" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="EditCarrierAccount" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -910,7 +910,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.AccountingInvoicesApplPayments}" navigation-form-name="Invoices"> - <include-form name="ListInvoicesApplPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListInvoicesApplPayments" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <and> @@ -924,7 +924,7 @@ </actions> <widgets> <label style="h2" text="${uiLabelMap.PartyCurrency}"></label> - <include-form name="ListInvoicesApplPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListInvoicesApplPayments" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -939,7 +939,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.PartyInvoicesNotApplied}" navigation-form-name="partyFinancialHistoryInvoicesN"> - <include-form name="ListUnAppliedInvoices" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListUnAppliedInvoices" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <and> @@ -953,7 +953,7 @@ </actions> <widgets> <label style="h2" text="${uiLabelMap.PartyCurrency}"></label> - <include-form name="ListUnAppliedInvoices" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListUnAppliedInvoices" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -966,7 +966,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.PartyPaymentsNotApplied}" navigation-form-name="partyFinancialHistoryPaymentsN"> - <include-form name="ListUnAppliedPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListUnAppliedPayments" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <and> @@ -980,7 +980,7 @@ </actions> <widgets> <label style="h2" text="${uiLabelMap.PartyCurrency}"></label> - <include-form name="ListUnAppliedPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListUnAppliedPayments" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -993,7 +993,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.PartyFinancialSummary}${defaultOrganizationPartyId}" navigation-form-name="partyFinancialSummary"> - <include-form name="partyFinancialSummary" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="partyFinancialSummary" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <and> @@ -1007,7 +1007,7 @@ </actions> <widgets> <label style="h2" text="${uiLabelMap.PartyCurrency}"></label> - <include-form name="partyFinancialSummary" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="partyFinancialSummary" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -1019,7 +1019,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.AccountingBillingAccount}"> - <include-form name="PartyBillingAccount" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="PartyBillingAccount" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -1029,7 +1029,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.OrderOrderReturns}"> - <include-form name="PartyReturns" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="PartyReturns" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -1053,7 +1053,7 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.CommonPreferences}" > - <include-form name="ListPreference" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListPreference" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -1106,11 +1106,11 @@ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyPartyIdentificationList}"> - <include-form name="listPartyIdentification" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="listPartyIdentification" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyPartyIdentification}" navigation-menu-name="newPartyIdentification" id="PartyIdentificationCreationPanel"> <include-menu name="newPartyIdentification" location="component://party/widget/partymgr/PartyMenus.xml"/> - <include-form name="editPartyIdentification" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="editPartyIdentification" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Sat Oct 24 17:41:31 2009 @@ -51,26 +51,26 @@ <widgets> <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel"> <include-menu name="personUpdate" location="component://party/widget/partymgr/PartyMenus.xml"/> - <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyPerson" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <not><if-empty field="partyNameHistoryList"/></not> </condition> <widgets> - <include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyPersonHistory" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.PartyPersonalInformation}" id="PartyPersonalInformationPanel"> - <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyPerson" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <not><if-empty field="partyNameHistoryList"/></not> </condition> <widgets> - <include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyPersonHistory" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -90,26 +90,26 @@ <widgets> <screenlet title="${uiLabelMap.PartyPartyGroupInformation}" navigation-menu-name="groupUpdate" id="PartyGroupInformationPanel"> <include-menu name="groupUpdate" location="component://party/widget/partymgr/PartyMenus.xml"/> - <include-form name="ViewPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyGroup" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <not><if-empty field="partyNameHistoryList"/></not> </condition> <widgets> - <include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyGroupHistory" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.PartyPartyGroupInformation}" id="PartyGroupInformationPanel"> - <include-form name="ViewPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyGroup" location="component://party/widget/partymgr/PartyForms.xml"/> <section> <condition> <not><if-empty field="partyNameHistoryList"/></not> </condition> <widgets> - <include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ViewPartyGroupHistory" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> </screenlet> @@ -146,7 +146,7 @@ <widgets> <screenlet title="${uiLabelMap.PartyPartyIdentifications}" navigation-menu-name="newPartyIdentification" id="PartyIdentificationPanel"> <include-menu name="newPartyIdentification" location="component://party/widget/partymgr/PartyMenus.xml"/> - <include-form name="listPartyIdentification" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="listPartyIdentification" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -327,7 +327,7 @@ </iterate-section> <container id="apply-service-credit"> <label style="h2" text="${uiLabelMap.AccountingApplyServiceCredit}"/> - <include-form name="ApplyServiceCredit" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ApplyServiceCredit" location="component://party/widget/partymgr/PartyForms.xml"/> </container> </screenlet> </widgets> @@ -390,7 +390,7 @@ </condition> <widgets> <screenlet id="subscription-summary" title="${uiLabelMap.ProductSubscriptions}" collapsible="true"> - <include-form name="ListSubscriptions" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListSubscriptions" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -470,7 +470,7 @@ <widgets> <screenlet title="${uiLabelMap.PartyShipperAccount}" navigation-menu-name="addShipper"> <include-menu name="addShipper" location="component://party/widget/partymgr/PartyMenus.xml"/> - <include-form name="ListCarrierAccounts" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListCarrierAccounts" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -509,10 +509,10 @@ <not><if-empty field="parameters.editPartyRel"/></not> </condition> <widgets> - <include-form name="AddContact" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddContact" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> - <include-form name="ListRelatedContacts" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListRelatedContacts" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -543,10 +543,10 @@ <not><if-empty field="parameters.editPartyRel"/></not> </condition> <widgets> - <include-form name="AddAccount" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="AddAccount" location="component://party/widget/partymgr/PartyForms.xml"/> </widgets> </section> - <include-form name="ListRelatedAccounts" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="ListRelatedAccounts" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> @@ -582,7 +582,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.OrderOpportunities}" > - <include-form name="PartySalesOpportunities" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + <include-form name="PartySalesOpportunities" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> </widgets> </section> Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Sat Oct 24 17:41:31 2009 @@ -39,7 +39,7 @@ <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> </container> <screenlet title="${uiLabelMap.PageTitleEditProductCatalog}"> - <include-form name="EditProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + <include-form name="EditProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -75,10 +75,10 @@ <label style="h1">${uiLabelMap.ProductCategories} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> </container> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogCategories}"> - <include-form name="EditProdCatalogCategories" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + <include-form name="EditProdCatalogCategories" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ProductAddCatalogProdCat}"> - <include-form name="addProductCategoryToProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + <include-form name="addProductCategoryToProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -110,10 +110,10 @@ <label style="h1">${uiLabelMap.PartyParties} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> </container> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogParties}"> - <include-form name="UpdateProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + <include-form name="UpdateProdCatalogToParty" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleAddProductCatalogParties}"> - <include-form name="AddProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + <include-form name="AddProdCatalogToParty" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -145,10 +145,10 @@ <label style="h1">${uiLabelMap.ProductStores} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> </container> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogStores}"> - <include-form name="UpdateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + <include-form name="UpdateProductStoreCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleAddProductCatalogStores}"> - <include-form name="CreateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + <include-form name="CreateProductStoreCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Sat Oct 24 17:41:31 2009 @@ -119,13 +119,13 @@ <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ProductUpdateCategoryContentAssoc}"> - <include-form name="UpdateCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="UpdateCategoryContentAssoc" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ProductAddProductCategoryContentFromDate}"> - <include-form name="PrepareAddCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="PrepareAddCategoryContentAssoc" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ProductAddContentCategory}"> - <include-form name="AddCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="AddCategoryContentAssoc" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> <platform-specific> @@ -167,13 +167,13 @@ </widgets> </section> <screenlet title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"> - <include-form name="EditCategoryContentSimpleText" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="EditCategoryContentSimpleText" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ProductListAssociatedContentInfos}"> - <include-form name="ListAssociatedContentInfos" location="component://product/webapp/catalog/product/ProductForms.xml"/> + <include-form name="ListAssociatedContentInfos" location="component://product/widget/catalog/ProductForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}"> - <include-form name="CreateSimpleTextContentForAlternateLocale" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="CreateSimpleTextContentForAlternateLocale" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -356,10 +356,10 @@ <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleCreateCategoryAttributes}"> - <include-form name="CreateProductCategoryAttribute" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="CreateProductCategoryAttribute" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleEditCategoryAttributes}"> - <include-form name="EditProductCategoryAttributes" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="EditProductCategoryAttributes" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -430,10 +430,10 @@ <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductCategoryLink}"> - <include-form name="ListProductCategoryLinks" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="ListProductCategoryLinks" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleCreateProductCategoryLink}"> - <include-form name="AddProductCategoryLink" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + <include-form name="AddProductCategoryLink" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=829418&r1=829417&r2=829418&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sat Oct 24 17:41:31 2009 @@ -72,10 +72,10 @@ <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleFindConfigItems}"> <link target="EditProductConfigItem" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/> - <include-form location="component://product/webapp/catalog/config/ConfigForms.xml" name="FindProductConfigItemsFrom"/> + <include-form location="component://product/widget/catalog/ConfigForms.xml" name="FindProductConfigItemsFrom"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleFindConfigItems}"> - <include-form location="component://product/webapp/catalog/config/ConfigForms.xml" name="FindProductConfigItems"/> + <include-form location="component://product/widget/catalog/ConfigForms.xml" name="FindProductConfigItems"/> </screenlet> </decorator-section> </decorator-screen> @@ -97,7 +97,7 @@ <decorator-screen name="CommonConfigDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditConfigItem}"> - <include-form name="EditProductConfigItem" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <include-form name="EditProductConfigItem" location="component://product/widget/catalog/ConfigForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -146,7 +146,7 @@ <section> <widgets> <screenlet title="${uiLabelMap.ProductConfigOptionList}"> - <include-form name="ProductConfigOptionList" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <include-form name="ProductConfigOptionList" location="component://product/widget/catalog/ConfigForms.xml"/> </screenlet> <section> <condition><not><if-empty field="configOptionId"/></not></condition> @@ -155,13 +155,13 @@ <link style="buttontext" text="${uiLabelMap.ProductCreateNewConfigOptions}" target="EditProductConfigOptions"> <parameter param-name="configItemId"/> </link> - <include-form name="CreateConfigOption" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <include-form name="CreateConfigOption" location="component://product/widget/catalog/ConfigForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.ProductCreateNewConfigOptions}"> - <include-form name="CreateConfigOption" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <include-form name="CreateConfigOption" location="component://product/widget/catalog/ConfigForms.xml"/> </screenlet> </fail-widgets> </section> @@ -177,7 +177,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.ProductComponents} - ${uiLabelMap.CommonId}: ${configOption.configOptionId} - ${configOption.description}"> - <include-form name="ProductConfigList" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <include-form name="ProductConfigList" location="component://product/widget/catalog/ConfigForms.xml"/> </screenlet> <section> <condition> @@ -189,7 +189,7 @@ <parameter param-name="configItemId"/> <parameter param-name="configOptionId"/> </link> - <include-form name="CreateProductConfigProduct" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <include-form name="CreateProductConfigProduct" location="component://product/widget/catalog/ConfigForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -198,7 +198,7 @@ <parameter param-name="configItemId"/> <parameter param-name="configOptionId"/> </link> - <include-form name="CreateProductConfigProduct" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <include-form name="CreateProductConfigProduct" location="component://product/widget/catalog/ConfigForms.xml"/> </screenlet> </fail-widgets> </section> @@ -270,7 +270,7 @@ <decorator-screen name="CommonConfigDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductConfigItemContent}"> - <include-form name="ListProductConfigItem" location="component://product/webapp/catalog/config/ConfigForms.xml"/> + <include-form name="ListProductConfigItem" location="component://product/widget/catalog/ConfigForms.xml"/> </screenlet> </decorator-section> </decorator-screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |