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

[hermanns]

Author: hermanns
Date: Wed Sep 13 03:49:45 2006
New Revision: 442936

URL: http://svn.apache.org/viewvc?view=rev&rev=442936
Log:
readonly attribute on ww:textfield does not behave as a boolean
o backport from WW 2.2.3
o problem also fixed in other templates

Issue Number: WW-1436

Modified:
    struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/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?view=diff&rev=442936&r1=442935&r2=442936
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl Wed Sep 
13 03:49:45 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="<@s.url includeParams='none' value='/struts/ajax/dojoRequire.js' 
includeParams='none' encode='false'  />"></script>
+        src="<@s.url value='/struts/ajax/dojoRequire.js' includeParams='none' 
encode='false'  />"></script>
 <script language="JavaScript" type="text/javascript"
-        src="<@s.url includeParams='none' value='/struts/CommonFunctions.js' 
includeParams='none' encode='false'/>"></script>
+        src="<@s.url value='/struts/CommonFunctions.js' includeParams='none' 
encode='false'/>"></script>

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?view=diff&rev=442936&r1=442935&r2=442936
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl Wed 
Sep 13 03:49:45 2006
@@ -2,7 +2,7 @@
     // Dojo configuration
     djConfig = {
         baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo' 
includeParams="none" encode='false'/>",
-        isDebug: ${parameters.debug},
+        isDebug: ${parameters.debug?default(false)},
         bindEncoding: "${parameters.encoding}",
         debugAtAllCosts: true // not needed, but allows the Venkman debugger 
to work with the includes
     };