svn commit: r422166 - in /struts/struts2/trunk/core/src/main/resources/template: ajax/head.ftl css_xhtml/head.ftl simple/head.ftl xhtml/head.ftl

[tm...@apache.org]

Author: tmjee
Date: Sat Jul 15 00:35:50 2006
New Revision: 422166

URL: http://svn.apache.org/viewvc?rev=422166&view=rev
Log:
WW-1380
  - fixed "ww:head tag includes parameters in URLs to stylesheets"


Modified:
    struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl
    struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
    struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl

Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl?rev=422166&r1=422165&r2=422166&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl Sat Jul 15 00:35:50 2006
@@ -1,6 +1,6 @@
 <#--include "/${parameters.templateDir}/xhtml/head.ftl" /-->
 <#include "/${parameters.templateDir}/${themeProperties.parent}/head.ftl" />
 <script language="JavaScript" type="text/javascript"
-        src="<@saf.url includeParams='none' value='/struts/ajax/dojoRequire.js' encode='false'/>"></script>
+        src="<@saf.url includeParams='none' value='/struts/ajax/dojoRequire.js' includeParams="none" encode='false'  />"></script>
 <script language="JavaScript" type="text/javascript"
-        src="<@saf.url includeParams='none' value='/struts/CommonFunctions.js' encode='false'/>"></script>
+        src="<@saf.url includeParams='none' value='/struts/CommonFunctions.js' includeParams="none" encode='false'/>"></script>

Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl?rev=422166&r1=422165&r2=422166&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl Sat Jul 15 00:35:50 2006
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@saf.url value='/struts/css_xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@saf.url value='/struts/css_xhtml/styles.css' includeParams="none" encode='false' />" type="text/css"/>
 <#include "/${parameters.templateDir}/simple/head.ftl" />

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl?rev=422166&r1=422165&r2=422166&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl Sat Jul 15 00:35:50 2006
@@ -1,13 +1,13 @@
 <script language="JavaScript" type="text/javascript">
     // Dojo configuration
     djConfig = {
-        baseRelativePath: "<@saf.url includeParams='none' value='/struts/dojo' encode='false'/>",
+        baseRelativePath: "<@saf.url includeParams='none' value='/struts/dojo' includeParams="none" encode='false'/>",
         isDebug: ${parameters.debug},
         bindEncoding: "${parameters.encoding}",
         debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
     };
 </script>
 <script language="JavaScript" type="text/javascript"
-        src="<@saf.url includeParams='none' value='/struts/dojo/dojo.js' encode='false'/>"></script>
+        src="<@saf.url includeParams='none' value='/struts/dojo/dojo.js' includeParams="none" encode='false'/>"></script>
 <script language="JavaScript" type="text/javascript"
-        src="<@saf.url includeParams='none' value='/struts/simple/dojoRequire.js' encode='false'/>"></script>
+        src="<@saf.url includeParams='none' value='/struts/simple/dojoRequire.js' includeParams="none" encode='false'/>"></script>

Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl?rev=422166&r1=422165&r2=422166&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl Sat Jul 15 00:35:50 2006
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@saf.url value='/struts/xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@saf.url value='/struts/xhtml/styles.css' includeParams="none" encode='false' />" type="text/css"/>
 <#include "/${parameters.templateDir}/simple/head.ftl" />