You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/04/01 19:28:28 UTC
svn commit: r390700 - in /incubator/webwork2/src/java/template: ajax/
archive/ajax/ archive/simple/ archive/xhtml/ css_xhtml/ simple/ xhtml/
Author: mrdon
Date: Sat Apr 1 09:28:24 2006
New Revision: 390700
URL: http://svn.apache.org/viewcvs?rev=390700&view=rev
Log:
Renaming static prefix to /struts from /webwork, renaming webwork
template utility class name, renaming webwork dojo package to struts
(will probably change to action later)
Modified:
incubator/webwork2/src/java/template/ajax/dojoRequire.js
incubator/webwork2/src/java/template/ajax/form.ftl
incubator/webwork2/src/java/template/ajax/head.ftl
incubator/webwork2/src/java/template/archive/ajax/a.vm
incubator/webwork2/src/java/template/archive/ajax/div.vm
incubator/webwork2/src/java/template/archive/ajax/form.vm
incubator/webwork2/src/java/template/archive/ajax/submit.vm
incubator/webwork2/src/java/template/archive/ajax/tab.vm
incubator/webwork2/src/java/template/archive/simple/checkbox.vm
incubator/webwork2/src/java/template/archive/simple/checkboxlist.vm
incubator/webwork2/src/java/template/archive/simple/combobox.vm
incubator/webwork2/src/java/template/archive/simple/doubleselect.vm
incubator/webwork2/src/java/template/archive/simple/file.vm
incubator/webwork2/src/java/template/archive/simple/form.vm
incubator/webwork2/src/java/template/archive/simple/hidden.vm
incubator/webwork2/src/java/template/archive/simple/label.vm
incubator/webwork2/src/java/template/archive/simple/password.vm
incubator/webwork2/src/java/template/archive/simple/radiomap.vm
incubator/webwork2/src/java/template/archive/simple/scripting-events.vm
incubator/webwork2/src/java/template/archive/simple/select.vm
incubator/webwork2/src/java/template/archive/simple/submit.vm
incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm
incubator/webwork2/src/java/template/archive/simple/text.vm
incubator/webwork2/src/java/template/archive/simple/textarea.vm
incubator/webwork2/src/java/template/archive/simple/token.vm
incubator/webwork2/src/java/template/archive/xhtml/checkbox.vm
incubator/webwork2/src/java/template/archive/xhtml/controlheader.vm
incubator/webwork2/src/java/template/archive/xhtml/form.vm
incubator/webwork2/src/java/template/archive/xhtml/submit.vm
incubator/webwork2/src/java/template/css_xhtml/form-validate.ftl
incubator/webwork2/src/java/template/css_xhtml/head.ftl
incubator/webwork2/src/java/template/simple/datepicker.ftl
incubator/webwork2/src/java/template/simple/form-close.ftl
incubator/webwork2/src/java/template/simple/head.ftl
incubator/webwork2/src/java/template/simple/optiontransferselect.ftl
incubator/webwork2/src/java/template/simple/richtexteditor.ftl
incubator/webwork2/src/java/template/simple/updownselect.ftl
incubator/webwork2/src/java/template/xhtml/checkbox.ftl
incubator/webwork2/src/java/template/xhtml/form-validate.ftl
incubator/webwork2/src/java/template/xhtml/head.ftl
incubator/webwork2/src/java/template/xhtml/tooltip.ftl
Modified: incubator/webwork2/src/java/template/ajax/dojoRequire.js
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/ajax/dojoRequire.js?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/ajax/dojoRequire.js (original)
+++ incubator/webwork2/src/java/template/ajax/dojoRequire.js Sat Apr 1 09:28:24 2006
@@ -3,11 +3,11 @@
dojo.hostenv.setModulePrefix('webwork', 'webwork');
dojo.require('dojo.widget.*');
-dojo.widget.manager.registerWidgetPackage('webwork.widgets');
+dojo.widget.manager.registerWidgetPackage('struts.widgets');
-dojo.require("webwork.widgets.Bind");
-dojo.require("webwork.widgets.BindDiv");
-dojo.require("webwork.widgets.BindButton");
-dojo.require("webwork.widgets.BindAnchor");
+dojo.require("struts.widgets.Bind");
+dojo.require("struts.widgets.BindDiv");
+dojo.require("struts.widgets.BindButton");
+dojo.require("struts.widgets.BindAnchor");
dojo.require("dojo.widget.Editor");
dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger to work with the includes
Modified: incubator/webwork2/src/java/template/ajax/form.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/ajax/form.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/ajax/form.ftl (original)
+++ incubator/webwork2/src/java/template/ajax/form.ftl Sat Apr 1 09:28:24 2006
@@ -1,9 +1,9 @@
<#if parameters.validate?exists>
-<script src="${base}/webwork/validationClient.js"></script>
+<script src="${base}/struts/validationClient.js"></script>
<script src="${base}/dwr/interface/validator.js"></script>
<script src="${base}/dwr/engine.js"></script>
-<script src="${base}/webwork/ajax/validation.js"></script>
-<script src="${base}/webwork/xhtml/validation.js"></script>
+<script src="${base}/struts/ajax/validation.js"></script>
+<script src="${base}/struts/xhtml/validation.js"></script>
</#if>
<form<#rt/>
<#if parameters.namespace?exists>
Modified: incubator/webwork2/src/java/template/ajax/head.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/ajax/head.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/ajax/head.ftl (original)
+++ incubator/webwork2/src/java/template/ajax/head.ftl Sat Apr 1 09:28:24 2006
@@ -2,15 +2,15 @@
<script language="JavaScript" type="text/javascript">
// Dojo configuration
djConfig = {
- baseRelativePath: "<@ww.url includeParams='none' value='/webwork/dojo/' encode='false'/>",
+ baseRelativePath: "<@ww.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='/webwork/dojo/dojo.js' encode='false'/>"></script>
+ src="<@ww.url includeParams='none' value='/struts/dojo/dojo.js' encode='false'/>"></script>
<script language="JavaScript" type="text/javascript"
- src="<@ww.url includeParams='none' value='/webwork/ajax/dojoRequire.js' encode='false'/>"></script>
+ src="<@ww.url includeParams='none' value='/struts/ajax/dojoRequire.js' encode='false'/>"></script>
<script language="JavaScript" type="text/javascript"
- src="<@ww.url includeParams='none' value='/webwork/CommonFunctions.js' encode='false'/>"></script>
+ src="<@ww.url includeParams='none' value='/struts/CommonFunctions.js' encode='false'/>"></script>
Modified: incubator/webwork2/src/java/template/archive/ajax/a.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/ajax/a.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/ajax/a.vm (original)
+++ incubator/webwork2/src/java/template/archive/ajax/a.vm Sat Apr 1 09:28:24 2006
@@ -1,13 +1,13 @@
<a dojoType="BindAnchor" evalResult="true"
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.href) href="$!webwork.htmlEncode($parameters.href)" #end
-#if ($parameters.notifyTopics) notifyTopics="$!webwork.htmlEncode($parameters.notifyTopics)" #end
-#if ($parameters.errorText) errorHtml="$!webwork.htmlEncode($parameters.errorText)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.href) href="$!struts.htmlEncode($parameters.href)" #end
+#if ($parameters.notifyTopics) notifyTopics="$!struts.htmlEncode($parameters.notifyTopics)" #end
+#if ($parameters.errorText) errorHtml="$!struts.htmlEncode($parameters.errorText)" #end
#if ($parameters.showErrorTransportText) showTransportError="true" #end
#if ($parameters.afterLoading) onLoad="$!parameters.afterLoading" #end
#if ($parameters.preInvokeJS) preInvokeJS="$!parameters.preInvokeJS" #end
-#if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
>
Modified: incubator/webwork2/src/java/template/archive/ajax/div.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/ajax/div.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/ajax/div.vm (original)
+++ incubator/webwork2/src/java/template/archive/ajax/div.vm Sat Apr 1 09:28:24 2006
@@ -1,15 +1,15 @@
<div dojoType='BindDiv'
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
#if ($parameters.href) href="$!parameters.href" #end
-#if ($parameters.loadingText) loadingHtml="$!webwork.htmlEncode($parameters.loadingText)" #end
-#if ($parameters.errorText) errorHtml="$!webwork.htmlEncode($parameters.errorText)" #end
+#if ($parameters.loadingText) loadingHtml="$!struts.htmlEncode($parameters.loadingText)" #end
+#if ($parameters.errorText) errorHtml="$!struts.htmlEncode($parameters.errorText)" #end
#if ($parameters.showErrorTransportText) showTransportError="true" #end
#if ($parameters.delay) delay="$!parameters.delay" #end
#if ($parameters.updateFreq) refresh="$!parameters.updateFreq" #end
#if ($parameters.listenTopics) listenTopics="$!parameters.listenTopics" #end
#if ($parameters.afterLoading) onLoad="$!parameters.afterLoading" #end
-#if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
>
Modified: incubator/webwork2/src/java/template/archive/ajax/form.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/ajax/form.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/ajax/form.vm (original)
+++ incubator/webwork2/src/java/template/archive/ajax/form.vm Sat Apr 1 09:28:24 2006
@@ -1,19 +1,19 @@
#if ($parameters.validate)
-<script src="$!base/webwork/validationClient.js"></script>
+<script src="$!base/struts/validationClient.js"></script>
<script src="$!base/dwr/interface/validator.js"></script>
<script src="$!base/dwr/engine.js"></script>
-<script src="$!base/webwork/template/xhtml/validation.js"></script>
+<script src="$!base/struts/template/xhtml/validation.js"></script>
#end
<form
-#if ($parameters.namespace) namespace="$!webwork.htmlEncode($parameters.namespace)" #end
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.name) name="$!webwork.htmlEncode($parameters.name)" #end
-#if ($parameters.action) action="$!webwork.htmlEncode($parameters.action)" #end
-#if ($parameters.target) target="$!webwork.htmlEncode($parameters.target)" #end
-#if ($parameters.method) method="$!webwork.htmlEncode($parameters.method)" #end
-#if ($parameters.enctype) enctype="$!webwork.htmlEncode($parameters.enctype)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.namespace) namespace="$!struts.htmlEncode($parameters.namespace)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.name) name="$!struts.htmlEncode($parameters.name)" #end
+#if ($parameters.action) action="$!struts.htmlEncode($parameters.action)" #end
+#if ($parameters.target) target="$!struts.htmlEncode($parameters.target)" #end
+#if ($parameters.method) method="$!struts.htmlEncode($parameters.method)" #end
+#if ($parameters.enctype) enctype="$!struts.htmlEncode($parameters.enctype)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
onSubmit="return false;"
>
<table class="wwFormTable">
Modified: incubator/webwork2/src/java/template/archive/ajax/submit.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/ajax/submit.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/ajax/submit.vm (original)
+++ incubator/webwork2/src/java/template/archive/ajax/submit.vm Sat Apr 1 09:28:24 2006
@@ -1,13 +1,13 @@
<button type="submit" dojoType="BindButton"<#rt/>
#if ($parameters.form && $parameters.form.id) formId="$parameters.form.id" #end
-#if ($parameters.name) name="$!webwork.htmlEncode($parameters.name)" #end
-#if ($parameters.nameValue) value="$!webwork.htmlEncode($parameters.nameValue)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
-#if ($parameters.resultDivId) targetDiv="$!webwork.htmlEncode($parameters.resultDivId)" #end
+#if ($parameters.name) name="$!struts.htmlEncode($parameters.name)" #end
+#if ($parameters.nameValue) value="$!struts.htmlEncode($parameters.nameValue)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.resultDivId) targetDiv="$!struts.htmlEncode($parameters.resultDivId)" #end
#if ($parameters.onLoadJS) onLoad="$!parameters.onLoadJS" #end
#if ($parameters.preInvokeJS) preInvokeJS="$!parameters.preInvokeJS" #end
-#if ($parameters.notifyTopics) notifyTopics="$!webwork.htmlEncode($parameters.notifyTopics)" #end
-#if ($parameters.listenTopics) listenTopics="$!webwork.htmlEncode($parameters.listenTopics)" #end
+#if ($parameters.notifyTopics) notifyTopics="$!struts.htmlEncode($parameters.notifyTopics)" #end
+#if ($parameters.listenTopics) listenTopics="$!struts.htmlEncode($parameters.listenTopics)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
/>
Modified: incubator/webwork2/src/java/template/archive/ajax/tab.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/ajax/tab.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/ajax/tab.vm (original)
+++ incubator/webwork2/src/java/template/archive/ajax/tab.vm Sat Apr 1 09:28:24 2006
@@ -3,15 +3,15 @@
id="tab_contents_update_${parameters.id}"
#if ($parameters.remote)
dojoType='BindDiv'
- #if ($parameters.href) href="$!webwork.htmlEncode($parameters.href)" #end
- #if ($parameters.loadingText) loadingHtml="$!webwork.htmlEncode($parameters.loadingText)" #end
- #if ($parameters.errorText) errorHtml="$!webwork.htmlEncode($parameters.errorText)" #end
+ #if ($parameters.href) href="$!struts.htmlEncode($parameters.href)" #end
+ #if ($parameters.loadingText) loadingHtml="$!struts.htmlEncode($parameters.loadingText)" #end
+ #if ($parameters.errorText) errorHtml="$!struts.htmlEncode($parameters.errorText)" #end
#if ($parameters.showErrorTransportText) showTransportError="true" #end
#if ($parameters.delay) delay="$!parameters.delay" #end
#if ($parameters.updateFreq) refresh="$!parameters.updateFreq" #end
- #if ($parameters.listenTopics) listenTopics="$!webwork.htmlEncode($parameters.listenTopics)" #end
- #if ($parameters.afterLoading) onLoad="$!webwork.htmlEncode($parameters.afterLoading)" #end
+ #if ($parameters.listenTopics) listenTopics="$!struts.htmlEncode($parameters.listenTopics)" #end
+ #if ($parameters.afterLoading) onLoad="$!struts.htmlEncode($parameters.afterLoading)" #end
#end
- #if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
- #if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+ #if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+ #if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
>
Modified: incubator/webwork2/src/java/template/archive/simple/checkbox.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/checkbox.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/checkbox.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/checkbox.vm Sat Apr 1 09:28:24 2006
@@ -1,10 +1,10 @@
-<input type="checkbox" name="$!webwork.htmlEncode($parameters.name)" value="$!webwork.htmlEncode($parameters.fieldValue)"
+<input type="checkbox" name="$!struts.htmlEncode($parameters.name)" value="$!struts.htmlEncode($parameters.fieldValue)"
#if ($parameters.nameValue) checked="checked" #end
#if ($parameters.disabled && $parameters.disabled == true)
disabled="disabled" #end
-#if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
/>
Modified: incubator/webwork2/src/java/template/archive/simple/checkboxlist.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/checkboxlist.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/checkboxlist.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/checkboxlist.vm Sat Apr 1 09:28:24 2006
@@ -14,10 +14,10 @@
#else
#set( $itemValue = $item )
#end
- <input type="checkbox" name="$!webwork.htmlEncode($parameters.name)" value="$!webwork.htmlEncode($itemKey)"
+ <input type="checkbox" name="$!struts.htmlEncode($parameters.name)" value="$!struts.htmlEncode($itemKey)"
#parse("/$parameters.templateDir/simple/scripting-events.vm")
- id="$!webwork.htmlEncode($parameters.name)-$itemCount" #if( $tag.contains($parameters.nameValue, $itemKey) ) checked="checked" #end/>
- <label for="$!webwork.htmlEncode($parameters.name)-$itemCount" class="checkboxLabel">$!webwork.htmlEncode($itemValue)</label><br />
+ id="$!struts.htmlEncode($parameters.name)-$itemCount" #if( $tag.contains($parameters.nameValue, $itemKey) ) checked="checked" #end/>
+ <label for="$!struts.htmlEncode($parameters.name)-$itemCount" class="checkboxLabel">$!struts.htmlEncode($itemValue)</label><br />
#set ($trash = $stack.pop())
#end
#else
Modified: incubator/webwork2/src/java/template/archive/simple/combobox.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/combobox.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/combobox.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/combobox.vm Sat Apr 1 09:28:24 2006
@@ -1,23 +1,23 @@
<input type="text"
- name="$!webwork.htmlEncode($parameters.name)"
-#if ($parameters.size) size="$!webwork.htmlEncode($parameters.size)" #end
-#if ($parameters.maxlength) maxlength="$!webwork.htmlEncode($parameters.maxlength)" #end
-#if ($parameters.nameValue) value="$!webwork.htmlEncode($parameters.nameValue)" #end
+ name="$!struts.htmlEncode($parameters.name)"
+#if ($parameters.size) size="$!struts.htmlEncode($parameters.size)" #end
+#if ($parameters.maxlength) maxlength="$!struts.htmlEncode($parameters.maxlength)" #end
+#if ($parameters.nameValue) value="$!struts.htmlEncode($parameters.nameValue)" #end
#if ($parameters.disabled && $parameters.disabled == true)
disabled="disabled" #end
#if ($parameters.readonly) readonly="readonly" #end
-#if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
/><br/>
#if ($parameters.list)
-<select onChange="this.form.elements['$!webwork.htmlEncode($parameters.name)'].value=this.options[this.selectedIndex].value"
+<select onChange="this.form.elements['$!struts.htmlEncode($parameters.name)'].value=this.options[this.selectedIndex].value"
#if ($parameters.disabled == true) disabled="disabled" #end
>
#foreach ($param in $parameters.list)
- <option value="$!webwork.htmlEncode($param)"#if ($parameters.name == $param) selected="selected"#end>$!webwork.htmlEncode($param)</option>
+ <option value="$!struts.htmlEncode($param)"#if ($parameters.name == $param) selected="selected"#end>$!struts.htmlEncode($param)</option>
#end
</select>#end
Modified: incubator/webwork2/src/java/template/archive/simple/doubleselect.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/doubleselect.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/doubleselect.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/doubleselect.vm Sat Apr 1 09:28:24 2006
@@ -8,20 +8,20 @@
#end
<br/>
-<select name="$!webwork.htmlEncode($parameters.doubleName)"
+<select name="$!struts.htmlEncode($parameters.doubleName)"
#if ($parameters.disabled) disabled="disabled" #end
- #if ($parameters.doubleTabindex) tabindex="$!webwork.htmlEncode($parameters.doubleTabindex)" #end
- #if ($parameters.doubleId) id="$!webwork.htmlEncode($parameters.doubleId)" #end
+ #if ($parameters.doubleTabindex) tabindex="$!struts.htmlEncode($parameters.doubleTabindex)" #end
+ #if ($parameters.doubleId) id="$!struts.htmlEncode($parameters.doubleId)" #end
#if ($parameters.multiple) multiple="multiple" #end
- #if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
- #if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+ #if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+ #if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
>
</select>
<script type="text/javascript">
#set( $itemCount = $startCount )
-var $!webwork.htmlEncode($parameters.name)Group = new Array($!{parameters.listSize} + $startCount);
+var $!struts.htmlEncode($parameters.name)Group = new Array($!{parameters.listSize} + $startCount);
for (i = 0; i < ($!{parameters.listSize} + $startCount); i++)
-$!webwork.htmlEncode($parameters.name)Group[i] = new Array();
+$!struts.htmlEncode($parameters.name)Group[i] = new Array();
#foreach( $item in $items )
$stack.push($item)
#if( $parameters.listKey )
@@ -49,7 +49,7 @@
#else
#set( $doubleItemValue = $doubleItem )
#end
- $!webwork.htmlEncode($parameters.name)Group[$itemCount][$doubleItemCount] = new Option("$doubleItemKey", "$doubleItemValue");
+ $!struts.htmlEncode($parameters.name)Group[$itemCount][$doubleItemCount] = new Option("$doubleItemKey", "$doubleItemValue");
#set( $doubleItemCount = $doubleItemCount + 1 )
#set ($trash = $stack.pop())
#end
@@ -57,7 +57,7 @@
#end
#set ($trash = $stack.pop())
#end
-var $!webwork.htmlEncode($parameters.name)Temp = document.$!webwork.htmlEncode(${parameters.formName}).$!webwork.htmlEncode(${parameters.doubleName});
+var $!struts.htmlEncode($parameters.name)Temp = document.$!struts.htmlEncode(${parameters.formName}).$!struts.htmlEncode(${parameters.doubleName});
#set( $itemCount = $startCount )
#set( $redirectTo = 0 )
#foreach( $item in $items )
@@ -73,16 +73,16 @@
#set( $itemCount = $itemCount + 1 )
#set ($trash = $stack.pop())
#end
-$!{webwork.htmlEncode($parameters.name)}Redirect($redirectTo);
-function $!{webwork.htmlEncode($parameters.name)}Redirect(x) {
- for (m = $!{webwork.htmlEncode($parameters.name)}Temp.options.length - 1; m >= 0; m--)
- $!{webwork.htmlEncode($parameters.name)}Temp.options[m] = null;
+$!{struts.htmlEncode($parameters.name)}Redirect($redirectTo);
+function $!{struts.htmlEncode($parameters.name)}Redirect(x) {
+ for (m = $!{struts.htmlEncode($parameters.name)}Temp.options.length - 1; m >= 0; m--)
+ $!{struts.htmlEncode($parameters.name)}Temp.options[m] = null;
for (i = 0; i < $!{parameters.name}Group[x].length; i++) {
- $!{webwork.htmlEncode($parameters.name)}Temp.options[i] = new Option($!{webwork.htmlEncode($parameters.name)}Group[x][i].text, $!{webwork.htmlEncode($parameters.name)}Group[x][i].value);
+ $!{struts.htmlEncode($parameters.name)}Temp.options[i] = new Option($!{struts.htmlEncode($parameters.name)}Group[x][i].text, $!{struts.htmlEncode($parameters.name)}Group[x][i].value);
}
if ($!{parameters.name}Temp.options.length > 0)
- $!{webwork.htmlEncode($parameters.name)}Temp.options[0].selected = true;
+ $!{struts.htmlEncode($parameters.name)}Temp.options[0].selected = true;
}
</script>
Modified: incubator/webwork2/src/java/template/archive/simple/file.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/file.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/file.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/file.vm Sat Apr 1 09:28:24 2006
@@ -1,12 +1,12 @@
<input type="file"
- name="$!webwork.htmlEncode($parameters.name)"
-#if ($parameters.size) size="$!webwork.htmlEncode($parameters.size)" #end
-#if ($parameters.nameValue) value="$!webwork.htmlEncode($parameters.nameValue)" #end
+ name="$!struts.htmlEncode($parameters.name)"
+#if ($parameters.size) size="$!struts.htmlEncode($parameters.size)" #end
+#if ($parameters.nameValue) value="$!struts.htmlEncode($parameters.nameValue)" #end
#if ($parameters.disabled && $parameters.disabled == true)
disabled="disabled" #end
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.accept) accept="$!webwork.htmlEncode($parameters.accept)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.accept) accept="$!struts.htmlEncode($parameters.accept)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
/>
Modified: incubator/webwork2/src/java/template/archive/simple/form.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/form.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/form.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/form.vm Sat Apr 1 09:28:24 2006
@@ -1,12 +1,12 @@
<form
#if ($parameters.namespace) namespace="$!parameters.namespace" #end
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.name) name="$!webwork.htmlEncode($parameters.name)" #end
-#if ($parameters.action) action="$!webwork.htmlEncode($parameters.action)" #end
-#if ($parameters.target) target="$!webwork.htmlEncode($parameters.target)" #end
-#if ($parameters.method) method="$!webwork.htmlEncode($parameters.method)" #end
-#if ($parameters.enctype) enctype="$!webwork.htmlEncode($parameters.enctype)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.name) name="$!struts.htmlEncode($parameters.name)" #end
+#if ($parameters.action) action="$!struts.htmlEncode($parameters.action)" #end
+#if ($parameters.target) target="$!struts.htmlEncode($parameters.target)" #end
+#if ($parameters.method) method="$!struts.htmlEncode($parameters.method)" #end
+#if ($parameters.enctype) enctype="$!struts.htmlEncode($parameters.enctype)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
>
Modified: incubator/webwork2/src/java/template/archive/simple/hidden.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/hidden.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/hidden.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/hidden.vm Sat Apr 1 09:28:24 2006
@@ -1,8 +1,8 @@
<input
type="hidden"
- #if ($parameters.name) name="$!webwork.htmlEncode($parameters.name)" #end
- #if ($parameters.nameValue) value="$!webwork.htmlEncode($parameters.nameValue)" #end
- #if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
- #if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
- #if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
+ #if ($parameters.name) name="$!struts.htmlEncode($parameters.name)" #end
+ #if ($parameters.nameValue) value="$!struts.htmlEncode($parameters.nameValue)" #end
+ #if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+ #if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
+ #if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
/>
Modified: incubator/webwork2/src/java/template/archive/simple/label.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/label.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/label.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/label.vm Sat Apr 1 09:28:24 2006
@@ -1,6 +1,6 @@
<label
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
-#if ($parameters.for) for="$!webwork.htmlEncode($parameters.for)" #end
->#if ($parameters.nameValue)$!webwork.htmlEncode($parameters.nameValue)#end</label>
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.for) for="$!struts.htmlEncode($parameters.for)" #end
+>#if ($parameters.nameValue)$!struts.htmlEncode($parameters.nameValue)#end</label>
Modified: incubator/webwork2/src/java/template/archive/simple/password.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/password.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/password.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/password.vm Sat Apr 1 09:28:24 2006
@@ -1,14 +1,14 @@
<input type="password"
- name="$!webwork.htmlEncode($parameters.name)"
-#if ($parameters.size) size="$!webwork.htmlEncode($parameters.size)" #end
-#if ($parameters.maxlength) maxlength="$!webwork.htmlEncode($parameters.maxlength)" #end
+ name="$!struts.htmlEncode($parameters.name)"
+#if ($parameters.size) size="$!struts.htmlEncode($parameters.size)" #end
+#if ($parameters.maxlength) maxlength="$!struts.htmlEncode($parameters.maxlength)" #end
#if ($parameters.nameValue && $parameters.showPassword && $parameters.showPassword == true)
- value="$!webwork.htmlEncode($parameters.nameValue)" #end
+ value="$!struts.htmlEncode($parameters.nameValue)" #end
#if ($parameters.disabled && $parameters.disabled == true)
disabled="disabled" #end
#if ($parameters.readonly) readonly="readonly" #end
-#if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
/>
Modified: incubator/webwork2/src/java/template/archive/simple/radiomap.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/radiomap.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/radiomap.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/radiomap.vm Sat Apr 1 09:28:24 2006
@@ -19,16 +19,16 @@
type="radio"
#if( $tag.contains($parameters.nameValue, $itemKey) )checked="checked"#end
#if ($parameters.name)
- name="$!webwork.htmlEncode($parameters.name)"
- id="$!webwork.htmlEncode($parameters.name)$!webwork.htmlEncode($itemKey)"
+ name="$!struts.htmlEncode($parameters.name)"
+ id="$!struts.htmlEncode($parameters.name)$!struts.htmlEncode($itemKey)"
#end
- #if ($itemKey) value="$!webwork.htmlEncode($itemKey)" #end
+ #if ($itemKey) value="$!struts.htmlEncode($itemKey)" #end
#if ($parameters.disabled) disabled="disabled" #end
- #if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
- #if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
- #if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+ #if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+ #if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+ #if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
- /><label for="$!webwork.htmlEncode($parameters.name)$!webwork.htmlEncode($itemKey)">$!itemValue</label>
+ /><label for="$!struts.htmlEncode($parameters.name)$!struts.htmlEncode($itemKey)">$!itemValue</label>
#set ($trash = $stack.pop())
#end
Modified: incubator/webwork2/src/java/template/archive/simple/scripting-events.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/scripting-events.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/scripting-events.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/scripting-events.vm Sat Apr 1 09:28:24 2006
@@ -1,14 +1,14 @@
-#if ($parameters.onclick) onclick="$!webwork.htmlEncode($parameters.onclick)" #end
-#if ($parameters.ondblclick) ondblclick="$!webwork.htmlEncode($parameters.ondblclick)" #end
-#if ($parameters.onmousedown) onmousedown="$!webwork.htmlEncode($parameters.onmousedown)" #end
-#if ($parameters.onmouseup) onmouseup="$!webwork.htmlEncode($parameters.onmouseup)" #end
-#if ($parameters.onmouseover) onmouseover="$!webwork.htmlEncode($parameters.onmouseover)" #end
-#if ($parameters.onmousemove) onmousemove="$!webwork.htmlEncode($parameters.onmousemove)" #end
-#if ($parameters.onmouseout) onmouseout="$!webwork.htmlEncode($parameters.onmouseout)" #end
-#if ($parameters.onfocus) onfocus="$!webwork.htmlEncode($parameters.onfocus)" #end
-#if ($parameters.onblur) onblur="$!webwork.htmlEncode($parameters.onblur)" #end
-#if ($parameters.onkeypress) onkeypress="$!webwork.htmlEncode($parameters.onkeypress)" #end
-#if ($parameters.onkeydown) onkeydown="$!webwork.htmlEncode($parameters.onkeydown)" #end
-#if ($parameters.onkeyup) onkeyup="$!webwork.htmlEncode($parameters.onkeyup)" #end
-#if ($parameters.onselect) onselect="$!webwork.htmlEncode($parameters.onselect)" #end
-#if ($parameters.onchange) onchange="$!webwork.htmlEncode($parameters.onchange)" #end
+#if ($parameters.onclick) onclick="$!struts.htmlEncode($parameters.onclick)" #end
+#if ($parameters.ondblclick) ondblclick="$!struts.htmlEncode($parameters.ondblclick)" #end
+#if ($parameters.onmousedown) onmousedown="$!struts.htmlEncode($parameters.onmousedown)" #end
+#if ($parameters.onmouseup) onmouseup="$!struts.htmlEncode($parameters.onmouseup)" #end
+#if ($parameters.onmouseover) onmouseover="$!struts.htmlEncode($parameters.onmouseover)" #end
+#if ($parameters.onmousemove) onmousemove="$!struts.htmlEncode($parameters.onmousemove)" #end
+#if ($parameters.onmouseout) onmouseout="$!struts.htmlEncode($parameters.onmouseout)" #end
+#if ($parameters.onfocus) onfocus="$!struts.htmlEncode($parameters.onfocus)" #end
+#if ($parameters.onblur) onblur="$!struts.htmlEncode($parameters.onblur)" #end
+#if ($parameters.onkeypress) onkeypress="$!struts.htmlEncode($parameters.onkeypress)" #end
+#if ($parameters.onkeydown) onkeydown="$!struts.htmlEncode($parameters.onkeydown)" #end
+#if ($parameters.onkeyup) onkeyup="$!struts.htmlEncode($parameters.onkeyup)" #end
+#if ($parameters.onselect) onselect="$!struts.htmlEncode($parameters.onselect)" #end
+#if ($parameters.onchange) onchange="$!struts.htmlEncode($parameters.onchange)" #end
Modified: incubator/webwork2/src/java/template/archive/simple/select.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/select.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/select.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/select.vm Sat Apr 1 09:28:24 2006
@@ -1,16 +1,16 @@
-<select name="$!webwork.htmlEncode($parameters.name)"
- #if ($parameters.size) size="$!webwork.htmlEncode($parameters.size)" #end
+<select name="$!struts.htmlEncode($parameters.name)"
+ #if ($parameters.size) size="$!struts.htmlEncode($parameters.size)" #end
#if ($parameters.disabled) disabled="disabled" #end
- #if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
- #if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
+ #if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+ #if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
#if ($parameters.multiple) multiple="multiple" #end
- #if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
- #if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+ #if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+ #if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
>
#if ($parameters.headerKey && $parameters.headerValue)
- <option value="$!webwork.htmlEncode($parameters.headerKey)">$!webwork.htmlEncode($parameters.headerValue)</option>
+ <option value="$!struts.htmlEncode($parameters.headerKey)">$!struts.htmlEncode($parameters.headerValue)</option>
#end
#if ($parameters.emptyOption)
@@ -34,7 +34,7 @@
#set( $itemValue = $item )
#end
- <option value="$!webwork.htmlEncode($itemKey)"#if( $tag.contains($parameters.nameValue, $itemKey) ) selected="selected"#end>$!webwork.htmlEncode($itemValue)</option>
+ <option value="$!struts.htmlEncode($itemKey)"#if( $tag.contains($parameters.nameValue, $itemKey) ) selected="selected"#end>$!struts.htmlEncode($itemValue)</option>
#set ($trash = $stack.pop())
#end
Modified: incubator/webwork2/src/java/template/archive/simple/submit.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/submit.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/submit.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/submit.vm Sat Apr 1 09:28:24 2006
@@ -1,7 +1,7 @@
<input type="submit"
-#if ($parameters.name) name="$!webwork.htmlEncode($parameters.name)" #end
-#if ($parameters.nameValue) value="$!webwork.htmlEncode($parameters.nameValue)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.name) name="$!struts.htmlEncode($parameters.name)" #end
+#if ($parameters.nameValue) value="$!struts.htmlEncode($parameters.nameValue)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
/>
Modified: incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm Sat Apr 1 09:28:24 2006
@@ -20,9 +20,9 @@
#set ($tabIndex.first = 0)
#set ($tabIndex.last = $tag.content.size())
-<table border="1" cellspacing="0" cellpadding="5" id="$!webwork.htmlEncode($tag.id)">
+<table border="1" cellspacing="0" cellpadding="5" id="$!struts.htmlEncode($tag.id)">
- <tr valign="bottom" align="$!webwork.htmlEncode($tag.tabAlign)">
+ <tr valign="bottom" align="$!struts.htmlEncode($tag.tabAlign)">
#if ($tabAlign == 'CENTER' || $tabAlign == 'RIGHT')
<th colspan ="1" width="*"></th>
@@ -47,7 +47,7 @@
#if ($isCur == 'true')
<em>
#end
- $!webwork.htmlEncode($key)
+ $!struts.htmlEncode($key)
#if ($isCur == 'true')
</em>
#end
Modified: incubator/webwork2/src/java/template/archive/simple/text.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/text.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/text.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/text.vm Sat Apr 1 09:28:24 2006
@@ -1,14 +1,14 @@
<input type="text"
- name="$!webwork.htmlEncode($parameters.name)"
-#if ($parameters.size) size="$!webwork.htmlEncode($parameters.size)" #end
-#if ($parameters.maxlength) maxlength="$!webwork.htmlEncode($parameters.maxlength)" #end
-#if ($parameters.nameValue) value="$!webwork.htmlEncode($parameters.nameValue)" #end
+ name="$!struts.htmlEncode($parameters.name)"
+#if ($parameters.size) size="$!struts.htmlEncode($parameters.size)" #end
+#if ($parameters.maxlength) maxlength="$!struts.htmlEncode($parameters.maxlength)" #end
+#if ($parameters.nameValue) value="$!struts.htmlEncode($parameters.nameValue)" #end
#if ($parameters.disabled && $parameters.disabled == true)
disabled="disabled" #end
#if ($parameters.readonly) readonly="readonly" #end
-#if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
/>
Modified: incubator/webwork2/src/java/template/archive/simple/textarea.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/textarea.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/textarea.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/textarea.vm Sat Apr 1 09:28:24 2006
@@ -1,13 +1,13 @@
-<textarea name="$!webwork.htmlEncode($parameters.name)"
- cols="$!webwork.htmlEncode($parameters.cols)"
- rows="$!webwork.htmlEncode($parameters.rows)"
-#if ($parameters.wrap) wrap="$!webwork.htmlEncode($parameters.wrap)" #end
+<textarea name="$!struts.htmlEncode($parameters.name)"
+ cols="$!struts.htmlEncode($parameters.cols)"
+ rows="$!struts.htmlEncode($parameters.rows)"
+#if ($parameters.wrap) wrap="$!struts.htmlEncode($parameters.wrap)" #end
#if ($parameters.disabled && $parameters.disabled== true)
disabled="disabled" #end
#if ($parameters.readonly) readonly="readonly" #end
-#if ($parameters.tabindex) tabindex="$!webwork.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.id) id="$!webwork.htmlEncode($parameters.id)" #end
-#if ($parameters.cssClass) class="$!webwork.htmlEncode($parameters.cssClass)" #end
-#if ($parameters.cssStyle) style="$!webwork.htmlEncode($parameters.cssStyle)" #end
+#if ($parameters.tabindex) tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
+#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
+#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
+#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
->#if ($parameters.nameValue)$!webwork.htmlEncode($parameters.nameValue)#end</textarea>
+>#if ($parameters.nameValue)$!struts.htmlEncode($parameters.nameValue)#end</textarea>
Modified: incubator/webwork2/src/java/template/archive/simple/token.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/token.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/token.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/token.vm Sat Apr 1 09:28:24 2006
@@ -1,2 +1,2 @@
-<input type="hidden" name="$!{parameters.tokenNameField}" value="$webwork.htmlEncode($!parameters.name)"/>
-<input type="hidden" name="$!parameters.name" value="$webwork.htmlEncode($!parameters.token)"/>
+<input type="hidden" name="$!{parameters.tokenNameField}" value="$struts.htmlEncode($!parameters.name)"/>
+<input type="hidden" name="$!parameters.name" value="$struts.htmlEncode($!parameters.token)"/>
Modified: incubator/webwork2/src/java/template/archive/xhtml/checkbox.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/xhtml/checkbox.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/xhtml/checkbox.vm (original)
+++ incubator/webwork2/src/java/template/archive/xhtml/checkbox.vm Sat Apr 1 09:28:24 2006
@@ -13,7 +13,7 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="middle">#parse("$!{tag.templateDir}/simple/checkbox.vm")</td>
- <td width="100%" valign="middle"><label #if ($parameters.id) for="$!webwork.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="checkboxErrorLabel"#else class="checkboxLabel"#end>$!webwork.htmlEncode($parameters.label)</label></td>
+ <td width="100%" valign="middle"><label #if ($parameters.id) for="$!struts.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="checkboxErrorLabel"#else class="checkboxLabel"#end>$!struts.htmlEncode($parameters.label)</label></td>
</tr>
</table>
#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
Modified: incubator/webwork2/src/java/template/archive/xhtml/controlheader.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/xhtml/controlheader.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/xhtml/controlheader.vm (original)
+++ incubator/webwork2/src/java/template/archive/xhtml/controlheader.vm Sat Apr 1 09:28:24 2006
@@ -4,14 +4,14 @@
#set ($hasFieldErrors = $fieldErrors.get($parameters.name))
#foreach ($error in $fieldErrors.get($parameters.name))
<tr errorFor="$parameters.id">
- #if ($parameters.labelposition == 'top')<td align="left" valign="top" colspan="2">#else<td align="center" valign="top" colspan="2">#end<span class="errorMessage">$!webwork.htmlEncode($error)</span></td>
+ #if ($parameters.labelposition == 'top')<td align="left" valign="top" colspan="2">#else<td align="center" valign="top" colspan="2">#end<span class="errorMessage">$!struts.htmlEncode($error)</span></td>
</tr>
#end
#end
## if the label position is top,
## then give the label it's own row in the table
<tr>
-#if ($parameters.labelposition && $parameters.labelposition == 'top')<td align="left" valign="top" colspan="2">#else<td align="right" valign="top">#end#if ($parameters.label)<label #if ($parameters.id) for="$!webwork.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="errorLabel"#else class="label"#end>#if ($parameters.required)<span class="required">*</span>#end$!webwork.htmlEncode($parameters.label):</label>#end</td>
+#if ($parameters.labelposition && $parameters.labelposition == 'top')<td align="left" valign="top" colspan="2">#else<td align="right" valign="top">#end#if ($parameters.label)<label #if ($parameters.id) for="$!struts.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) class="errorLabel"#else class="label"#end>#if ($parameters.required)<span class="required">*</span>#end$!struts.htmlEncode($parameters.label):</label>#end</td>
## add the extra row
#if ($parameters.labelposition && $parameters.labelposition == 'top')
</tr>
Modified: incubator/webwork2/src/java/template/archive/xhtml/form.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/xhtml/form.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/xhtml/form.vm (original)
+++ incubator/webwork2/src/java/template/archive/xhtml/form.vm Sat Apr 1 09:28:24 2006
@@ -1,8 +1,8 @@
#if ($parameters.validate && $parameters.validate == true)
-<script src="${base}/webwork/validationClient.js"></script>
+<script src="${base}/struts/validationClient.js"></script>
<script src="${base}/dwr/interface/validator.js"></script>
<script src="${base}/dwr/engine.js"></script>
-<script src="${base}/webwork/template/xhtml/validation.js"></script>
+<script src="${base}/struts/template/xhtml/validation.js"></script>
#end
#parse("/$parameters.templateDir/simple/form.vm")
<table class="wwFormTable">
Modified: incubator/webwork2/src/java/template/archive/xhtml/submit.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/xhtml/submit.vm?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/xhtml/submit.vm (original)
+++ incubator/webwork2/src/java/template/archive/xhtml/submit.vm Sat Apr 1 09:28:24 2006
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div #if ($parameters.align) align="$!webwork.htmlEncode($parameters.align)" #end
+ <td colspan="2"><div #if ($parameters.align) align="$!struts.htmlEncode($parameters.align)" #end
>#parse("/$parameters.templateDir/simple/submit.vm")</div>#parse( "/$parameters.templateDir/xhtml/controlfooter.vm" )
Modified: incubator/webwork2/src/java/template/css_xhtml/form-validate.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/css_xhtml/form-validate.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/css_xhtml/form-validate.ftl (original)
+++ incubator/webwork2/src/java/template/css_xhtml/form-validate.ftl Sat Apr 1 09:28:24 2006
@@ -1,5 +1,5 @@
<#if parameters.validate?default(false) == true>
-<script src="${base}/webwork/css_xhtml/validation.js" type="text/javascript"></script>
+<script src="${base}/struts/css_xhtml/validation.js" type="text/javascript"></script>
<#if parameters.onsubmit?exists>
${tag.addParameter('onsubmit', "${parameters.onsubmit}; customOnsubmit(); return validateForm_${parameters.id}();")}
<#else>
Modified: incubator/webwork2/src/java/template/css_xhtml/head.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/css_xhtml/head.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/css_xhtml/head.ftl (original)
+++ incubator/webwork2/src/java/template/css_xhtml/head.ftl Sat Apr 1 09:28:24 2006
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@ww.url value='/webwork/css_xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@ww.url value='/struts/css_xhtml/styles.css' encode='false' />" type="text/css"/>
<#include "/${parameters.templateDir}/simple/head.ftl" />
Modified: incubator/webwork2/src/java/template/simple/datepicker.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/simple/datepicker.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/simple/datepicker.ftl (original)
+++ incubator/webwork2/src/java/template/simple/datepicker.ftl Sat Apr 1 09:28:24 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="/webwork/jscalendar/" encode='false'/>calendar.js"></script>
-<script type="text/javascript" src="<@ww.url value="/webwork/jscalendar/lang/" encode='false'/>calendar-${parameters.language?default("en")}.js"></script>
-<script type="text/javascript" src="<@ww.url value="/webwork/jscalendar/" encode='false'/>calendar-setup.js"></script>
+<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>
</#if>
<#include "/${parameters.templateDir}/simple/text.ftl" />
-<#if !parameters.readonly?exists><a href="#" id="${parameters.id}_button"></#if><img src="<@ww.url value="/webwork/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="<@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>
<script type="text/javascript">
Calendar.setup({
Modified: incubator/webwork2/src/java/template/simple/form-close.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/simple/form-close.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/simple/form-close.ftl (original)
+++ incubator/webwork2/src/java/template/simple/form-close.ftl Sat Apr 1 09:28:24 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='/webwork/tooltip/wz_tooltip.js' encode='false' />"></script>
+ <#lt/><script language="JavaScript" type="text/javascript" src="<@ww.url value='/struts/tooltip/wz_tooltip.js' encode='false' />"></script>
</#if><#t/>
Modified: incubator/webwork2/src/java/template/simple/head.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/simple/head.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/simple/head.ftl (original)
+++ incubator/webwork2/src/java/template/simple/head.ftl Sat Apr 1 09:28:24 2006
@@ -1,3 +1,3 @@
<#if parameters.calendarcss?exists>
-<link rel="stylesheet" href="<@ww.url value='/webwork/jscalendar/${parameters.calendarcss?html}' />" type="text/css"/>
+<link rel="stylesheet" href="<@ww.url value='/struts/jscalendar/${parameters.calendarcss?html}' />" type="text/css"/>
</#if>
Modified: incubator/webwork2/src/java/template/simple/optiontransferselect.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/simple/optiontransferselect.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/simple/optiontransferselect.ftl (original)
+++ incubator/webwork2/src/java/template/simple/optiontransferselect.ftl Sat Apr 1 09:28:24 2006
@@ -1,5 +1,5 @@
<#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
- <script language="javascript" src="<@ww.url value="/webwork/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
+ <script language="javascript" src="<@ww.url value="/struts/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table border="0">
Modified: incubator/webwork2/src/java/template/simple/richtexteditor.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/simple/richtexteditor.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/simple/richtexteditor.ftl (original)
+++ incubator/webwork2/src/java/template/simple/richtexteditor.ftl Sat Apr 1 09:28:24 2006
@@ -1,5 +1,5 @@
<#if !stack.findValue('#richtexteditor_js_included')?exists><#t/>
- <script type="text/javascript" src="<@ww.url value='/webwork/richtexteditor/fckeditor.js' encode='false' />"></script>
+ <script type="text/javascript" src="<@ww.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="/webwork/richtexteditor/" />' ;
+ oFCKeditor_${parameters.id}.BasePath = '<@ww.url value="/struts/richtexteditor/" />' ;
</#if><#t/>
<#-- height --><#t/>
<#if parameters.height?exists><#t/>
Modified: incubator/webwork2/src/java/template/simple/updownselect.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/simple/updownselect.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/simple/updownselect.ftl (original)
+++ incubator/webwork2/src/java/template/simple/updownselect.ftl Sat Apr 1 09:28:24 2006
@@ -1,5 +1,5 @@
<#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
- <script language="javascript" src="<@ww.url value="/webwork/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
+ <script language="javascript" src="<@ww.url value="/struts/optiontransferselect/optiontransferselect.js" encode='false' />"></script>
<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table>
Modified: incubator/webwork2/src/java/template/xhtml/checkbox.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/xhtml/checkbox.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/xhtml/checkbox.ftl (original)
+++ incubator/webwork2/src/java/template/xhtml/checkbox.ftl Sat Apr 1 09:28:24 2006
@@ -34,7 +34,7 @@
</#if>
:<#t/>
<#if parameters.tooltip?exists>
- <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@ww.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="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@ww.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="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@ww.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/src/java/template/xhtml/form-validate.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/xhtml/form-validate.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/xhtml/form-validate.ftl (original)
+++ incubator/webwork2/src/java/template/xhtml/form-validate.ftl Sat Apr 1 09:28:24 2006
@@ -1,5 +1,5 @@
<#if parameters.validate?default(false) == true>
- <script src="${base}/webwork/xhtml/validation.js"></script>
+ <script src="${base}/struts/xhtml/validation.js"></script>
<#if parameters.onsubmit?exists>
${tag.addParameter('onsubmit', "${parameters.onsubmit}; customOnsubmit(); return validateForm_${parameters.id}();")}
<#else>
Modified: incubator/webwork2/src/java/template/xhtml/head.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/xhtml/head.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/xhtml/head.ftl (original)
+++ incubator/webwork2/src/java/template/xhtml/head.ftl Sat Apr 1 09:28:24 2006
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@ww.url value='/webwork/xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@ww.url value='/struts/xhtml/styles.css' encode='false' />" type="text/css"/>
<#include "/${parameters.templateDir}/simple/head.ftl" />
Modified: incubator/webwork2/src/java/template/xhtml/tooltip.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/xhtml/tooltip.ftl?rev=390700&r1=390699&r2=390700&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/xhtml/tooltip.ftl (original)
+++ incubator/webwork2/src/java/template/xhtml/tooltip.ftl Sat Apr 1 09:28:24 2006
@@ -3,7 +3,7 @@
<#if parameters.tooltipIcon?exists><#t/>
src='<@ww.url value="${parameters.tooltipIcon}" />'
<#else><#t/>
- src='<@ww.url value="/webwork/tooltip/tooltip.gif" />'
+ src='<@ww.url value="/struts/tooltip/tooltip.gif" />'
</#if><#t/>
alt="${parameters.tooltip?html}"
title="${parameters.tooltip?html}"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org