Tag for release 13.07.01

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/tags/REL-13.07.01@1628607 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 1, 2014 · 2718d02 · 2718d02
2 parents 7c77bac + b393b47
commit 2718d02
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/framework/common/config/CommonUiLabels.xml b/framework/common/config/CommonUiLabels.xml
@@ -14361,7 +14361,6 @@
         <value xml:lang="zh">销售管理</value>
         <value xml:lang="zh-TW">銷售</value>
     </property>
-        <value xml:lang="cs">Shark</value>
     <property key="Web Pos">
         <value xml:lang="cs">Web Pos</value>
         <value xml:lang="en">Web Pos</value>

diff --git a/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl b/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl
@@ -17,7 +17,7 @@
   under the License.
   -->
 <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script>
-<script type="text/javascript" src="<@ofbizContentUrl>/images/jquery/ui/development-bundle/external/jquery.cookie.js</@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@ofbizContentUrl>/images/jquery/ui/js/jquery.cookie-1.4.0.js</@ofbizContentUrl>"></script>
 
 <script type="text/javascript">
 <#-- some labels are not unescaped in the JSON object so we have to do this manuely -->

diff --git a/specialpurpose/ecommerce/widget/CommonScreens.xml b/specialpurpose/ecommerce/widget/CommonScreens.xml
@@ -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,8 @@ 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"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true" />                
 
                 <script location="component://ecommerce/widget/EcommerceSetup.groovy"/>