You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2016/09/16 22:00:12 UTC
svn commit: r1761101 - in /ofbiz/trunk/applications/product/widget: catalog/
facility/
Author: mbrohl
Date: Fri Sep 16 22:00:12 2016
New Revision: 1761101
URL: http://svn.apache.org/viewvc?rev=1761101&view=rev
Log:
Improved: Product: Consistent form name.
(OFBIZ-8089)
Change all form names to upper camel case for consistency.
Thanks: Tanmay Muley for reporting and providing the patch.
Modified:
ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml
ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml
ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml
ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml
ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml
ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Fri Sep 16 22:00:12 2016
@@ -113,7 +113,7 @@ under the License.
<include-form name="EditProdCatalogCategories" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductAddCatalogProdCat}">
- <include-form name="addProductCategoryToProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
+ <include-form name="AddProductCategoryToProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml Fri Sep 16 22:00:12 2016
@@ -20,7 +20,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="lookupProduct" target="LookupProduct" title="" type="single"
+ <form name="LookupProduct" target="LookupProduct" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<!-- <auto-fields-entity entity-name="Product" default-field-type="hidden"/> -->
<field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
@@ -44,7 +44,7 @@ under the License.
<!-- NOTE DEJ20070829 not sure why this is here, but it doesn't seem applicable for a general product lookup, also doesn't handle case where isVariant is null <field name="isVariant"><hidden value="N"/></field> -->
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupProduct" list-name="listIt" title="" type="list" paginate-target="LookupProduct"
+ <form name="ListLookupProduct" list-name="listIt" title="" type="list" paginate-target="LookupProduct"
odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -70,7 +70,7 @@ under the License.
</hyperlink>
</field>
</form>
- <form name="lookupSupplierProduct" target="LookupSupplierProduct" title="" type="single"
+ <form name="LookupSupplierProduct" target="LookupSupplierProduct" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="partyId"><hidden/></field>
<field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
@@ -85,7 +85,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupSupplierProduct" list-name="listIt" title="" type="list" paginate-target="LookupSupplierProduct"
+ <form name="ListLookupSupplierProduct" list-name="listIt" title="" type="list" paginate-target="LookupSupplierProduct"
odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -107,11 +107,11 @@ under the License.
<field name="lastPrice"><display currency="${currencyUomId}" type="currency"/></field>
</form>
- <form name="lookupVirtualProduct" extends="lookupProduct" default-map-name= "inputFields" target="LookupVirtualProduct" title="" type="single"
+ <form name="LookupVirtualProduct" extends="LookupProduct" default-map-name= "inputFields" target="LookupVirtualProduct" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="isVirtual"><hidden value="Y"/></field>
</form>
- <form name="listLookupVirtualProduct" list-name="listIt" title="" type="list" extends="listLookupProduct"
+ <form name="ListLookupVirtualProduct" list-name="listIt" title="" type="list" extends="ListLookupProduct"
paginate-target="LookupVirtualProduct" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -129,7 +129,7 @@ under the License.
<field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display-entity entity-name="ProductType"/></field>
</form>
- <form name="lookupProductAndPrice" target="LookupProductAndPrice" title="" type="single"
+ <form name="LookupProductAndPrice" target="LookupProductAndPrice" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<!-- <auto-fields-entity entity-name="Product" default-field-type="hidden"/> -->
<field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
@@ -175,7 +175,7 @@ under the License.
<field name="filterByDate"><hidden value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupProductAndPrice" list-name="listIt" title="" type="list"
+ <form name="ListLookupProductAndPrice" list-name="listIt" title="" type="list"
paginate-target="LookupProductAndPrice" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -211,7 +211,7 @@ under the License.
</field>
</form>
- <form name="lookupProductCategory" target="LookupProductCategory" title="" type="single"
+ <form name="LookupProductCategory" target="LookupProductCategory" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ProductCategory" default-field-type="find"/>
<field name="productCategoryTypeId">
@@ -248,7 +248,7 @@ under the License.
</field-group>
</sort-order>
</form>
- <form name="listLookupProductCategory" list-name="listIt" title="" type="list"
+ <form name="ListLookupProductCategory" list-name="listIt" title="" type="list"
paginate-target="LookupProductCategory" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -270,7 +270,7 @@ under the License.
<field name="detailScreen"><ignored/></field>
</form>
- <form name="lookupProductFeature" target="LookupProductFeature" title="" type="single"
+ <form name="LookupProductFeature" target="LookupProductFeature" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ProductFeature" default-field-type="find"/>
<field name="productFeatureTypeId">
@@ -291,7 +291,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupProductFeature" list-name="listIt" title="" type="list" paginate-target="LookupProductFeature"
+ <form name="ListLookupProductFeature" list-name="listIt" title="" type="list" paginate-target="LookupProductFeature"
odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -319,7 +319,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupProductStore" list-name="listIt" target="" title="" type="list"
+ <form name="ListLookupProductStore" list-name="listIt" target="" title="" type="list"
paginate-target="LookupProductStore" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -339,7 +339,7 @@ under the License.
<field name="storeName"><display/></field>
<!-- <field name="companyName"><display/></field> -->
</form>
- <form name="lookupCostComponentCalc" target="LookupCostComponentCalc" title="" type="single"
+ <form name="LookupCostComponentCalc" target="LookupCostComponentCalc" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="costComponentCalcId" title="${uiLabelMap.ProductCostComponentCalcId}"><text-find/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
@@ -360,7 +360,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupCostComponentCalc" list-name="listIt" title="" type="list" paginate-target="LookupCostComponentCalc"
+ <form name="ListLookupCostComponentCalc" list-name="listIt" title="" type="list" paginate-target="LookupCostComponentCalc"
odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Fri Sep 16 22:00:12 2016
@@ -35,10 +35,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="LookupProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="ListLookupProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -60,10 +60,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupVirtualProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="LookupVirtualProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupVirtualProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="ListLookupVirtualProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -112,10 +112,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupProductAndPrice" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="LookupProductAndPrice" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupProductAndPrice" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="ListLookupProductAndPrice" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -136,10 +136,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupProductCategory" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="LookupProductCategory" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupProductCategory" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="ListLookupProductCategory" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -160,10 +160,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupProductFeature" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="LookupProductFeature" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupProductFeature" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="ListLookupProductFeature" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -190,7 +190,7 @@ under the License.
<include-form name="LookupProductStore" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupProductStore" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="ListLookupProductStore" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -215,10 +215,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupSupplierProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="LookupSupplierProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupSupplierProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="ListLookupSupplierProduct" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -242,10 +242,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupCostComponentCalc" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="LookupCostComponentCalc" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupCostComponentCalc" location="component://product/widget/catalog/FieldLookupForms.xml"/>
+ <include-form name="ListLookupCostComponentCalc" location="component://product/widget/catalog/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml Fri Sep 16 22:00:12 2016
@@ -193,7 +193,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="addProductCategoryToProdCatalog" type="single" target="addProductCategoryToProdCatalog" title=""
+ <form name="AddProductCategoryToProdCatalog" type="single" target="addProductCategoryToProdCatalog" title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addProductCategoryToProdCatalog"/>
<field name="prodCatalogId"><hidden/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Fri Sep 16 22:00:12 2016
@@ -1098,7 +1098,7 @@ under the License.
</form>
<!-- create a fixed Asset link on a product -->
- <form name="addFixedAssetProduct" type="single" target="addFixedAssetProduct" title=""
+ <form name="AddFixedAssetProduct" type="single" target="addFixedAssetProduct" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="productId"><hidden/></field>
@@ -1129,7 +1129,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="showFixedAssetProduct" type="single" default-map-name="fixedAssetProduct" target="updFixedAssetProduct" title=""
+ <form name="ShowFixedAssetProduct" type="single" default-map-name="fixedAssetProduct" target="updFixedAssetProduct" title=""
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="fixedAssetId==null" target="addFixedAssetProduct"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Fri Sep 16 22:00:12 2016
@@ -365,7 +365,7 @@ under the License.
<parameter param-name="productId"/>
</link>
</container>
- <include-form name="showFixedAssetProduct" location="component://product/widget/catalog/ProductForms.xml"/>
+ <include-form name="ShowFixedAssetProduct" location="component://product/widget/catalog/ProductForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -386,7 +386,7 @@ under the License.
<decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleAddProductAssetUsage}">
- <include-form name="addFixedAssetProduct" location="component://product/widget/catalog/ProductForms.xml"/>
+ <include-form name="AddFixedAssetProduct" location="component://product/widget/catalog/ProductForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml Fri Sep 16 22:00:12 2016
@@ -771,7 +771,7 @@ under the License.
<field name="spacer" title=" "><display/></field>
<field name="submit" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
</form>
- <form name="createProductStoreEmail" type="single" target="createProductStoreEmail" title=""
+ <form name="CreateProductStoreEmail" type="single" target="createProductStoreEmail" title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createProductStoreEmailSetting"/>
<field name="productStoreId" map-name="productStore"><hidden/></field>
@@ -789,7 +789,7 @@ under the License.
<field name="fromAddress" title="${uiLabelMap.CommonFromAddress}"></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="updateProductStoreEmail" type="list" target="updateProductStoreEmail" title="" list-name="productStoreEmailSettings"
+ <form name="UpdateProductStoreEmail" type="list" target="updateProductStoreEmail" title="" list-name="productStoreEmailSettings"
odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-service service-name="updateProductStoreEmailSetting"/>
<field name="productStoreId"><hidden/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Fri Sep 16 22:00:12 2016
@@ -373,10 +373,10 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditProductStoreEmailSetup}">
- <include-form name="updateProductStoreEmail" location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-form name="UpdateProductStoreEmail" location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.PageTitleAddProductStoreEmailSetup}">
- <include-form name="createProductStoreEmail" location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-form name="CreateProductStoreEmail" location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Fri Sep 16 22:00:12 2016
@@ -470,7 +470,7 @@ under the License.
</form>
<!-- Subscription Communication Event -->
- <form name="listSubscriptionCommEvent" type="list" list-name="subscriptionCommEvent" target="ListSubscriptionCommEvent"
+ <form name="ListSubscriptionCommEvent" type="list" list-name="subscriptionCommEvent" target="ListSubscriptionCommEvent"
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<entity-condition entity-name="SubscriptionAndCommEvent">
@@ -504,7 +504,7 @@ under the License.
</hyperlink>
</field>
</form>
- <form name="createSubscriptionCommEvent" type="single" target="createSubscriptionCommEvent" title=""
+ <form name="CreateSubscriptionCommEvent" type="single" target="createSubscriptionCommEvent" title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createSubscriptionCommEvent"/>
<field name="subscriptionId"><hidden value="${parameters.subscriptionId}"/></field>
Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Fri Sep 16 22:00:12 2016
@@ -304,9 +304,9 @@ under the License.
<decorator-screen name="CommonSubscriptionDecorator" location="${parameters.subscriptionDecoratorLocation}">
<decorator-section name="body">
<screenlet id="addSubscriptionCommEvent" title="${uiLabelMap.PageTitleAddSubscriptionCommEvent}" collapsible="true">
- <include-form name="createSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
+ <include-form name="CreateSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
</screenlet>
- <include-form name="listSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
+ <include-form name="ListSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Fri Sep 16 22:00:12 2016
@@ -55,7 +55,7 @@ under the License.
<field name="selectButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
- <form name="FindFacilityOptions" extends="lookupFacility" extends-resource="component://product/widget/facility/FieldLookupForms.xml" target="FindFacility">
+ <form name="FindFacilityOptions" extends="LookupFacility" extends-resource="component://product/widget/facility/FieldLookupForms.xml" target="FindFacility">
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>
@@ -621,7 +621,7 @@ under the License.
</hyperlink>
</field>
</form>
- <form name="addGroupToFacility" type="single" target="addGroupToFacility" title=""
+ <form name="AddGroupToFacility" type="single" target="addGroupToFacility" title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="FacilityGroupMember"/>
<field name="facilityId"><hidden/></field>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Sep 16 22:00:12 2016
@@ -743,7 +743,7 @@ under the License.
<link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/>
</container>
<screenlet id="add-facility-group-member" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
- <include-form name="addGroupToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
+ <include-form name="AddGroupToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
<include-form name="EditFacilityGroups" location="component://product/widget/facility/FacilityForms.xml"/>
</decorator-section>
Modified: ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml Fri Sep 16 22:00:12 2016
@@ -20,7 +20,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="lookupFacility" target="LookupFacility" title="" type="single"
+ <form name="LookupFacility" target="LookupFacility" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<!--<auto-fields-entity entity-name="Facility" default-field-type="hidden"/> -->
<field name="facilityId"><text-find/></field>
@@ -37,7 +37,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupFacility" list-name="listIt" title="" type="list"
+ <form name="ListLookupFacility" list-name="listIt" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupFacility">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -53,7 +53,7 @@ under the License.
<field name="facilityName"><display/></field>
<field name="facilityTypeId"><display/></field>
</form>
- <form name="lookupFacilityLocation" target="LookupFacilityLocation" title="" type="single"
+ <form name="LookupFacilityLocation" target="LookupFacilityLocation" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="FacilityLocation" default-field-type="find"/>
<field name="facilityId" use-when="facilityId != null"><hidden/></field>
@@ -75,7 +75,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupFacilityLocation" list-name="listIt" title="" type="list"
+ <form name="ListLookupFacilityLocation" list-name="listIt" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
paginate-target="LookupFacilityLocation">
<actions>
@@ -96,7 +96,7 @@ under the License.
</field>
</form>
- <form name="lookupShipment" type="single" target="LookupShipment"
+ <form name="LookupShipment" type="single" target="LookupShipment"
header-row-style="header-row" default-table-style="basic-table">
<field position="1" name="shipmentId"><text-find/></field>
<field position="1" name="shipmentTypeId">
@@ -118,7 +118,7 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listShipment" list-name="listIt" title="" type="list" paginate-target="LookupShipment"
+ <form name="ListShipment" list-name="listIt" title="" type="list" paginate-target="LookupShipment"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml Fri Sep 16 22:00:12 2016
@@ -38,10 +38,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupFacility" location="component://product/widget/facility/FieldLookupForms.xml"/>
+ <include-form name="LookupFacility" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupFacility" location="component://product/widget/facility/FieldLookupForms.xml"/>
+ <include-form name="ListLookupFacility" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -66,10 +66,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupFacilityLocation" location="component://product/widget/facility/FieldLookupForms.xml"/>
+ <include-form name="LookupFacilityLocation" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupFacilityLocation" location="component://product/widget/facility/FieldLookupForms.xml"/>
+ <include-form name="ListLookupFacilityLocation" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -91,10 +91,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupShipment" location="component://product/widget/facility/FieldLookupForms.xml"/>
+ <include-form name="LookupShipment" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listShipment" location="component://product/widget/facility/FieldLookupForms.xml"/>
+ <include-form name="ListShipment" location="component://product/widget/facility/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml Fri Sep 16 22:00:12 2016
@@ -195,7 +195,7 @@ under the License.
<!-- Shipment Plan Forms -->
<!-- ******************* -->
<!-- List for Shipment Plan -->
- <form name="listShipmentPlan" type="list" target="" title="" list-name="listShipmentPlanRows"
+ <form name="ListShipmentPlan" type="list" target="" title="" list-name="listShipmentPlanRows"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="shipmentItemSeqId" title="${uiLabelMap.ProductShipmentItemSeqId}"><display/></field>
<field name="orderId" title="${uiLabelMap.ProductOrderId}"><display/></field>
@@ -230,7 +230,7 @@ under the License.
</hyperlink>
</field>
</form>
- <form name="addToShipmentPlan" type="multi" target="addToShipmentPlan?shipmentId=${shipmentId}" title="" list-name="addToShipmentPlanRows"
+ <form name="AddToShipmentPlan" type="multi" target="addToShipmentPlan?shipmentId=${shipmentId}" title="" list-name="addToShipmentPlanRows"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="shipmentId"><hidden/></field>
<field name="orderId"><hidden/></field>
@@ -259,7 +259,7 @@ under the License.
</form>
<!-- Search by Order Id -->
- <form name="findOrderItems" type="single" target="EditShipmentPlan" title=""
+ <form name="FindOrderItems" type="single" target="EditShipmentPlan" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="action"><hidden value="search"/></field>
<field name="shipmentId"><hidden/></field>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=1761101&r1=1761100&r2=1761101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Fri Sep 16 22:00:12 2016
@@ -257,7 +257,7 @@ under the License.
<decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ProductShipmentPlan}">
- <include-form name="findOrderItems" location="component://product/widget/facility//ShipmentForms.xml"/>
+ <include-form name="FindOrderItems" location="component://product/widget/facility//ShipmentForms.xml"/>
</screenlet>
<section>
<condition>
@@ -265,12 +265,12 @@ under the License.
</condition>
<widgets>
<screenlet title="${uiLabelMap.ProductShipmentPlanAdd}">
- <include-form name="addToShipmentPlan" location="component://product/widget/facility//ShipmentForms.xml"/>
+ <include-form name="AddToShipmentPlan" location="component://product/widget/facility//ShipmentForms.xml"/>
</screenlet>
</widgets>
</section>
<screenlet title="${uiLabelMap.ProductShipmentPlanList}">
- <include-form name="listShipmentPlan" location="component://product/widget/facility//ShipmentForms.xml"/>
+ <include-form name="ListShipmentPlan" location="component://product/widget/facility//ShipmentForms.xml"/>
<label style="h2" text="${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight} ${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}"/>
</screenlet>
<section>