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 2008/06/12 14:54:58 UTC
svn commit: r667064 - in /ofbiz/trunk/applications/product: config/
webapp/facility/group/ webapp/facility/inventory/ webapp/facility/labels/
widget/facility/
Author: ashish
Date: Thu Jun 12 05:54:58 2008
New Revision: 667064
URL: http://svn.apache.org/viewvc?rev=667064&view=rev
Log:
Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839.
Container to Screenlet conversion is done on Facility component.
Thanks Parimal Gain for your patch.
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.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/InventoryItemLabelForms.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
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=667064&r1=667063&r2=667064&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Jun 12 05:54:58 2008
@@ -4222,36 +4222,6 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">ç¼è¾åºæç»</value>
</property>
- <property key="PageTitleEditFacilityGroupMembers">
- <value xml:lang="en">Edit Facility Group Members</value>
- <value xml:lang="es">Editar Miembros de un Grupo de Almacén</value>
- <value xml:lang="fr">Ãdition des membres du groupe de lieux de stockage</value>
- <value xml:lang="it">Aggiorna Membri Gruppo Stabilimento</value>
- <value xml:lang="ro">Actualizeaza Membri Grup Compartiment</value>
- <value xml:lang="ru">ÐзмениÑÑ Ñленов гÑÑÐ¿Ð¿Ñ Ð¾Ð±ÑекÑов</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸¡à¸²à¸à¸´à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
- <value xml:lang="zh">ç¼è¾åºæç»æå</value>
- </property>
- <property key="PageTitleEditFacilityGroupRoles">
- <value xml:lang="en">Edit Facility Group Roles</value>
- <value xml:lang="es">Editar Roles de un Grupo de Almacén</value>
- <value xml:lang="fr">Ãdition des rôles du groupe de lieux de stockage</value>
- <value xml:lang="it">Aggiorna Ruoli Gruppo Stabilimento</value>
- <value xml:lang="ro">Actualizeaza Roluri Grup Compartiment</value>
- <value xml:lang="ru">ÐзмениÑÑ Ñоли гÑÑÐ¿Ð¿Ñ Ð¾Ð±ÑекÑов</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸à¸²à¸à¸°à¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
- <value xml:lang="zh">ç¼è¾åºæç»è§è²</value>
- </property>
- <property key="PageTitleEditFacilityGroupRollup">
- <value xml:lang="en">Edit Facility Group Rollup</value>
- <value xml:lang="es">Editar jerarquÃa de un Grupo de Almacén</value>
- <value xml:lang="fr">Ãdition des nomenclatures du groupe de lieux de stockage</value>
- <value xml:lang="it">Aggiorna Gruppo Stabilimento Arrivo</value>
- <value xml:lang="ro">Actualizeaza Grup Compartiment Sosire</value>
- <value xml:lang="ru">ÐзмениÑÑ Ð¿Ð¾Ð´ÑиненноÑÑÑ Ð³ÑÑÐ¿Ð¿Ñ Ð¾Ð±ÑекÑов</value>
- <value xml:lang="th">Edit Facility Group Rollup</value>
- <value xml:lang="zh">ç¼è¾åºæç»æ±æ»</value>
- </property>
<property key="PageTitleEditFacilityGroups">
<value xml:lang="en">Edit Facility Groups for ${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="es">Editar Grupos de Almacén</value>
@@ -4357,18 +4327,6 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¹à¸«à¸¥à¸·à¸</value>
<value xml:lang="zh">ç¼è¾åºåæç»</value>
</property>
- <property key="PageTitleEditInventoryItemLabelAppls">
- <value xml:lang="en">Edit Inventory Item Label Appls</value>
- <value xml:lang="fr">Ãditer l'étiquette d'article d'inventaire applicable</value>
- <value xml:lang="it">Aggiorna Applicabilità Etichetta Riga Inventario</value>
- <value xml:lang="th">Edit Inventory Item Label Appls</value>
- </property>
- <property key="PageTitleEditInventoryItemLabelTypes">
- <value xml:lang="en">Edit Inventory Item Label Types</value>
- <value xml:lang="fr">Ãditer les types d'étiquette d'article d'inventaire</value>
- <value xml:lang="it">Aggiorna Tipo Etichetta Riga Inventario</value>
- <value xml:lang="th">Edit Inventory Item Label Types</value>
- </property>
<property key="PageTitleEditProduct">
<value xml:lang="en">Edit Product</value>
<value xml:lang="es">Editar Productos</value>
@@ -9923,16 +9881,6 @@
<value xml:lang="th">à¸à¸²à¸£à¸£à¸±à¸à¸©à¸²à¸ªà¸ าà¸à¸à¸¥à¸¸à¹à¸¡à¸ªà¸¡à¸²à¸à¸´à¸</value>
<value xml:lang="zh">ç»æåç»´æ¤</value>
</property>
- <property key="ProductGroupRollupChildGroups">
- <value xml:lang="en">Group Rollup : Update Child Groups</value>
- <value xml:lang="es">JerarquÃa de Grupo: Grupos hijos</value>
- <value xml:lang="fr">Nomenclature de groupe : groupe enfant</value>
- <value xml:lang="it">Aggiorna Gruppo Stabilimento Arrivo : Gruppi Figlio</value>
- <value xml:lang="ro">Grup Sosire : Grupuri Fiu</value>
- <value xml:lang="ru">ÐодÑиненноÑÑÑ Ð³ÑÑппÑ: подÑиненнÑе гÑÑппÑ</value>
- <value xml:lang="th">Group Rollup : Update Child Groups</value>
- <value xml:lang="zh">ç»æ±æ»ï¼ä¸çº§ç»</value>
- </property>
<property key="ProductGroupRollupChildGroupsAdd">
<value xml:lang="en">Group Rollup : Add Child Groups</value>
<value xml:lang="fr">Nomenclature de groupe: ajouter des groupes enfants</value>
Modified: ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml?rev=667064&r1=667063&r2=667064&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml Thu Jun 12 05:54:58 2008
@@ -51,7 +51,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
<form name="UpdateFacilityGroupRollupTo" type="list" target="updateFacilityGroupToGroup" title="" list-name="currentGroupRollups"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateFacilityGroupToGroup"/>
<field name="showFacilityGroupId"><hidden value="${facilityGroupId}"/></field>
<field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field>
@@ -81,7 +81,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="UpdateFacilityGroupRollupFrom" type="list" target="updateFacilityGroupToGroup" title="" list-name="parentGroupRollups"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateFacilityGroupToGroup"/>
<field name="showFacilityGroupId"><hidden value="${parentFacilityGroupId}"/></field>
<field name="parentFacilityGroupId"><hidden/></field>
@@ -112,7 +112,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="UpdateFacilityGroupMembers" type="list" target="updateFacilityToGroup" title="" list-name="facilityGroupMembers"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateFacilityToGroup"/>
<field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field>
<field name="facilityId">
@@ -141,7 +141,7 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="UpdateFacilityGroupRoles" type="list" target="removePartyFromFacilityGroup" title="" list-name="facilityRoles"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="removePartyFromFacilityGroup"/>
<field name="facilityGroupId"><hidden value="${facilityGroupId}"/></field>
<field name="partyId">
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=667064&r1=667063&r2=667064&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Thu Jun 12 05:54:58 2008
@@ -176,7 +176,7 @@
</form>
<!-- Inventory Item Labels -->
<form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelApplFromItem" title="" list-name="inventoryItemLabelAppls"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateInventoryItemLabelAppl"/>
<field name="inventoryItemLabelId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="EditInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}" description="${inventoryItemLabelId}" also-hidden="true"/>
Modified: ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml?rev=667064&r1=667063&r2=667064&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml Thu Jun 12 05:54:58 2008
@@ -36,7 +36,7 @@
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
</form>
<form name="UpdateInventoryItemLabelTypes" type="list" target="updateInventoryItemLabelType" title="" list-name="inventoryItemLabelTypes"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateInventoryItemLabelType"/>
<field name="inventoryItemLabelTypeId"><display/></field>
<field name="parentTypeId">
@@ -85,7 +85,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
<form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelAppl" title="" list-name="inventoryItemLabelAppls"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateInventoryItemLabelAppl"/>
<field name="inventoryItemLabelId"><hidden/></field>
<field name="inventoryItemLabelTypeId"><hidden/></field>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?rev=667064&r1=667063&r2=667064&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml Thu Jun 12 05:54:58 2008
@@ -118,7 +118,7 @@
<screen name="EditFacilityGroupMembers">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditFacilityGroupMembers"/>
+ <set field="titleProperty" value="ProductAddFacilityGroupMember"/>
<set field="headerItem" value="facilityGroup"/>
<set field="tabButtonItem" value="EditFacilityGroupMembers"/>
<entity-one entity-name="FacilityGroup" value-name="facilityGroup"/>
@@ -131,37 +131,10 @@
<container>
<label style="h1">${uiLabelMap.ProductFacilities} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label>
</container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditFacilityGroupMembers}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/>
- </container>
- <include-form name="UpdateFacilityGroupMembers" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductAddFacilityGroupMember}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddFacilityGroupMember" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="FacilityGroupMemberPanel" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
+ <include-form name="AddFacilityGroupMember" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateFacilityGroupMembers" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -170,7 +143,7 @@
<screen name="EditFacilityGroupRoles">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditFacilityGroupRoles"/>
+ <set field="titleProperty" value="ProductAddFacilityGroupPartyRole"/>
<set field="headerItem" value="facilityGroup"/>
<set field="tabButtonItem" value="EditFacilityGroupRoles"/>
<entity-one entity-name="FacilityGroup" value-name="facilityGroup"/>
@@ -180,35 +153,10 @@
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
<label style="h1">${uiLabelMap.PartyRoles} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditFacilityGroupRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/></container>
- <include-form name="UpdateFacilityGroupRoles" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductAddFacilityGroupPartyRole}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddFacilityGroupRole" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="FacilityGroupRolePanel" title="${uiLabelMap.ProductAddFacilityGroupPartyRole}" collapsible="true">
+ <include-form name="AddFacilityGroupRole" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateFacilityGroupRoles" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -217,7 +165,7 @@
<screen name="EditFacilityGroupRollup">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditFacilityGroupRollup"/>
+ <set field="titleProperty" value="PageTitleAddFacilityGroupRollup"/>
<set field="headerItem" value="facilityGroup"/>
<set field="tabButtonItem" value="EditFacilityGroupRollup"/>
@@ -231,63 +179,14 @@
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
<container><label style="h1">${uiLabelMap.ProductRollups} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label></container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditFacilityGroupRollup}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/></container>
- <include-form name="UpdateFacilityGroupRollupTo" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddFacilityGroupRollup}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddFacilityGroupRollupFrom" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductGroupRollupChildGroups}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateFacilityGroupRollupFrom" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductGroupRollupChildGroupsAdd}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddFacilityGroupRollupTo" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="FacilityGroupRollupFromPanel" title="${uiLabelMap.PageTitleAddFacilityGroupRollup}" collapsible="true">
+ <include-form name="AddFacilityGroupRollupFrom" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateFacilityGroupRollupTo" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+ <screenlet id="FacilityGroupRollupToFrom" title="${uiLabelMap.ProductGroupRollupChildGroupsAdd}" collapsible="true">
+ <include-form name="AddFacilityGroupRollupTo" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateFacilityGroupRollupFrom" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=667064&r1=667063&r2=667064&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Thu Jun 12 05:54:58 2008
@@ -914,34 +914,10 @@
<decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
<include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="InventoryItemLabelPanel" title="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]" collapsible="true">
+ <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml?rev=667064&r1=667063&r2=667064&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Thu Jun 12 05:54:58 2008
@@ -57,7 +57,7 @@
<screen name="EditInventoryItemLabelTypes">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditInventoryItemLabelTypes"/>
+ <set field="titleProperty" value="PageTitleAddInventoryItemLabelTypes"/>
<set field="headerItem" value="inventoryItemLabel"/>
<set field="tabButtonItem" value="EditInventoryItemLabelTypes"/>
<entity-condition entity-name="InventoryItemLabelType" list-name="inventoryItemLabelTypes"/>
@@ -65,34 +65,10 @@
<widgets>
<decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditInventoryItemLabelTypes}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateInventoryItemLabelTypes" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddInventoryItemLabelTypes}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddInventoryItemLabelType" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="InventoryItemLabelTypePanel" title="${uiLabelMap.PageTitleAddInventoryItemLabelTypes}" collapsible="true">
+ <include-form name="AddInventoryItemLabelType" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateInventoryItemLabelTypes" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -162,7 +138,7 @@
<screen name="EditInventoryItemLabelAppls">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditInventoryItemLabelAppls"/>
+ <set field="titleProperty" value="PageTitleAddInventoryItemLabelAppls"/>
<set field="headerItem" value="inventoryItemLabel"/>
<set field="tabButtonItem" value="FindInventoryItemLabels"/>
<set field="subTabButtonItem" value="EditInventoryItemLabelAppls"/>
@@ -174,39 +150,14 @@
<decorator-screen name="CommonInventoryItemLabelDecorator" location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
<container><label style="h2">${uiLabelMap.CommonType}: ${inventoryItemLabelType.description} [${inventoryItemLabelType.inventoryItemLabelTypeId}]</label></container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditInventoryItemLabelAppls}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddInventoryItemLabelAppls}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet id="InventoryItemLabelApplPanel" title="${uiLabelMap.PageTitleAddInventoryItemLabelAppls}" collapsible="true">
+ <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
+ </screenlet>
+ <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
</screens>