You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2008/11/24 20:05:19 UTC
svn commit: r720258 [2/2] - in /struts/struts2/trunk/core/src/main/resources:
org/apache/struts2/dispatcher/ template/css_xhtml/ template/simple/
template/xhtml/
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl Mon Nov 24 11:05:16 2008
@@ -20,7 +20,7 @@
* under the License.
*/
-->
-<#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
+<#if !stack.findValue("#optiontransferselect_js_included")??><#t/>
<script type="text/javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>"></script>
<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
@@ -31,7 +31,7 @@
<tr><td>
<#if parameters.allowMoveUp?default(true)><#t/>
<#assign defMoveUpLabel="${parameters.moveUpLabel?default('^')}" /><#t/>
- <#if parameters.headerKey?exists><#t/>
+ <#if parameters.headerKey??><#t/>
<input type="button" value="${defMoveUpLabel}" onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />
<#else><#t/>
<input type="button" value="${defMoveUpLabel}" onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '');" />
@@ -39,7 +39,7 @@
</#if><#t/>
<#if parameters.allowMoveDown?default(true)><#t/>
<#assign defMoveDownLabel="${parameters.moveDownLabel?default('v')}" /><#t/>
- <#if parameters.headerKey?exists><#t/>
+ <#if parameters.headerKey??><#t/>
<input type="button" value="${defMoveDownLabel}" onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />
<#else><#t/>
<input type="button" value="${defMoveDownLabel}" onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '');" />
@@ -47,7 +47,7 @@
</#if><#t/>
<#if parameters.allowSelectAll?default(true)><#t/>
<#assign defSelectAllLabel="${parameters.selectAllLabel?default('*')}" /><#t/>
- <#if parameters.headerKey?exists><#t/>
+ <#if parameters.headerKey??><#t/>
<input type="button" value="${defSelectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />
<#else><#t/>
<input type="button" value="${defSelectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id}'), 'key', '');" />
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl Mon Nov 24 11:05:16 2008
@@ -20,11 +20,11 @@
* under the License.
*/
-->
-<#assign hasFieldErrors = fieldErrors?exists && fieldErrors[parameters.name]?exists/>
+<#assign hasFieldErrors = fieldErrors?? && fieldErrors[parameters.name]??/>
<#if hasFieldErrors>
<#list fieldErrors[parameters.name] as error>
<tr<#rt/>
-<#if parameters.id?exists>
+<#if parameters.id??>
errorFor="${parameters.id}"<#rt/>
</#if>
>
@@ -37,8 +37,8 @@
<#if parameters.labelposition?default("") == 'top'>
<tr>
<td colspan="2">
-<#if parameters.label?exists> <label<#t/>
-<#if parameters.id?exists>
+<#if parameters.label??> <label<#t/>
+<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
</#if>
<#if hasFieldErrors>
@@ -55,7 +55,7 @@
<span class="required">*</span><#t/>
</#if>
:<#t/>
-<#if parameters.tooltip?exists>
+<#if parameters.tooltip??>
<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
</#if>
</label><#t/>
@@ -69,8 +69,8 @@
<tr>
<td valign="top" align="right">
<#if parameters.labelposition?default("") == 'left'>
-<#if parameters.label?exists> <label<#t/>
-<#if parameters.id?exists>
+<#if parameters.label??> <label<#t/>
+<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
</#if>
<#if hasFieldErrors>
@@ -87,7 +87,7 @@
<span class="required">*</span><#t/>
</#if>
:<#t/>
-<#if parameters.tooltip?exists>
+<#if parameters.tooltip??>
<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
</#if>
</label><#t/>
@@ -97,7 +97,7 @@
<#if parameters.required?default(false)>
<span class="required">*</span><#t/>
</#if>
- <#if parameters.tooltip?exists>
+ <#if parameters.tooltip??>
<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
</#if>
</#if>
@@ -108,8 +108,8 @@
<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
</#if>
<#if parameters.labelposition?default("") != 'top' && parameters.labelposition?default("") != 'left'>
-<#if parameters.label?exists> <label<#t/>
-<#if parameters.id?exists>
+<#if parameters.label??> <label<#t/>
+<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
</#if>
<#if hasFieldErrors>
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/control.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/control.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/control.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/control.ftl Mon Nov 24 11:05:16 2008
@@ -21,6 +21,6 @@
*/
-->
<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
-<#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}"<#rt/>
+<#if parameters.cssStyle??> style="${parameters.cssStyle?html}"<#rt/>
</#if>
>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl Mon Nov 24 11:05:16 2008
@@ -24,7 +24,7 @@
Only show message if errors are available.
This will be done if ActionSupport is used.
-->
-<#assign hasFieldErrors = parameters.name?exists && fieldErrors?exists && fieldErrors[parameters.name]?exists/>
+<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
<#if hasFieldErrors>
<#list fieldErrors[parameters.name] as error>
<tr errorFor="${parameters.id}">
@@ -48,9 +48,9 @@
<#else>
<td class="tdLabel"><#rt/>
</#if>
-<#if parameters.label?exists>
+<#if parameters.label??>
<label <#t/>
-<#if parameters.id?exists>
+<#if parameters.id??>
for="${parameters.id?html}" <#t/>
</#if>
<#if hasFieldErrors>
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl Mon Nov 24 11:05:16 2008
@@ -22,7 +22,7 @@
-->
<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" />
<td
-<#if parameters.align?exists>
+<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
><#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl Mon Nov 24 11:05:16 2008
@@ -98,9 +98,9 @@
}
<#elseif validator.validatorType = "int">
if (continueValidation && field.value != null) {
- if (<#if validator.min?exists>parseInt(field.value) <
+ if (<#if validator.min??>parseInt(field.value) <
${validator.min?c}<#else>false</#if> ||
- <#if validator.max?exists>parseInt(field.value) >
+ <#if validator.max??>parseInt(field.value) >
${validator.max?c}<#else>false</#if>) {
addError(field, error);
errors = true;
@@ -110,10 +110,10 @@
<#elseif validator.validatorType = "double">
if (continueValidation && field.value != null) {
var value = parseFloat(field.value);
- if (<#if validator.minInclusive?exists>value < ${validator.minInclusive?c}<#else>false</#if> ||
- <#if validator.maxInclusive?exists>value > ${validator.maxInclusive?c}<#else>false</#if> ||
- <#if validator.minExclusive?exists>value <= ${validator.minExclusive?c}<#else>false</#if> ||
- <#if validator.maxExclusive?exists>value >= ${validator.maxExclusive?c}<#else>false</#if>) {
+ if (<#if validator.minInclusive??>value < ${validator.minInclusive?c}<#else>false</#if> ||
+ <#if validator.maxInclusive??>value > ${validator.maxInclusive?c}<#else>false</#if> ||
+ <#if validator.minExclusive??>value <= ${validator.minExclusive?c}<#else>false</#if> ||
+ <#if validator.maxExclusive??>value >= ${validator.maxExclusive?c}<#else>false</#if>) {
addError(field, error);
errors = true;
<#if validator.shortCircuit>continueValidation = false;</#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl Mon Nov 24 11:05:16 2008
@@ -23,7 +23,7 @@
<#if parameters.validate?default(false) == true>
<script type="text/javascript" src="${base}/struts/xhtml/validation.js"></script>
<script type="text/javascript" src="${base}/struts/utils.js"></script>
- <#if parameters.onsubmit?exists>
+ <#if parameters.onsubmit??>
${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id}();")}
<#else>
${tag.addParameter('onsubmit', "return validateForm_${parameters.id}();")}
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/form.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/form.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/form.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/form.ftl Mon Nov 24 11:05:16 2008
@@ -25,7 +25,7 @@
<#if (parameters.validate?default(false))>
onreset="${parameters.onreset?default('clearErrorMessages(this);clearErrorLabels(this);')}"
<#else>
- <#if parameters.onreset?exists>
+ <#if parameters.onreset??>
onreset="${parameters.onreset?html}"
</#if>
</#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/reset.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/reset.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/reset.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/reset.ftl Mon Nov 24 11:05:16 2008
@@ -22,7 +22,7 @@
-->
<tr>
<td colspan="2"><div <#rt/>
-<#if parameters.align?exists>
+<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
><#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/submit.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/submit.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/submit.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/submit.ftl Mon Nov 24 11:05:16 2008
@@ -22,7 +22,7 @@
-->
<tr>
<td colspan="2"><div <#rt/>
-<#if parameters.align?exists>
+<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
><#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl Mon Nov 24 11:05:16 2008
@@ -20,16 +20,16 @@
* under the License.
*/
-->
-<#if parameters.tooltip?exists><#t/>
+<#if parameters.tooltip??><#t/>
<img
- <#if parameters.tooltipIconPath?exists><#t/>
+ <#if parameters.tooltipIconPath??><#t/>
src='<@s.url value="${parameters.tooltipIconPath}" includeParams="none" encode="false" />'
<#else><#t/>
src='<@s.url value="/struts/tooltip.gif" includeParams="none" encode="false" />'
</#if><#t/>
<#if parameters.jsTooltipEnabled?default('false') == 'true'>
onmouseover="domTT_activate(this, event, 'content', '${parameters.tooltip}'<#t/>
- <#if parameters.tooltipDelay?exists><#t/>
+ <#if parameters.tooltipDelay??><#t/>
<#t/>,'delay', '${parameters.tooltipDelay}'<#t/>
</#if><#t/>
<#t/>,'styleClass', '${parameters.tooltipCssClass?default("StrutsTTClassic")}'<#t/>