You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/10/15 23:08:49 UTC
svn commit: r825661 - in /ofbiz/trunk/applications/product/widget/facility:
FacilityGroupScreens.xml FacilityScreens.xml
Author: buscob
Date: Thu Oct 15 21:08:49 2009
New Revision: 825661
URL: http://svn.apache.org/viewvc?rev=825661&view=rev
Log:
Changed <container style="screenlet"> pattern to <screenlet...>.
Modified:
ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?rev=825661&r1=825660&r2=825661&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml Thu Oct 15 21:08:49 2009
@@ -30,23 +30,12 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindFacilityGroup}"/>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleFindFacilityGroup}">
+ <container>
+ <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/>
- </container>
- <include-form name="FindFacilityGroup" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="FindFacilityGroup" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -93,23 +82,12 @@
<widgets>
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditFacilityGroup}"/>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditFacilityGroup}">
+ <container>
+ <link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}" style="buttontext"/>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}" style="buttontext"/>
- </container>
- <include-form name="EditFacilityGroup" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="EditFacilityGroup" location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
+ </screenlet>
</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=825661&r1=825660&r2=825661&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Thu Oct 15 21:08:49 2009
@@ -268,40 +268,22 @@
<parameter param-name="facilityId" from-field="facilityId"/>
</link>
</container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductInventoryTransfersFor} ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}] ${uiLabelMap.CommonTo}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ToFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonFrom}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <condition>
- <if-compare field="parameters.completeRequested" operator="equals" value="true"/>
- </condition>
- <widgets>
- <include-form name="FromFacilityTransfersComplete" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
- </widgets>
- <fail-widgets>
- <include-form name="FromFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
- </fail-widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProductInventoryTransfersFor} ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}] ${uiLabelMap.CommonTo}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]}">
+ <include-form name="ToFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.CommonFrom}: ${facility.facilityName} [${uiLabelMap.CommonId}: ${facilityId}]">
+ <section>
+ <condition>
+ <if-compare field="parameters.completeRequested" operator="equals" value="true"/>
+ </condition>
+ <widgets>
+ <include-form name="FromFacilityTransfersComplete" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <include-form name="FromFacilityTransfers" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </fail-widgets>
+ </section>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -425,23 +407,12 @@
<parameter param-name="facilityId" from-field="parameters.facilityId"/>
</link>
</container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductSearchInventoryItemsByLabels}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl"/></html>
- </platform-specific>
- <include-form name="ListFacilityInventoryItemsNoLocations" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProductSearchInventoryItemsByLabels}">
+ <platform-specific>
+ <html><html-template location="component://product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl"/></html>
+ </platform-specific>
+ <include-form name="ListFacilityInventoryItemsNoLocations" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>