You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2016/09/17 10:56:13 UTC
svn commit: r1761189 - in /ofbiz/trunk/applications/product:
config/ProductUiLabels.xml widget/facility/FacilityGroupScreens.xml
widget/facility/ShipmentScreens.xml
Author: ashish
Date: Sat Sep 17 10:56:12 2016
New Revision: 1761189
URL: http://svn.apache.org/viewvc?rev=1761189&view=rev
Log:
Improved: Inconsistencies on the title and the label on button of create forms related to Facility.
(OFBIZ-8141)
Thanks: Rahul Bhammarker for the contribution.
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1761189&r1=1761188&r2=1761189&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Sep 17 10:56:12 2016
@@ -11395,6 +11395,9 @@
<value xml:lang="zh">查找产品，供货商是</value>
<value xml:lang="zh-TW">尋找產品供應商是:</value>
</property>
+ <property key="PageTitleNewFacilityGroup">
+ <value xml:lang="en">New Facility Group</value>
+ </property>
<property key="PageTitleNewFacilityContactMech">
<value xml:lang="de">Neuer Einrichtungs-Kontaktmechanismus für ${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="en">New Facility Contact Mechanism for ${facility.facilityName} [${facility.facilityId}]</value>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?rev=1761189&r1=1761188&r2=1761189&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml Sat Sep 17 10:56:12 2016
@@ -88,7 +88,7 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
- <container style="page-title"><label text="${uiLabelMap.PageTitleEditFacilityGroup}"/></container>
+ <container style="page-title"><label text="${groovy: parameters.facilityGroupId ? uiLabelMap.PageTitleEditFacilityGroup : uiLabelMap.PageTitleNewFacilityGroup }"/></container>
<container style="button-bar">
<link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}" style="buttontext create"/>
</container>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=1761189&r1=1761188&r2=1761189&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Sat Sep 17 10:56:12 2016
@@ -216,7 +216,7 @@ under the License.
<widgets>
<decorator-screen name="CommonShipmentDecorator" location="${parameters.commonShipmentDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.ProductEditShipment}">
+ <screenlet title="${groovy: parameters.shipmentId ? uiLabelMap.ProductEditShipment : uiLabelMap.ProductNewShipment}">
<include-form name="EditShipment" location="component://product/widget/facility/ShipmentForms.xml"/>
</screenlet>
</decorator-section>