You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by tm...@apache.org on 2006/04/11 10:52:18 UTC
svn commit: r393160 - in /incubator/webwork2/action/src/main:
java/org/apache/struts/action2/views/freemarker/
java/org/apache/struts/action2/views/velocity/components/
resources/config-browser/ resources/template/ajax/
resources/template/css_xhtml/ re...
Author: tmjee
Date: Tue Apr 11 01:52:13 2006
New Revision: 393160
URL: http://svn.apache.org/viewcvs?rev=393160&view=rev
Log:
changed velocity and freemarker prefix from ww to saf
freemarker:-
@ww.url -> @saf.url
velocity
wwurl -> safurl
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
incubator/webwork2/action/src/main/resources/config-browser/actionNames.ftl
incubator/webwork2/action/src/main/resources/config-browser/page-header.ftl
incubator/webwork2/action/src/main/resources/config-browser/showConfig.ftl
incubator/webwork2/action/src/main/resources/config-browser/tigris-macros.ftl
incubator/webwork2/action/src/main/resources/template/ajax/head.ftl
incubator/webwork2/action/src/main/resources/template/ajax/submit-ajax.ftl
incubator/webwork2/action/src/main/resources/template/ajax/textarea.ftl
incubator/webwork2/action/src/main/resources/template/css_xhtml/head.ftl
incubator/webwork2/action/src/main/resources/template/css_xhtml/label.ftl
incubator/webwork2/action/src/main/resources/template/simple/checkboxlist.ftl
incubator/webwork2/action/src/main/resources/template/simple/combobox.ftl
incubator/webwork2/action/src/main/resources/template/simple/datepicker.ftl
incubator/webwork2/action/src/main/resources/template/simple/doubleselect.ftl
incubator/webwork2/action/src/main/resources/template/simple/file.ftl
incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl
incubator/webwork2/action/src/main/resources/template/simple/head.ftl
incubator/webwork2/action/src/main/resources/template/simple/hidden.ftl
incubator/webwork2/action/src/main/resources/template/simple/label.ftl
incubator/webwork2/action/src/main/resources/template/simple/optiontransferselect.ftl
incubator/webwork2/action/src/main/resources/template/simple/password.ftl
incubator/webwork2/action/src/main/resources/template/simple/radiomap.ftl
incubator/webwork2/action/src/main/resources/template/simple/reset.ftl
incubator/webwork2/action/src/main/resources/template/simple/richtexteditor.ftl
incubator/webwork2/action/src/main/resources/template/simple/select.ftl
incubator/webwork2/action/src/main/resources/template/simple/submit.ftl
incubator/webwork2/action/src/main/resources/template/simple/tabbedpanel-close.ftl
incubator/webwork2/action/src/main/resources/template/simple/table.ftl
incubator/webwork2/action/src/main/resources/template/simple/text.ftl
incubator/webwork2/action/src/main/resources/template/simple/textarea.ftl
incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl
incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl
incubator/webwork2/action/src/main/resources/template/xhtml/head.ftl
incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl
Modified: incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java (original)
+++ incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java Tue Apr 11 01:52:13 2006
@@ -291,7 +291,7 @@
public SimpleHash buildTemplateModel(OgnlValueStack stack, Object action, ServletContext servletContext, HttpServletRequest request, HttpServletResponse response, ObjectWrapper wrapper) {
ScopesHashModel model = buildScopesHashModel(servletContext, request, response, wrapper, stack);
populateContext(model, stack, action, request, response);
- model.put("ww", new StrutsModels(stack, request, response));
+ model.put("saf", new StrutsModels(stack, request, response));
return model;
}
}
Modified: incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java (original)
+++ incubator/webwork2/action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java Tue Apr 11 01:52:13 2006
@@ -36,7 +36,7 @@
public abstract class AbstractDirective extends Directive {
public String getName() {
- return "ww" + getBeanName();
+ return "saf" + getBeanName();
}
public abstract String getBeanName();
Modified: incubator/webwork2/action/src/main/resources/config-browser/actionNames.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/config-browser/actionNames.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/config-browser/actionNames.ftl (original)
+++ incubator/webwork2/action/src/main/resources/config-browser/actionNames.ftl Tue Apr 11 01:52:13 2006
@@ -6,10 +6,10 @@
<td>
<ul>
<#list actionNames as name>
- <@ww.url id="showConfig" action="showConfig" includeParams="none">
- <@ww.param name="namespace">${namespace}</...@ww.param>
- <@ww.param name="actionName">${name}</...@ww.param>
- </...@ww.url>
+ <@saf.url id="showConfig" action="showConfig" includeParams="none">
+ <@saf.param name="namespace">${namespace}</...@saf.param>
+ <@saf.param name="actionName">${name}</...@saf.param>
+ </...@saf.url>
<li><a href="${showConfig}">${name}</a></li>
</#list>
</ul>
Modified: incubator/webwork2/action/src/main/resources/config-browser/page-header.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/config-browser/page-header.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/config-browser/page-header.ftl (original)
+++ incubator/webwork2/action/src/main/resources/config-browser/page-header.ftl Tue Apr 11 01:52:13 2006
@@ -27,12 +27,12 @@
--> <div id="projecttools" class="toolgroup">
<#if namespaces?exists> <div class="label"><strong>Namespaces</strong></div>
<div class="body">
- <#foreach namespace in namespaces> <div><@ww.url id="namespaceLink" action="actionNames" includeParams="none"><@ww.param name="namespace">${namespace}</@...@ww.url><a href="${namespaceLink}"><#if namespace == ""> default <#else> ${namespace} </#if></a></div>
+ <#foreach namespace in namespaces> <div><@saf.url id="namespaceLink" action="actionNames" includeParams="none"><@saf.param name="namespace">${namespace}</@...@saf.url><a href="${namespaceLink}"><#if namespace == ""> default <#else> ${namespace} </#if></a></div>
</#foreach> </div>
</#if> </div>
<div class="toolgroup">
<#if actionNames?exists> <div class="label"><strong>Actions in <#if namespace == ""> default <#else> ${namespace} </#if></strong></div>
- <#foreach name in actionNames> <div><@ww.url id="actionLink" action="showConfig" includeParams="none"><@ww.param name="namespace">${namespace}</...@ww.param><@ww.param name="actionName">${name}</@...@ww.url><a href="${actionLink}">${name}</a></div>
+ <#foreach name in actionNames> <div><@saf.url id="actionLink" action="showConfig" includeParams="none"><@saf.param name="namespace">${namespace}</...@saf.param><@saf.param name="actionName">${name}</@...@saf.url><a href="${actionLink}">${name}</a></div>
</#foreach> </#if> </div>
</div>
</td>
Modified: incubator/webwork2/action/src/main/resources/config-browser/showConfig.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/config-browser/showConfig.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/config-browser/showConfig.ftl (original)
+++ incubator/webwork2/action/src/main/resources/config-browser/showConfig.ftl Tue Apr 11 01:52:13 2006
@@ -19,10 +19,10 @@
</table>
<!-- URLTag is faulty -->
-<@ww.url id="url" action="showConfig" includeParams="none">
- <@ww.param name="namespace">${namespace}</...@ww.param>
- <@ww.param name="actionName">${actionName}</...@ww.param>
-</...@ww.url>
+<@saf.url id="url" action="showConfig" includeParams="none">
+ <@saf.param name="namespace">${namespace}</...@saf.param>
+ <@saf.param name="actionName">${actionName}</...@saf.param>
+</...@saf.url>
<#assign url = url + "&detailView=">
<!-- Set all to false -->
<#assign detailsSelected = false>
@@ -107,10 +107,10 @@
</#list>
</table>
<#else>
- <@ww.action name="showValidators" executeResult="true">
- <@ww.param name="clazz" value="'${config.className}'"/>
- <@ww.param name="context" value="'${namespace}'"/>
- </...@ww.action>
+ <@saf.action name="showValidators" executeResult="true">
+ <@saf.param name="clazz" value="'${config.className}'"/>
+ <@saf.param name="context" value="'${namespace}'"/>
+ </...@saf.action>
</#if>
<#call endPage>
Modified: incubator/webwork2/action/src/main/resources/config-browser/tigris-macros.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/config-browser/tigris-macros.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/config-browser/tigris-macros.ftl (original)
+++ incubator/webwork2/action/src/main/resources/config-browser/tigris-macros.ftl Tue Apr 11 01:52:13 2006
@@ -70,10 +70,10 @@
<strong>${caption}</strong></p>
${message}
<#if errors?exists>
- <@ww.iterator id="e" value="errors">
+ <@saf.iterator id="e" value="errors">
<#assign e = stack.findString('top') />
<#call error(e)>
- </...@ww.iterator>
+ </...@saf.iterator>
</#if>
</p>
</div>
Modified: incubator/webwork2/action/src/main/resources/template/ajax/head.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/ajax/head.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/ajax/head.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/ajax/head.ftl Tue Apr 11 01:52:13 2006
@@ -2,15 +2,15 @@
<script language="JavaScript" type="text/javascript">
// Dojo configuration
djConfig = {
- baseRelativePath: "<@ww.url includeParams='none' value='/struts/dojo/' encode='false'/>",
+ baseRelativePath: "<@saf.url includeParams='none' value='/struts/dojo/' 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="<@ww.url includeParams='none' value='/struts/dojo/dojo.js' encode='false'/>"></script>
+ src="<@saf.url includeParams='none' value='/struts/dojo/dojo.js' encode='false'/>"></script>
<script language="JavaScript" type="text/javascript"
- src="<@ww.url includeParams='none' value='/struts/ajax/dojoRequire.js' encode='false'/>"></script>
+ src="<@saf.url includeParams='none' value='/struts/ajax/dojoRequire.js' encode='false'/>"></script>
<script language="JavaScript" type="text/javascript"
- src="<@ww.url includeParams='none' value='/struts/CommonFunctions.js' encode='false'/>"></script>
+ src="<@saf.url includeParams='none' value='/struts/CommonFunctions.js' encode='false'/>"></script>
Modified: incubator/webwork2/action/src/main/resources/template/ajax/submit-ajax.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/ajax/submit-ajax.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/ajax/submit-ajax.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/ajax/submit-ajax.ftl Tue Apr 11 01:52:13 2006
@@ -12,7 +12,7 @@
name="${parameters.name?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.cssClass?exists>
class="${parameters.cssClass?html}"<#rt/>
@@ -36,5 +36,5 @@
listenTopics="${parameters.listenTopics}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
-><#if parameters.nameValue?exists><@ww.property value="parameters.nameValue"/><#rt/></#if></button></div>
+><#if parameters.nameValue?exists><@saf.property value="parameters.nameValue"/><#rt/></#if></button></div>
<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
Modified: incubator/webwork2/action/src/main/resources/template/ajax/textarea.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/ajax/textarea.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/ajax/textarea.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/ajax/textarea.ftl Tue Apr 11 01:52:13 2006
@@ -37,7 +37,7 @@
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
><#rt/>
<#if parameters.nameValue?exists>
-<@ww.property value="parameters.nameValue"/><#t/>
+<@saf.property value="parameters.nameValue"/><#t/>
</#if>
</textarea>
Modified: incubator/webwork2/action/src/main/resources/template/css_xhtml/head.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/css_xhtml/head.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/css_xhtml/head.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/css_xhtml/head.ftl Tue Apr 11 01:52:13 2006
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@ww.url value='/struts/css_xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@saf.url value='/struts/css_xhtml/styles.css' encode='false' />" type="text/css"/>
<#include "/${parameters.templateDir}/simple/head.ftl" />
Modified: incubator/webwork2/action/src/main/resources/template/css_xhtml/label.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/css_xhtml/label.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/css_xhtml/label.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/css_xhtml/label.ftl Tue Apr 11 01:52:13 2006
@@ -17,7 +17,7 @@
</#if>
><#rt/>
<#if parameters.nameValue?exists>
-<@ww.property value="parameters.nameValue"/><#t/>
+<@saf.property value="parameters.nameValue"/><#t/>
</#if>
</label>
Modified: incubator/webwork2/action/src/main/resources/template/simple/checkboxlist.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/checkboxlist.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/checkboxlist.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/checkboxlist.ftl Tue Apr 11 01:52:13 2006
@@ -1,6 +1,6 @@
<#assign itemCount = 0/>
<#if parameters.list?exists>
- <@ww.iterator value="parameters.list">
+ <@saf.iterator value="parameters.list">
<#assign itemCount = itemCount + 1/>
<#if parameters.listKey?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
@@ -25,7 +25,7 @@
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
/>
<label for="${parameters.name?html}-${itemCount}" class="checkboxLabel">${itemValue?html}</label>
- </...@ww.iterator>
+ </...@saf.iterator>
<#else>
</#if>
Modified: incubator/webwork2/action/src/main/resources/template/simple/combobox.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/combobox.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/combobox.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/combobox.ftl Tue Apr 11 01:52:13 2006
@@ -6,7 +6,7 @@
disabled="disabled"<#rt/>
</#if>
>
- <@ww.iterator value="parameters.list">
+ <@saf.iterator value="parameters.list">
<option value="${top?html}"<#rt/>
<#if parameters.name = top>
selected="selected"<#rt/>
@@ -14,6 +14,6 @@
><#t/>
${top?html}<#t/>
</option><#lt/>
- </...@ww.iterator>
+ </...@saf.iterator>
</select>
</#if>
Modified: incubator/webwork2/action/src/main/resources/template/simple/datepicker.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/datepicker.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/datepicker.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/datepicker.ftl Tue Apr 11 01:52:13 2006
@@ -1,11 +1,11 @@
<#if !stack.findValue("#datepicker_js_included")?exists>
<#assign trash = stack.setValue("#datepicker_js_included", true)/>
-<script type="text/javascript" src="<@ww.url value="/struts/jscalendar/" encode='false'/>calendar.js"></script>
-<script type="text/javascript" src="<@ww.url value="/struts/jscalendar/lang/" encode='false'/>calendar-${parameters.language?default("en")}.js"></script>
-<script type="text/javascript" src="<@ww.url value="/struts/jscalendar/" encode='false'/>calendar-setup.js"></script>
+<script type="text/javascript" src="<@saf.url value="/struts/jscalendar/" encode='false'/>calendar.js"></script>
+<script type="text/javascript" src="<@saf.url value="/struts/jscalendar/lang/" encode='false'/>calendar-${parameters.language?default("en")}.js"></script>
+<script type="text/javascript" src="<@saf.url value="/struts/jscalendar/" encode='false'/>calendar-setup.js"></script>
</#if>
<#include "/${parameters.templateDir}/simple/text.ftl" />
-<#if !parameters.readonly?exists><a href="#" id="${parameters.id}_button"></#if><img src="<@ww.url value="/struts/jscalendar/img.gif" encode='false'/>" width="16" height="16" border="0" alt="Click Here to Pick up the date"><#if !parameters.readonly?exists></a></#if>
+<#if !parameters.readonly?exists><a href="#" id="${parameters.id}_button"></#if><img src="<@saf.url value="/struts/jscalendar/img.gif" encode='false'/>" width="16" height="16" border="0" alt="Click Here to Pick up the date"><#if !parameters.readonly?exists></a></#if>
<#if !parameters.readonly?exists>
<script type="text/javascript">
Calendar.setup({
Modified: incubator/webwork2/action/src/main/resources/template/simple/doubleselect.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/doubleselect.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/doubleselect.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/doubleselect.ftl Tue Apr 11 01:52:13 2006
@@ -39,7 +39,7 @@
for (i = 0; i < (${parameters.listSize} + ${startCount}); i++)
${parameters.name}Group[i] = new Array();
-<@ww.iterator value="parameters.list">
+<@saf.iterator value="parameters.list">
<#if parameters.listKey?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
@@ -51,7 +51,7 @@
<#assign itemValue = stack.findString('top')/>
</#if>
<#assign doubleItemCount = 0/>
- <@ww.iterator value="${parameters.doubleList}">
+ <@saf.iterator value="${parameters.doubleList}">
<#if parameters.doubleListKey?exists>
<#assign doubleItemKey = stack.findValue(parameters.doubleListKey)/>
<#else>
@@ -65,14 +65,14 @@
${parameters.name}Group[${itemCount}][${doubleItemCount}] = new Option("${doubleItemValue}", "${doubleItemKey}");
<#assign doubleItemCount = doubleItemCount + 1/>
- </...@ww.iterator>
+ </...@saf.iterator>
<#assign itemCount = itemCount + 1/>
-</...@ww.iterator>
+</...@saf.iterator>
var ${parameters.name}Temp = document.${parameters.formName}.${parameters.doubleName};
<#assign itemCount = startCount/>
<#assign redirectTo = 0/>
-<@ww.iterator value="parameters.list">
+<@saf.iterator value="parameters.list">
<#if parameters.listKey?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
@@ -82,7 +82,7 @@
<#assign redirectTo = itemCount/>
</#if>
<#assign itemCount = itemCount + 1/>
-</...@ww.iterator>
+</...@saf.iterator>
${parameters.name}Redirect(${redirectTo});
function ${parameters.name}Redirect(x) {
var selected = false;
Modified: incubator/webwork2/action/src/main/resources/template/simple/file.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/file.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/file.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/file.ftl Tue Apr 11 01:52:13 2006
@@ -4,7 +4,7 @@
size="${parameters.get("size")?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
Modified: incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl Tue Apr 11 01:52:13 2006
@@ -59,5 +59,5 @@
--><#t/>
<#if parameters.hasTooltip?default(false)><#t/>
<#lt/><!-- javascript that is needed for tooltips -->
- <#lt/><script language="JavaScript" type="text/javascript" src="<@ww.url value='/struts/tooltip/wz_tooltip.js' encode='false' />"></script>
+ <#lt/><script language="JavaScript" type="text/javascript" src="<@saf.url value='/struts/tooltip/wz_tooltip.js' encode='false' />"></script>
</#if><#t/>
Modified: incubator/webwork2/action/src/main/resources/template/simple/head.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/head.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/head.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/head.ftl Tue Apr 11 01:52:13 2006
@@ -1,3 +1,3 @@
<#if parameters.calendarcss?exists>
-<link rel="stylesheet" href="<@ww.url value='/struts/jscalendar/${parameters.calendarcss?html}' />" type="text/css"/>
+<link rel="stylesheet" href="<@saf.url value='/struts/jscalendar/${parameters.calendarcss?html}' />" type="text/css"/>
</#if>
Modified: incubator/webwork2/action/src/main/resources/template/simple/hidden.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/hidden.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/hidden.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/hidden.ftl Tue Apr 11 01:52:13 2006
@@ -1,7 +1,7 @@
<input type="hidden"<#rt/>
name="${parameters.name?default("")?html}"<#rt/>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.id?exists>
id="${parameters.id?html}"<#rt/>
Modified: incubator/webwork2/action/src/main/resources/template/simple/label.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/label.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/label.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/label.ftl Tue Apr 11 01:52:13 2006
@@ -16,6 +16,6 @@
</#if>
><#rt/>
<#if parameters.nameValue?exists>
-<@ww.property value="parameters.nameValue"/><#t/>
+<@saf.property value="parameters.nameValue"/><#t/>
</#if>
</label>
Modified: incubator/webwork2/action/src/main/resources/template/simple/optiontransferselect.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/optiontransferselect.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/optiontransferselect.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/optiontransferselect.ftl Tue Apr 11 01:52:13 2006
@@ -1,5 +1,5 @@
<#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
- <script language="javascript" src="<@ww.url value="/struts/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
+ <script language="javascript" src="<@saf.url value="/struts/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table border="0">
@@ -212,7 +212,7 @@
<#if parameters.doubleEmptyOption?default(false)><#t/>
<option value=""></option>
</#if><#t/>
- <@ww.iterator value="parameters.doubleList"><#t/>
+ <@saf.iterator value="parameters.doubleList"><#t/>
<#if parameters.doubleListKey?exists><#t/>
<#assign doubleItemKey = stack.findValue(parameters.doubleListKey) /><#t/>
<#else><#t/>
@@ -229,7 +229,7 @@
selected="selected"<#rt/>
</#if><#t/>
>${doubleItemValue?html}</option><#lt/>
- </...@ww.iterator><#t/>
+ </...@saf.iterator><#t/>
</select>
</td>
</tr>
Modified: incubator/webwork2/action/src/main/resources/template/simple/password.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/password.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/password.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/password.ftl Tue Apr 11 01:52:13 2006
@@ -7,7 +7,7 @@
maxlength="${parameters.maxlength?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists && parameters.showPassword?default(false)>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
Modified: incubator/webwork2/action/src/main/resources/template/simple/radiomap.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/radiomap.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/radiomap.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/radiomap.ftl Tue Apr 11 01:52:13 2006
@@ -1,4 +1,4 @@
-<@ww.iterator value="parameters.list">
+<@saf.iterator value="parameters.list">
<#if parameters.listKey?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
@@ -36,4 +36,4 @@
<label for="${parameters.id?html}${itemKey?html}"><#rt/>
${itemValue}<#t/>
</label>
-</...@ww.iterator>
+</...@saf.iterator>
Modified: incubator/webwork2/action/src/main/resources/template/simple/reset.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/reset.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/reset.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/reset.ftl Tue Apr 11 01:52:13 2006
@@ -4,7 +4,7 @@
name="${parameters.name?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.cssClass?exists>
class="${parameters.cssClass?html}"<#rt/>
@@ -13,14 +13,14 @@
style="${parameters.cssStyle?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
-><#if parameters.label?exists><@ww.property value="parameters.label"/><#rt/></#if></button>
+><#if parameters.label?exists><@saf.property value="parameters.label"/><#rt/></#if></button>
<#else>
<input type="reset"<#rt/>
<#if parameters.name?exists>
name="${parameters.name?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.cssClass?exists>
class="${parameters.cssClass?html}"<#rt/>
Modified: incubator/webwork2/action/src/main/resources/template/simple/richtexteditor.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/richtexteditor.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/richtexteditor.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/richtexteditor.ftl Tue Apr 11 01:52:13 2006
@@ -1,5 +1,5 @@
<#if !stack.findValue('#richtexteditor_js_included')?exists><#t/>
- <script type="text/javascript" src="<@ww.url value='/struts/richtexteditor/fckeditor.js' encode='false' />"></script>
+ <script type="text/javascript" src="<@saf.url value='/struts/richtexteditor/fckeditor.js' encode='false' />"></script>
<#assign tmpVariable = stack.setValue('#richtexteditor_js_included', 'true') /><#t/>
</#if><#t/>
<script>
@@ -8,7 +8,7 @@
<#if parameters.basePath?exists><#t/>
oFCKeditor_${parameters.id}.BasePath = '${parameters.basePath}' ;
<#else><#t/>
- oFCKeditor_${parameters.id}.BasePath = '<@ww.url value="/struts/richtexteditor/" />' ;
+ oFCKeditor_${parameters.id}.BasePath = '<@saf.url value="/struts/richtexteditor/" />' ;
</#if><#t/>
<#-- height --><#t/>
<#if parameters.height?exists><#t/>
@@ -31,9 +31,9 @@
oFCKeditor_${parameters.id}.DisplayError = '${parameters.displayError}' ;
</#if><#t/>
<#-- value --><#t/>
- <@ww.set name="tmpVal" value="parameters.nameValue" /><#t/>
+ <@saf.set name="tmpVal" value="parameters.nameValue" /><#t/>
<#if (stack.findValue('#tmpVal')?has_content)><#t/>
- oFCKeditor_${parameters.id}.Value = '<@ww.property escape="false" value="parameters.nameValue" />' ;
+ oFCKeditor_${parameters.id}.Value = '<@saf.property escape="false" value="parameters.nameValue" />' ;
</#if><#t/>
<#-- customConfigurationsPath --><#t/>
<#if parameters.customConfigurationsPath?exists><#t/>
@@ -41,7 +41,7 @@
</#if><#t/>
<#-- editorAreaCSS --><#t/>
<#if parameters.editorAreaCss?exists><#t/>
- oFCKeditor_${parameters.id}.Config['EditorAreaCSS'] = '<@ww.url value=parameters.editorAreaCss?string />' ;
+ oFCKeditor_${parameters.id}.Config['EditorAreaCSS'] = '<@saf.url value=parameters.editorAreaCss?string />' ;
</#if><#t/>
<#-- baseHref --><#t/>
<#if parameters.baseHref?exists><#t/>
@@ -149,43 +149,43 @@
</#if><#t/>
<#-- stylesXmlPath --><#t/>
<#if parameters.stylesXmlPath?exists><#t/>
- oFCKeditor_${parameters.id}.Config['StylesXmlPath'] = '<@ww.url value=parameters.stylesXmlPath?string />' ;
+ oFCKeditor_${parameters.id}.Config['StylesXmlPath'] = '<@saf.url value=parameters.stylesXmlPath?string />' ;
</#if><#t/>
<#-- templatesXmlPath --><#t/>
<#if parameters.templatesXmlPath?exists><#t/>
- oFCKeditor_${parameters.id}.Config['TemplatesXmlPath'] = '<@ww.url value=parameters.templatesXmlPath?string />' ;
+ oFCKeditor_${parameters.id}.Config['TemplatesXmlPath'] = '<@saf.url value=parameters.templatesXmlPath?string />' ;
</#if><#t/>
<#-- linkBrowserURL --><#t/>
<#if parameters.linkBrowserURL?exists><#t/>
- oFCKeditor_${parameters.id}.Config['LinkBrowserURL'] = '<@ww.url value=parameters.linkBrowserURL?string />' ;
+ oFCKeditor_${parameters.id}.Config['LinkBrowserURL'] = '<@saf.url value=parameters.linkBrowserURL?string />' ;
</#if><#t/>
<#-- imageBrowserURL --><#t/>
<#if parameters.imageBrowserURL?exists><#t/>
- oFCKeditor_${parameters.id}.Config['ImageBrowserURL'] = '<@ww.url value=parameters.imageBrowserURL?string />' ;
+ oFCKeditor_${parameters.id}.Config['ImageBrowserURL'] = '<@saf.url value=parameters.imageBrowserURL?string />' ;
</#if><#t/>
<#-- flashBrowserURL --><#t/>
<#if parameters.flashBrowserURL?exists><#t/>
- oFCKeditor_${parameters.id}.Config['FlashBrowserURL'] = '<@ww.url value=parameters.flashBrowserURL?string />' ;
+ oFCKeditor_${parameters.id}.Config['FlashBrowserURL'] = '<@saf.url value=parameters.flashBrowserURL?string />' ;
</#if><#t/>
<#-- linkUploadURL --><#t/>
<#if parameters.linkUploadURL?exists><#t/>
- oFCKeditor_${parameters.id}.Config['LinkUploadURL'] = '<@ww.url value=parameters.linkUploadURL?string />' ;
+ oFCKeditor_${parameters.id}.Config['LinkUploadURL'] = '<@saf.url value=parameters.linkUploadURL?string />' ;
</#if><#t/>
<#-- imageUploadURL --><#t/>
<#if parameters.imageUploadURL?exists><#t/>
- oFCKeditor_${parameters.id}.Config['ImageUploadURL'] = '<@ww.url value=parameters.imageUploadURL?string />' ;
+ oFCKeditor_${parameters.id}.Config['ImageUploadURL'] = '<@saf.url value=parameters.imageUploadURL?string />' ;
</#if><#t/>
<#-- flashUploadURL --><#t/>
<#if parameters.flashUploadURL?exists><#t/>
- oFCKeditor_${parameters.id}.Config['FlashUploadURL'] = '<@ww.url value=parameters.flashUploadURL?string />' ;
+ oFCKeditor_${parameters.id}.Config['FlashUploadURL'] = '<@saf.url value=parameters.flashUploadURL?string />' ;
</#if><#t/>
<#-- allowImageBrowse --><#t/>
<#if parameters.allowImageBrowse?exists><#t/>
- oFCKeditor_${parameters.id}.Config['ImageBrowser'] = '<@ww.url value=parameters.allowImageBrowse?string />' ;
+ oFCKeditor_${parameters.id}.Config['ImageBrowser'] = '<@saf.url value=parameters.allowImageBrowse?string />' ;
</#if><#t/>
<#-- allowLinkBrowse --><#t/>
<#if parameters.allowLinkBrowse?exists><#t/>
- oFCKeditor_${parameters.id}.Config['LinkBrowser'] = '<@ww.url value=parameters.allowLinkBrowse?string />' ;
+ oFCKeditor_${parameters.id}.Config['LinkBrowser'] = '<@saf.url value=parameters.allowLinkBrowse?string />' ;
</#if><#t/>
<#-- allowFlashBrowse --><#t/>
<#if parameters.allowFlashBrowse?exists><#t/>
@@ -229,7 +229,7 @@
</#if><#t/>
<#-- smileyPath --><#t/>
<#if parameters.smileyPath?exists><#t/>
- oFCKeditor_${parameters.id}.Config['SmileyPath'] = '<@ww.url value=parameters.smileyPath?string />' ;
+ oFCKeditor_${parameters.id}.Config['SmileyPath'] = '<@saf.url value=parameters.smileyPath?string />' ;
</#if><#t/>
<#-- smileyImages --><#t/>
<#if parameters.smileyImages?exists><#t/>
Modified: incubator/webwork2/action/src/main/resources/template/simple/select.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/select.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/select.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/select.ftl Tue Apr 11 01:52:13 2006
@@ -32,7 +32,7 @@
<#if parameters.emptyOption?default(false)>
<option value=""></option>
</#if>
-<@ww.iterator value="parameters.list">
+<@saf.iterator value="parameters.list">
<#if parameters.listKey?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
@@ -49,5 +49,5 @@
selected="selected"<#rt/>
</#if>
>${itemValue?html}</option><#lt/>
-</...@ww.iterator>
+</...@saf.iterator>
</select>
Modified: incubator/webwork2/action/src/main/resources/template/simple/submit.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/submit.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/submit.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/submit.ftl Tue Apr 11 01:52:13 2006
@@ -4,7 +4,7 @@
name="${parameters.name?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.cssClass?exists>
class="${parameters.cssClass?html}"<#rt/>
@@ -13,7 +13,7 @@
style="${parameters.cssStyle?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
-><#if parameters.label?exists><@ww.property value="parameters.label"/><#rt/></#if></button>
+><#if parameters.label?exists><@saf.property value="parameters.label"/><#rt/></#if></button>
<#else>
<#if parameters.type?exists && parameters.type=="image">
<input type="image"<#rt/>
@@ -30,7 +30,7 @@
name="${parameters.name?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.cssClass?exists>
class="${parameters.cssClass?html}"<#rt/>
Modified: incubator/webwork2/action/src/main/resources/template/simple/tabbedpanel-close.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/tabbedpanel-close.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/tabbedpanel-close.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/tabbedpanel-close.ftl Tue Apr 11 01:52:13 2006
@@ -3,11 +3,11 @@
<script language="JavaScript" type="text/javascript">
var headerDiv_${parameters.id} = document.getElementById("tab_header_${parameters.id}");
var content_${parameters.id} = " <ul class='tab_header_main' id='tab_header_main${parameters.id}'>\n";
- <@ww.iterator value="parameters.tabs">
+ <@saf.iterator value="parameters.tabs">
content_${tpid} = content_${tpid} + " <li onmouseover='mouseIn(this)' onmouseout='mouseOut(this)' class ='tab_default tab_unselected' id='tab_header_${top.id}'>";
content_${tpid} = content_${tpid} + " <a href='#' onclick='dojo.event.topic.publish(\"${topic}\", \"${top.id}\");return false;'>${top.tabName}</a>";
content_${tpid} = content_${tpid} + " </li>\n";
- </...@ww.iterator>
+ </...@saf.iterator>
content_${parameters.id} = content_${parameters.id} + " </ul>\n";
headerDiv_${parameters.id}.innerHTML = content_${parameters.id};
dojo.event.topic.publish('${parameters.topicName}', '${parameters.tabs[0].id}');
Modified: incubator/webwork2/action/src/main/resources/template/simple/table.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/table.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/table.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/table.ftl Tue Apr 11 01:52:13 2006
@@ -22,7 +22,7 @@
<#if false>
<img src="images/sorted_asc.gif" border="0" align="bottom"/>
<#else>
- <a href="<@ww.url><@ww.param name="${webTable.sortColumnLinkName}" value="${curColumn.offset}"/><@ww.param name="${webTable.sortOrderLinkName}" value="ASC"/></...@ww.url>"><img src="images/unsorted_asc.gif" border="0" align="bottom"/></a>
+ <a href="<@saf.url><@saf.param name="${webTable.sortColumnLinkName}" value="${curColumn.offset}"/><@saf.param name="${webTable.sortOrderLinkName}" value="ASC"/></...@saf.url>"><img src="images/unsorted_asc.gif" border="0" align="bottom"/></a>
</#if>
</td>
</tr>
Modified: incubator/webwork2/action/src/main/resources/template/simple/text.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/text.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/text.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/text.ftl Tue Apr 11 01:52:13 2006
@@ -7,7 +7,7 @@
maxlength="${parameters.maxlength?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@saf.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
Modified: incubator/webwork2/action/src/main/resources/template/simple/textarea.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/textarea.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/textarea.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/textarea.ftl Tue Apr 11 01:52:13 2006
@@ -29,6 +29,6 @@
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
><#rt/>
<#if parameters.nameValue?exists>
-<@ww.property value="parameters.nameValue"/><#t/>
+<@saf.property value="parameters.nameValue"/><#t/>
</#if>
</textarea>
Modified: incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl Tue Apr 11 01:52:13 2006
@@ -1,5 +1,5 @@
<#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
- <script language="javascript" src="<@ww.url value="/struts/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
+ <script language="javascript" src="<@saf.url value="/struts/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table>
Modified: incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl Tue Apr 11 01:52:13 2006
@@ -34,7 +34,7 @@
</#if>
:<#t/>
<#if parameters.tooltip?exists>
- <img src='<@ww.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@saf.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
</#if>
</label><#t/>
</#if>
@@ -66,7 +66,7 @@
</#if>
:<#t/>
<#if parameters.tooltip?exists>
- <img src='<@ww.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@saf.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
</#if>
</label><#t/>
</#if>
@@ -76,7 +76,7 @@
<span class="required">*</span><#t/>
</#if>
<#if parameters.tooltip?exists>
- <img src='<@ww.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@saf.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
</#if>
</#if>
</td>
Modified: incubator/webwork2/action/src/main/resources/template/xhtml/head.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/xhtml/head.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/xhtml/head.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/xhtml/head.ftl Tue Apr 11 01:52:13 2006
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@ww.url value='/struts/xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@saf.url value='/struts/xhtml/styles.css' encode='false' />" type="text/css"/>
<#include "/${parameters.templateDir}/simple/head.ftl" />
Modified: incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl?rev=393160&r1=393159&r2=393160&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl Tue Apr 11 01:52:13 2006
@@ -1,9 +1,9 @@
<#if parameters.tooltip?exists><#t/>
<img
<#if parameters.tooltipIcon?exists><#t/>
- src='<@ww.url value="${parameters.tooltipIcon}" />'
+ src='<@saf.url value="${parameters.tooltipIcon}" />'
<#else><#t/>
- src='<@ww.url value="/struts/tooltip/tooltip.gif" />'
+ src='<@saf.url value="/struts/tooltip/tooltip.gif" />'
</#if><#t/>
alt="${parameters.tooltip?html}"
title="${parameters.tooltip?html}"
@@ -15,7 +15,7 @@
<#t/>this.T_BGCOLOR='${parameters.tooltipBgColor}';<#t/>
</#if><#t/>
<#if parameters.tooltipBgImg?exists><#t/>
- <#t/>this.T_BGIMG='<@ww.url value="${parameters.tooltipBgImg}" />';<#t/>
+ <#t/>this.T_BGIMG='<@saf.url value="${parameters.tooltipBgImg}" />';<#t/>
</#if><#t/>
<#if parameters.tooltipBorderWidth?exists><#t/>
<#t/>this.T_BORDERWIDTH=${parameters.tooltipBorderWidth};<#t/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org