svn commit: r1761240 - in /ofbiz/trunk/applications/product: config/ widget/catalog/

[ashish-18]

Author: ashish
Date: Sat Sep 17 14:01:39 2016
New Revision: 1761240

URL: http://svn.apache.org/viewvc?rev=1761240&view=rev
Log:
Improved: Inconsistencies on the title and the label on button of create forms related to catalog.
(OFBIZ-8140)
Thanks: Rahul Bhammarker for the contribution.

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1761240&r1=1761239&r2=1761240&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Sep 17 14:01:39 2016
@@ -11395,6 +11395,12 @@
         <value xml:lang="zh">查找产品，供货商是</value>
         <value xml:lang="zh-TW">尋找產品供應商是:</value>
     </property>
+    <property key="PageTitleNewConfigItem">
+        <value xml:lang="en">New Config Item</value>
+    </property>
+    <property key="PageTitleNewSubscription">
+        <value xml:lang="en">New Subscription</value>
+    </property>    
     <property key="PageTitleNewFacilityGroup">
         <value xml:lang="en">New Facility Group</value>
     </property>
@@ -11426,6 +11432,9 @@
         <value xml:lang="zh">编辑场所位置</value>
         <value xml:lang="zh-TW">編輯場所位置</value>
     </property>
+    <property key="PageTitleNewProductCatalog">
+        <value xml:lang="en">New Product Catalog</value>
+    </property>    
     <property key="PageTitlePackageShipmentScheduling">
         <value xml:lang="de">Paket Auslieferung Planung</value>
         <value xml:lang="en">Package Shipment Scheduling</value>

Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=1761240&r1=1761239&r2=1761240&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Sat Sep 17 14:01:39 2016
@@ -59,7 +59,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PageTitleEditProductCatalog}">
+                        <screenlet title="${groovy: parameters.prodCatalogId ? uiLabelMap.PageTitleEditProductCatalog : uiLabelMap.PageTitleNewProductCatalog}">
                             <label style="h3">${uiLabelMap.ProductCatalogEmptyWarning}</label>
                             <include-form name="EditProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
                         </screenlet>

Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=1761240&r1=1761239&r2=1761240&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sat Sep 17 14:01:39 2016
@@ -98,7 +98,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonConfigDecorator">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PageTitleEditConfigItem}">
+                        <screenlet title="${groovy: configItemId ? uiLabelMap.PageTitleEditConfigItem : uiLabelMap.PageTitleNewConfigItem}">
                             <include-form name="EditProductConfigItem" location="component://product/widget/catalog/ConfigForms.xml"/>
                         </screenlet>
                     </decorator-section>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1761240&r1=1761239&r2=1761240&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sat Sep 17 14:01:39 2016
@@ -128,7 +128,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PageTitleEditProduct}">
+                        <screenlet title="${groovy: parameters.productId ? uiLabelMap.PageTitleEditProduct : uiLabelMap.ProductNewProduct}">
                             <include-form name="EditProduct" location="component://product/widget/catalog/ProductForms.xml"/>
                         </screenlet>
 

Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=1761240&r1=1761239&r2=1761240&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sat Sep 17 14:01:39 2016
@@ -117,7 +117,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonPromoDecorator">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PageTitleEditProductPromos}">
+                        <screenlet title="${groovy: productPromoId ? uiLabelMap.PageTitleEditProductPromos : uiLabelMap.ProductNewProductPromo}">
                             <include-form name="EditProductPromo" location="component://product/widget/catalog/PromoForms.xml"/>
                         </screenlet>
                     </decorator-section>

Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=1761240&r1=1761239&r2=1761240&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Sat Sep 17 14:01:39 2016
@@ -132,7 +132,7 @@ under the License.
                 </section>
                 <decorator-screen name="CommonSubscriptionDecorator" location="${parameters.subscriptionDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="editSubscription" title="${uiLabelMap.PageTitleEditSubscription}" collapsible="true">
+                        <screenlet id="editSubscription" title="${groovy: subscriptionId ? uiLabelMap.PageTitleEditSubscription : uiLabelMap.PageTitleNewSubscription}" collapsible="true">
                             <include-form name="EditSubscription" location="component://product/widget/catalog/SubscriptionForms.xml"/>
                         </screenlet>
                     </decorator-section>