svn commit: r1632793 - in /ofbiz/trunk/framework: common/widget/HelpScreens.xml resources/templates/CommonScreens.xml

[apatel-2]

Author: apatel
Date: Sat Oct 18 14:11:50 2014
New Revision: 1632793

URL: http://svn.apache.org/r1632793
Log:
[OFBIZ-3329] Removing framework code on resources in commonext.
Thanks Divesh and Mridul for helping with resuluation.
Thanks Adrian for reporting it.
Thanks Chris Snow for reporting the issue

Modified:
    ofbiz/trunk/framework/common/widget/HelpScreens.xml
    ofbiz/trunk/framework/resources/templates/CommonScreens.xml

Modified: ofbiz/trunk/framework/common/widget/HelpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/HelpScreens.xml?rev=1632793&r1=1632792&r2=1632793&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/HelpScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/HelpScreens.xml Sat Oct 18 14:11:50 2014
@@ -25,7 +25,6 @@ under the License.
         <section>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
                 <service service-name="getUserPreferenceGroup" result-map="prefResult">
                     <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>

Modified: ofbiz/trunk/framework/resources/templates/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/templates/CommonScreens.xml?rev=1632793&r1=1632792&r2=1632793&view=diff
==============================================================================
--- ofbiz/trunk/framework/resources/templates/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/resources/templates/CommonScreens.xml Sat Oct 18 14:11:50 2014
@@ -17,7 +17,7 @@
                 <set field="applicationTitle" value="${uiLabelMap.@component-resource-name@Application}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
+                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>