svn commit: r1814906 - /ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml

Author: jleroux
Date: Fri Nov 10 19:09:47 2017
New Revision: 1814906

URL: http://svn.apache.org/viewvc?rev=1814906&view=rev
Log:
Improved: CSS files defined through layoutSettings in GlobalActions are loaded
twice
(OFBIZ-9770)

GlobalActions screen of themes/common/widget/CommonScreens.xml is loaded twice.
1. Included in GlobalDecorator screen of themes/common/widget/CommonScreens.xml
2. Included in GlobalActions screen of framework/common/widget/CommonScreens.xml
Solution: removes the first instance i.e. from GlobalDecorator.

Steps to verify:
All the files (js, css etc) included in this screen are still available.

Thanks: Aditya for the patch et Aishwary Shrivastava for testing

Modified:
    ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml

Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml?rev=1814906&r1=1814905&r2=1814906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml Fri Nov 10 19:09:47 2017
@@ -143,7 +143,6 @@ under the License.
     <screen name="GlobalDecorator">
         <section>
             <widgets>
-                <include-screen name="GlobalActions" />
                 <section>
                     <actions>
                         <set field="layoutSettings.commonHeaderImageLinkUrl" from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main" global="true" />