You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/08/25 08:40:54 UTC
svn commit: r1697574 - in /ofbiz/trunk:
specialpurpose/ecommerce/webapp/ecommerce/includes/
specialpurpose/hhfacility/webapp/hhfacility/includes/
themes/bizznesstime/includes/ themes/bluelight/includes/
themes/droppingcrumbs/includes/ themes/flatgrey/i...
Author: deepak
Date: Tue Aug 25 06:40:54 2015
New Revision: 1697574
URL: http://svn.apache.org/r1697574
Log:
(OFBIZ-6362) Added missing code in header.ftl file to include component specific js file.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/bluelight/includes/header.ftl
ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
ofbiz/trunk/themes/flatgrey/includes/header.ftl
ofbiz/trunk/themes/tomahawk/includes/header.ftl
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=1697574&r1=1697573&r2=1697574&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Tue Aug 25 06:40:54 2015
@@ -63,6 +63,11 @@ under the License.
<#if sessionAttributes.overrideCss??>
<link rel="stylesheet" href="${StringUtil.wrapString(sessionAttributes.overrideCss)}" type="text/css"/>
</#if>
+ <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+ <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+ <script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+ </#list>
+ </#if>
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
<#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
@@ -74,11 +79,6 @@ under the License.
</#if>
</#list>
</#if>
- <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
- <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
- </#list>
- </#if>
${layoutSettings.extraHead!}
<#if layoutSettings.VT_EXTRA_HEAD?has_content>
<#list layoutSettings.VT_EXTRA_HEAD as extraHead>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl?rev=1697574&r1=1697573&r2=1697574&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl Tue Aug 25 06:40:54 2015
@@ -26,6 +26,11 @@ under the License.
<meta charset="utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${applicationTitle!}</title>
+ <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+ <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#list>
+ </#if>
<#if layoutSettings.javaScripts?has_content>
<#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
<#list layoutSettings.javaScripts as javaScript>
@@ -35,11 +40,7 @@ under the License.
</#if>
</#list>
</#if>
- <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
- <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
- </#list>
- </#if>
+
</head>
<body>
<div data-role="header">
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1697574&r1=1697573&r2=1697574&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Tue Aug 25 06:40:54 2015
@@ -90,6 +90,18 @@ under the License.
<script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
+ <#if layoutSettings.javaScripts?has_content>
+ <#--layoutSettings.javaScripts is a list of java scripts. -->
+ <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+ <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#if>
+ </#list>
+ </#if>
+
<#if layoutSettings.WEB_ANALYTICS?has_content>
<script language="JavaScript" type="text/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1697574&r1=1697573&r2=1697574&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Tue Aug 25 06:40:54 2015
@@ -42,6 +42,18 @@ under the License.
<script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
+ <#if layoutSettings.javaScripts?has_content>
+ <#--layoutSettings.javaScripts is a list of java scripts. -->
+ <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+ <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#if>
+ </#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/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1697574&r1=1697573&r2=1697574&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Tue Aug 25 06:40:54 2015
@@ -42,6 +42,18 @@ under the License.
<script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
+ <#if layoutSettings.javaScripts?has_content>
+ <#--layoutSettings.javaScripts is a list of java scripts. -->
+ <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+ <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#if>
+ </#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/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1697574&r1=1697573&r2=1697574&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Tue Aug 25 06:40:54 2015
@@ -38,6 +38,18 @@ under the License.
<script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
+ <#if layoutSettings.javaScripts?has_content>
+ <#--layoutSettings.javaScripts is a list of java scripts. -->
+ <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+ <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#if>
+ </#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/themes/tomahawk/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=1697574&r1=1697573&r2=1697574&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Tue Aug 25 06:40:54 2015
@@ -37,11 +37,24 @@ under the License.
<#if shortcutIcon?has_content>
<link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
</#if>
+
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
<script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
+ <#if layoutSettings.javaScripts?has_content>
+ <#--layoutSettings.javaScripts is a list of java scripts. -->
+ <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+ <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#if>
+ </#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>