svn commit: r1806792 - in /ofbiz/ofbiz-framework/trunk/themes/common/widget: CommonScreens.xml Theme.xml

[nmalin]

Author: nmalin
Date: Thu Aug 31 13:52:26 2017
New Revision: 1806792

URL: http://svn.apache.org/viewvc?rev=1806792&view=rev
Log:
Fixed: javascript problem detected on date (OFBIZ-9666, OFBIZ-9667, OFBIZ-9668) and lookup field (OFBIZ-9657) after the common-theme migration (OFBIZ-9138 Create a common theme)
Two fixes, remove duplication load of jquery/ui/js/jquery-ui-1.10.3.min.js and move moment-timezone-with-data.min.js, moment-with-locales.min.js and setUserLocale.js in screen action definition to escape js unresvolve variable.
Reorganize import like before the common-theme migration
Thanks to Rohit Rai, Jacques and Deepak for their help to find and resolve theses issues

Modified:
    ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
    ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.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=1806792&r1=1806791&r2=1806792&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml Thu Aug 31 13:52:26 2017
@@ -130,6 +130,10 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/jquery/plugins/Readmore.js-master/readmore.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.js" global="true"/>
                 <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" global="true" />
+                <!-- Set default user locale from browser -->
+                <set field="layoutSettings.javaScripts[+0]" value="/images/setUserLocale.js"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/moment-timezone-with-data.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/moment-with-locales.min.js" global="true"/>
             </actions>
             <widgets />
         </section>
@@ -345,8 +349,6 @@ under the License.
                         <property-map resource="general" map-name="generalProperties" global="true"/>
                         <set field="defaultOrganizationPartyId" from-field="userPreferences.ORGANIZATION_PARTY" global="true"/>
 
-                        <set field="layoutSettings" from-field="modelTheme.getThemeResources()" default-value="${layoutSettings}" global="true"/>
-
                         <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC" default-value="component://common-theme/template/includes/Messages.ftl"/>
                     </actions>
                     <widgets>

Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml?rev=1806792&r1=1806791&r2=1806792&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml Thu Aug 31 13:52:26 2017
@@ -59,11 +59,6 @@ under the License.
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/jquery-1.11.0.min.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/jquery-migrate-1.2.1.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/ui/js/jquery-ui-1.10.3.min.js"/>
-        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/moment-timezone-with-data.min.js"/>
-        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/moment-with-locales.min.js"/>
-        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/OfbizUtil.js"/>
-        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/util.js"/>
-        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/fieldlookup.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js"/>
@@ -71,15 +66,16 @@ under the License.
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/plugins/jeditable/jquery.jeditable.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/plugins/validate/jquery.validate.min.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/OpenLayers-2.13.1.js"/>
+        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/OfbizUtil.js"/>
+        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/fieldlookup.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/date/date.format-1.2.3-min.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/date/date.timezone-min.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/miscAjaxFunctions.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/selectMultipleRelatedValues.js"/>
+        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/util.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/plugins/jsTree/jquery.jstree.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/ui/js/jquery.cookie-1.4.0.js"/>
-        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/ui/js/jquery-ui-1.10.3.min.js"/>
         <property name="VT_HDR_JAVASCRIPT['add']" value="/images/date/FromThruDateCheck.js"/>
-        <property name="VT_HDR_JAVASCRIPT['add']" value="/images/setUserLocale.js"/>
         <!--Css style-->
     </theme-properties>