svn commit: r1346527 - in /ofbiz/branches/20120329_portletWidget: applications/accounting/widget/ applications/content/widget/ applications/humanres/widget/ applications/manufacturing/widget/manufacturing/ applications/marketing/widget/ applications/ma...

[erwan]

Author: erwan
Date: Tue Jun  5 18:51:16 2012
New Revision: 1346527

URL: http://svn.apache.org/viewvc?rev=1346527&view=rev
Log:
Adding OFBIZ-4886 to portlet widget branch

Modified:
    ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml

Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -292,5 +292,35 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions/>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -453,6 +453,36 @@ under the License.
             </widgets>
         </section>
     </screen>
+        <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+        <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
     
     <screen name="CommonWebAnalyticsDecorator">
         <section>

Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -437,4 +437,36 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/widget/manufacturing/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -49,5 +49,38 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 </screens>
 

Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/marketing/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -114,4 +114,31 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions/>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/marketing/widget/sfa/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -482,4 +482,34 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions/>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -128,5 +128,39 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderErrorUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 </screens>
 

Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -145,4 +145,39 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -376,6 +376,36 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 
     <screen name="listMiniproduct">
         <section>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -184,6 +184,36 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 
 </screens>
 

Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -193,4 +193,38 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -308,5 +308,37 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>  
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+              <actions>
+                <!-- base/top/specific map first, then more common map added for shared labels -->
+                <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>              
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
     
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -391,6 +391,39 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 
     <screen name="policies">
         <section>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -220,4 +220,40 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions>
+                <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=1346527&r1=1346526&r2=1346527&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml Tue Jun  5 18:51:16 2012
@@ -390,5 +390,37 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
+    <screen name="portletUiLabelDecorator">
+        <section><!-- Decorator use by portlet define in their preference label -->
+            <actions>
+                <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="uiLabelDecorator"><!-- Main decorator -->
+        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
+            <actions/>
+            <widgets>
+                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <decorator-section-include name="body"/>
+            </widgets>
+        </section>
+    </screen>
+    <!--#Eam# uiLabelDecorator  -->
 
 </screens>