Author: jacopoc
Date: Mon Feb 19 09:51:58 2007
New Revision: 509270
URL:
http://svn.apache.org/viewvc?view=rev&rev=509270Log:
Applied patch from Adrian Crum (OFBIZ-685): parametrized the javascripts files imported in the global header templates.
Modified:
ofbiz/trunk/framework/common/webcommon/includes/header.ftl
ofbiz/trunk/framework/common/widget/CommonScreens.xml
Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?view=diff&rev=509270&r1=509269&r2=509270==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Mon Feb 19 09:51:58 2007
@@ -29,10 +29,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${layoutSettings.companyName}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if></title>
- <link rel="shortcut icon" href="<@ofbizContentUrl>/images/ofbiz.ico</@ofbizContentUrl>" />
- <script language="javascript" src="<@ofbizContentUrl>/images/calendar1.js</@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
+ <#if layoutSettings.shortcutIcon?has_content>
+ <link rel="shortcut icon" href="<@ofbizContentUrl>${layoutSettings.shortcutIcon}</@ofbizContentUrl>" />
+ </#if>
+ <#if layoutSettings.javaScripts?has_content>
+ <#--layoutSettings.javaScripts is a list of java scripts. -->
+ <#list layoutSettings.javaScripts as javaScript>
+ <script language="javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script>
+ </#list>
+ </#if>
<#if layoutSettings.styleSheets?has_content>
<#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
<#list layoutSettings.styleSheets as styleSheet>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?view=diff&rev=509270&r1=509269&r2=509270==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Mon Feb 19 09:51:58 2007
@@ -94,6 +94,12 @@
<actions>
<!-- The default (global) stylesheet is added to the list of stylesheets to the first position -->
<set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/>
+ <!-- The default (global) java scripts -->
+ <set field="layoutSettings.javaScripts[]" value="/images/calendar1.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
+ <!-- The default (global) shortcut icon -->
+ <set field="layoutSettings.shortcutIcon" value="/images/ofbiz.ico" global="true"/>
</actions>
<widgets>
<!-- render header -->
Locked
