svn commit: r1809389 [1/3] - in /ofbiz/ofbiz-framework/trunk: applications/content/template/
Locked
svn commit: r1809389 [1/3] - in /ofbiz/ofbiz-framework/trunk: applications/content/template/
 
|
Author: deepak
Date: Sat Sep 23 10:41:28 2017 New Revision: 1809389 URL: http://svn.apache.org/viewvc?rev=1809389&view=rev Log: Improved: Moved jquery related js/plugins from images to common-theme webapp and made changes accordinlgy. (OFBIZ-5776) Added: ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/ ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/ - copied from r1809388, ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jquery/ Removed: ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jquery/ Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java ofbiz/ofbiz-framework/trunk/themes/README.md ofbiz/ofbiz-framework/trunk/themes/bluelight/data/BlueLightThemeData.xml ofbiz/ofbiz-framework/trunk/themes/common/template/JsLanguageFilesMapping.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/includes/ListVisualThemes.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Lookup.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/includes/flotCharts/Bars.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/includes/flotCharts/Pie.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl Sat Sep 23 10:41:28 2017 @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> <script type="application/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manuely --> Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl Sat Sep 23 10:41:28 2017 @@ -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 language="javascript" type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> <script type="application/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manuely --> Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl Sat Sep 23 10:41:28 2017 @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> <script type="application/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manuely --> Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl Sat Sep 23 10:41:28 2017 @@ -16,13 +16,13 @@ specific language governing permissions and limitations under the License. --> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/ui/js/jquery.cookie-1.4.0.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/ui/js/jquery.cookie-1.4.0.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>"></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>" type="text/javascript"></script><#rt/> +<script language="javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js</@ofbizContentUrl>" type="text/javascript"></script><#rt/> </#if> -<link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css"> +<link href="/common/js/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css"> <script type="text/javascript"> function modifyJstreeCookieToSelectNewPage() { @@ -452,7 +452,7 @@ var contextmenu = { 'items': { height : 350, 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'] } jQuery('#cmseditor').elrte(opts); } Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl Sat Sep 23 10:41:28 2017 @@ -80,7 +80,7 @@ var rawdata = [ "types" : { "CATEGORY" : { "icon" : { - "image" : "/images/jquery/plugins/jsTree/themes/apple/d.png", + "image" : "/common/js/jquery/plugins/jsTree/themes/apple/d.png", "position" : "10px40px" } } Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml Sat Sep 23 10:41:28 2017 @@ -38,8 +38,8 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/> <set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/> <set field="layoutSettings.styleSheets[]" value="/images/humanres/humanres.css" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> <set field="applicationMenuName" value="HumanResAppBar" global="true"/> <set field="applicationMenuLocation" value="component://humanres/widget/HumanresMenus.xml" global="true"/> <set field="applicationTitle" from-field="uiLabelMap.HumanResManagerApplication" global="true"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl Sat Sep 23 10:41:28 2017 @@ -87,7 +87,7 @@ var rawdata = [ "types" : { "CATEGORY" : { "icon" : { - "image" : "/images/jquery/plugins/jsTree/themes/apple/d.png", + "image" : "/common/js/jquery/plugins/jsTree/themes/apple/d.png", "position" : "10px40px" } } Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml Sat Sep 23 10:41:28 2017 @@ -41,8 +41,8 @@ under the License. <set field="applicationMenuName" value="CatalogAppBar" global="true"/> <set field="applicationMenuLocation" value="component://product/widget/catalog/CatalogMenus.xml" global="true"/> <set field="applicationTitle" from-field="uiLabelMap.ProductCatalogManagerApplication" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1809389&r1=1809388&r2=1809389&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java Sat Sep 23 10:41:28 2017 @@ -55,10 +55,10 @@ public class JsLanguageFileMappingCreato // setup some variables to locate the js files String componentRoot = "component://common-theme/webapp"; - String jqueryUiLocaleRelPath = "/images/jquery/ui/i18n/"; - String dateJsLocaleRelPath = "/images/jquery/plugins/datejs/"; - String validateRelPath = "/images/jquery/plugins/validate/localization/"; - String dateTimePickerJsLocaleRelPath = "/images/jquery/plugins/datetimepicker/localization/"; + String jqueryUiLocaleRelPath = "/common/js/jquery/ui/i18n/"; + String dateJsLocaleRelPath = "/common/js/jquery/plugins/datejs/"; + String validateRelPath = "/common/js/jquery/plugins/validate/localization/"; + String dateTimePickerJsLocaleRelPath = "/common/js/jquery/plugins/datetimepicker/localization/"; String jsFilePostFix = ".js"; String dateJsLocalePrefix = "date-"; String validateLocalePrefix = "messages_"; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |