svn commit: r1809393 - in /ofbiz/ofbiz-plugins/trunk: cmssite/data/ cmssite/template/cms/ ebaystore/template/store/ ecommerce/template/catalog/ ecommerce/widget/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1809393 - in /ofbiz/ofbiz-plugins/trunk: cmssite/data/ cmssite/template/cms/ ebaystore/template/store/ ecommerce/template/catalog/ ecommerce/widget/

Deepak Dixit-5
Author: deepak
Date: Sat Sep 23 11:10:35 2017
New Revision: 1809393

URL: http://svn.apache.org/viewvc?rev=1809393&view=rev
Log:
Improved: Updated moved file references for plugins (OFBIZ-5776)

Modified:
    ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml
    ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl
    ofbiz/ofbiz-plugins/trunk/ebaystore/template/store/ProductSearchExport.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml

Modified: ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml?rev=1809393&r1=1809392&r2=1809393&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml Sat Sep 23 11:10:35 2017
@@ -25,8 +25,8 @@
                 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
                 <title>${(decoratedContent.subcontent.title.render)!"WebSite 1 Generic Title (Set subcontent 'title' on your content!)"}</title>
                 <link rel="shortcut icon" href="/images/ofbiz.ico" />
-                <script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
-                <script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
+                <script language="javascript" src="/common/js/util/fieldlookup.js" type="text/javascript"></script>
+                <script language="javascript" src="/common/js/util/OfbizUtil.js" type="text/javascript"></script>
                 <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
                 <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
                 <link rel="stylesheet" href="/content/contentForum.css" type="text/css"/>
@@ -106,8 +106,8 @@
                 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
                 <title>${(decoratedContent.subcontent.title.render)!"WebSite 2 Generic Title (Set subcontent 'title' on your content!)"}</title>
                 <link rel="shortcut icon" href="/images/ofbiz.ico" />
-                <script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
-                <script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
+                <script language="javascript" src="/common/js/util/fieldlookup.js" type="text/javascript"></script>
+                <script language="javascript" src="/common/js/util/selectall.js" type="text/javascript"></script>
                 <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
                 <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
                 <link rel="stylesheet" href="/content/contentForum.css" type="text/css"/>

Modified: ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl?rev=1809393&r1=1809392&r2=1809393&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl Sat Sep 23 11:10:35 2017
@@ -29,8 +29,8 @@ under the License.
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <title>${(decoratedContent.subcontent.title.render)!"CMS Site Generic Title (Set subcontent 'title' on your content!)"}</title>
     <link rel="shortcut icon" href="/images/ofbiz.ico" />
-    <script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
-    <script language="javascript" src="/images/OfbizUtil.js" type="text/javascript"></script>
+    <script language="javascript" src="/common/js/util/fieldlookup.js" type="text/javascript"></script>
+    <script language="javascript" src="/common/js/util/OfbizUtil.js" type="text/javascript"></script>
     <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
     <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
     <link rel="stylesheet" href="/content/contentForum.css" type="text/css"/>

Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/template/store/ProductSearchExport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/template/store/ProductSearchExport.ftl?rev=1809393&r1=1809392&r2=1809393&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/template/store/ProductSearchExport.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/template/store/ProductSearchExport.ftl Sat Sep 23 11:10:35 2017
@@ -583,17 +583,17 @@ under the License.
                                   <tr>
                                     <td>
                                       <script language="javascript"
-                                              src="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>"
+                                              src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>"
                                               type="text/javascript">
                                       </script>
                                       <#if language?has_content && language != "en">
                                         <script language="javascript"
-                                                src="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js</@ofbizContentUrl>"
+                                                src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js</@ofbizContentUrl>"
                                                 type="text/javascript">
                                         </script>
                                         <#rt/>
                                       </#if>
-                                      <link href="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/css/elrte.min.css</@ofbizContentUrl>"
+                                      <link href="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/css/elrte.min.css</@ofbizContentUrl>"
                                               rel="stylesheet" type="text/css">
                                       <script language="javascript" type="text/javascript">
                                           var opts = {
@@ -602,7 +602,7 @@ under the License.
                                               toolbar: 'maxi',
                                               doctype: '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">',
                                               //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
-                                              cssfiles: ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css']
+                                              cssfiles: ['/common/js/jquery/plugins/elrte-1.3/css/elrte-inner.css']
                                           }
                                       </script>
                                       <textarea id="description" name="description" style="width:800px; height:300px">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl?rev=1809393&r1=1809392&r2=1809393&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl Sat Sep 23 11:10:35 2017
@@ -17,9 +17,9 @@
   under the License.
   -->
 <script language="javascript" type="text/javascript"
-        src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script>
+        src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script>
 <script type="text/javascript"
-        src="<@ofbizContentUrl>/images/jquery/ui/js/jquery.cookie-1.4.0.js</@ofbizContentUrl>"></script>
+        src="<@ofbizContentUrl>/common/js/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 -->

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1809393&r1=1809392&r2=1809393&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Sat Sep 23 11:10:35 2017
@@ -39,18 +39,18 @@ under the License.
 
                 <!-- The default (main) java scripts -->
                 <!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: -->
-                <set field="layoutSettings.javaScripts[]" value="/images/OfbizUtil.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/common/js/util/OfbizUtil.js" global="true"/>
                 <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/>
                 <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.apache.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" 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-migrate-1.2.1.js" global="true"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true"/>
-                <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 field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/ui/js/jquery-ui-1.10.3.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-migrate-1.2.1.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-1.11.0.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/common/js/jquery/plugins/Readmore.js-master/readmore.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/common/js/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.js" global="true"/>
+                <set field="layoutSettings.styleSheets[+0]" value="/common/js/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" global="true" />
 
                 <script location="component://ecommerce/groovyScripts/EcommerceSetup.groovy"/>
 
@@ -262,11 +262,11 @@ under the License.
 
                 <!-- The default (main) java scripts -->
                 <!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: -->
-                <set field="layoutSettings.javaScripts[]" value="/images/OfbizUtil.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/common/js/util/OfbizUtil.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.11.0.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="/common/js/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-1.11.0.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-migrate-1.2.1.js" global="true" />
                 
 
                 <script location="component://ecommerce/groovyScripts/EcommerceSetup.groovy"/>