You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/09/30 18:58:36 UTC
svn commit: r1628489 - in
/ofbiz/branches/release13.07/specialpurpose/ecommerce:
webapp/ecommerce/catalog/ProductCategories.ftl widget/CommonScreens.xml
Author: jleroux
Date: Tue Sep 30 16:58:36 2014
New Revision: 1628489
URL: http://svn.apache.org/r1628489
Log:
A patch from Deepak Dixit for "Fix the js path for ecommerce" https://issues.apache.org/jira/browse/OFBIZ-5789
jleroux: This is R13.07 only
Modified:
ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl?rev=1628489&r1=1628488&r2=1628489&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl Tue Sep 30 16:58:36 2014
@@ -17,7 +17,7 @@
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script type="text/javascript">
<#-- some labels are not unescaped in the JSON object so we have to do this manuely -->
Modified: ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1628489&r1=1628488&r2=1628489&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CommonScreens.xml Tue Sep 30 16:58:36 2014
@@ -43,11 +43,11 @@ under the License.
<set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/>
<set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.5.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.9.0.custom.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
@@ -262,7 +262,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>