Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4355 Replace depreacted HTML attributes with CSS

Browse Source
This commit is contained in:
Lukasz Lenart
2015-06-26 21:53:17 +02:00
parent 46b0ef632f bcf4d80b48
commit 4672c9ebb5
55 changed files with 97 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/components/FormButton.java
-10
View File
@@ -42,7 +42,6 @@ public abstract class FormButton extends ClosingUIBean {
protected String action;
protected String method;
protected String align;
protected String type;
public FormButton(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
@@ -52,9 +51,6 @@ public abstract class FormButton extends ClosingUIBean {
//public void evaluateParams() {
public void evaluateExtraParams() {
super.evaluateExtraParams();
if (align == null) {
align = "right";
}
String submitType = BUTTONTYPE_INPUT;
if (type != null && (BUTTONTYPE_BUTTON.equalsIgnoreCase(type) || (supportsImageType() && BUTTONTYPE_IMAGE.equalsIgnoreCase(type))))
@@ -88,8 +84,6 @@ public abstract class FormButton extends ClosingUIBean {
addParameter("name", name);
}
addParameter("align", findString(align));
}
/**
@@ -158,10 +152,6 @@ public abstract class FormButton extends ClosingUIBean {
this.method = method;
}
@StrutsTagAttribute(description="HTML align attribute.")
public void setAlign(String align) {
this.align = align;
}
@StrutsTagAttribute(description="The type of submit to use. Valid values are <i>input</i>, " +
"<i>button</i> and <i>image</i>.", defaultValue="input")
core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
-6
View File
@@ -37,7 +37,6 @@ public class ResetTag extends AbstractUITag {
protected String action;
protected String method;
protected String align;
protected String type;
protected String src;
@@ -51,7 +50,6 @@ public class ResetTag extends AbstractUITag {
Reset reset = ((Reset) component);
reset.setAction(action);
reset.setMethod(method);
reset.setAlign(align);
reset.setType(type);
reset.setSrc(src);
}
@@ -64,10 +62,6 @@ public class ResetTag extends AbstractUITag {
this.method = method;
}
public void setAlign(String align) {
this.align = align;
}
public void setType(String type) {
this.type = type;
}
core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
-6
View File
@@ -38,7 +38,6 @@ public class SubmitTag extends AbstractClosingTag {
protected String action;
protected String method;
protected String align;
protected String type;
protected String src;
@@ -52,7 +51,6 @@ public class SubmitTag extends AbstractClosingTag {
Submit submit = ((Submit) component);
submit.setAction(action);
submit.setMethod(method);
submit.setAlign(align);
submit.setType(type);
submit.setSrc(src);
}
@@ -65,10 +63,6 @@ public class SubmitTag extends AbstractClosingTag {
this.method = method;
}
public void setAlign(String align) {
this.align = align;
}
public String getType() {
return type;
}
core/src/main/resources/template/css_xhtml/reset.ftl
+1 -3
View File
@@ -30,9 +30,7 @@
<#else>
<span <#rt/>
</#if>
<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
class="formButton"<#t/>
<#if parameters.id??>
id="wwctrl_${parameters.id}"<#rt/>
</#if>
core/src/main/resources/template/css_xhtml/styles.css
+8
View File
@@ -30,3 +30,11 @@
.checkboxLabel {}
.checkboxErrorLabel {color:red; }
.required {color:red;}
.tdTransferSelect {text-align:center; vertical-align:middle;}
.tdLabelTop {text-align:left; vertical-align:top;}
.tdCheckboxLabel {text-align:right; vertical-align:top;}
.tdCheckboxInput {text-align:left; vertical-align:top;}
.tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
.tdErrorMessage {text-align:center; vertical-align:top;}
.formButton {text-align:right;}
core/src/main/resources/template/css_xhtml/submit.ftl
+1 -3
View File
@@ -30,9 +30,7 @@
<#else>
<span <#rt/>
</#if>
<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
class="formButton"<#t/>
<#if parameters.id??>
id="wwctrl_${parameters.id}"<#rt/>
</#if>
core/src/main/resources/template/simple/debug.ftl
+12 -5
View File
@@ -35,6 +35,13 @@
}
-->
</script>
<style type="text/css">
<!--
table.debugTable {border-collapse:collapse; border-spacing:0; background-color:#DDDDDD;}
table.debugTable th, table.debugTable td {padding:2px;}
-->
</style>
<p />
<a href="#" onclick="toggleDebug('<#if parameters.id?if_exists != "">${parameters.id?html}<#else>debug</#if>');return false;">[Debug]</a>
@@ -43,7 +50,7 @@
<p />
<h3>Value Stack Contents</h3>
<table border="0" cellpadding="2" cellspacing="0" bgcolor="#DDDDDD">
<table class="debugTable">
<tr><th>Object</th><th>Property Name</th><th>Property Value</th></tr>
<#assign index=1>
@@ -54,8 +61,8 @@
<#assign renderRow=false>
<#list stackObject.value.keySet() as propertyName>
<#if renderRow==true></tr><tr><#else> <#assign renderRow=false> </#if>
<td bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>">${propertyName}</td>
<td bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>"><#if stackObject.value.get(propertyName)??>${stackObject.value.get(propertyName).toString()?html}<#else>null</#if></td>
<td style="background-color:<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>;">${propertyName}</td>
<td style="background-color:<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>;"><#if stackObject.value.get(propertyName)??>${stackObject.value.get(propertyName).toString()?html}<#else>null</#if></td>
</tr>
<#assign index= index + 1>
</#list>
@@ -65,14 +72,14 @@
<h3>Stack Context</h3>
<i>These items are available using the #key notation</i>
<table border="0" cellpadding="2" cellspacing="0" bgcolor="#DDDDDD">
<table class="debugTable">
<tr>
<th>Key</th><th>Value</th>
</tr>
<#assign index=1>
<#list stack.context.keySet() as contextKey>
<tr bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>">
<tr style="background-color:<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>;">
<td>${contextKey}</td>
<td><#if stack.context.get(contextKey)??>${struts.toStringSafe(stack.context.get(contextKey))?html}<#else>null</#if></td>
</tr>
core/src/main/resources/template/simple/inputtransferselect.ftl
+3 -3
View File
@@ -24,7 +24,7 @@
<script type="text/javascript" src="<@s.url value="/struts/inputtransferselect.js" encode='false' includeParams='none'/>"></script>
<#assign temporaryVariable = stack.setValue("#inputtransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table border="0">
<table>
<tr>
<td>
<#if parameters.leftTitle??><#t/>
@@ -61,7 +61,7 @@
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<#assign addLabel=(parameters.addLabel!"->")?html /><#t/>
<input type="button"
<#if parameters.buttonCssClass?has_content><#t/>
@@ -121,4 +121,4 @@
</#if>
</td>
</tr>
</table>
</table>
core/src/main/resources/template/simple/optiontransferselect.ftl
+2 -2
View File
@@ -24,7 +24,7 @@
<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/>
<table border="0">
<table>
<tr>
<td>
<#if parameters.leftTitle??><#t/>
@@ -47,7 +47,7 @@
</#if>
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<#if parameters.allowAddToLeft?default(true)><#t/>
<#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/>
<#if parameters.doubleHeaderKey??><#t/>
core/src/main/resources/template/xhtml/checkbox.ftl
+3 -3
View File
@@ -28,7 +28,7 @@
errorFor="${parameters.id}"<#rt/>
</#if>
>
<td align="left" valign="top" colspan="2"><#rt/>
<td class="tdCheckboxErrorMessage" colspan="2"><#rt/>
<span class="errorMessage">${error?html}</span><#t/>
</td><#lt/>
</tr>
@@ -72,7 +72,7 @@ ${parameters.label?html}<#t/>
<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
<#else>
<tr>
<td valign="top" align="right">
<td class="tdCheckboxLabel">
<#if labelpos?default("") == 'left'>
<#if parameters.label??> <label<#t/>
<#if parameters.id??>
@@ -107,7 +107,7 @@ ${parameters.label?html}<#t/>
</#if>
</#if>
</td>
<td valign="top" align="left">
<td class="tdCheckboxInput">
<#if labelpos?default("") != 'top'>
<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
core/src/main/resources/template/xhtml/controlfooter.ftl
+1 -1
View File
@@ -28,7 +28,7 @@ ${parameters.after?if_exists}<#t/>
<#if hasFieldErrors>
<#list fieldErrors[parameters.name] as error>
<tr errorFor="${parameters.id}">
<td align="center" valign="top" colspan="2"><#rt/>
<td class="tdErrorMessage" colspan="2"><#rt/>
<span class="errorMessage">${error?html}</span><#t/>
</td><#lt/>
</tr>
core/src/main/resources/template/xhtml/controlheader-core.ftl
+2 -2
View File
@@ -29,7 +29,7 @@
<#if hasFieldErrors>
<#list fieldErrors[parameters.name] as error>
<tr errorFor="${parameters.id}">
<td align="center" valign="top" colspan="2"><#rt/>
<td class="tdErrorMessage" colspan="2"><#rt/>
<span class="errorMessage">${error?html}</span><#t/>
</td><#lt/>
</tr>
@@ -47,7 +47,7 @@
-->
<tr>
<#if labelpos?default("") == 'top'>
<td align="left" valign="top" colspan="2"><#rt/>
<td class="tdLabelTop" colspan="2"><#rt/>
<#else>
<td class="tdLabel"><#rt/>
</#if>
core/src/main/resources/template/xhtml/controlheader.ftl
-3
View File
@@ -22,7 +22,4 @@
-->
<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
<td
<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
><#t/>
core/src/main/resources/template/xhtml/reset.ftl
+1 -5
View File
@@ -21,11 +21,7 @@
*/
-->
<tr>
<td colspan="2"><div <#rt/>
<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
><#t/>
<td colspan="2"><div class="formButton"><#t/>
<#include "/${parameters.templateDir}/simple/reset.ftl" />
</div><#t/>
<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" />
core/src/main/resources/template/xhtml/styles.css
+9 -1
View File
@@ -26,4 +26,12 @@
.checkboxLabel {}
.checkboxErrorLabel {color:red; }
.required {color:red;}
.tdLabel {text-align:right; vertical-align:top; }
.tdLabel {text-align:right; vertical-align:top; }
.tdTransferSelect {text-align:center; vertical-align:middle;}
.tdLabelTop {text-align:left; vertical-align:top;}
.tdCheckboxLabel {text-align:right; vertical-align:top;}
.tdCheckboxInput {text-align:left; vertical-align:top;}
.tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
.tdErrorMessage {text-align:center; vertical-align:top;}
.formButton {text-align:right;}
core/src/main/resources/template/xhtml/submit.ftl
+1 -5
View File
@@ -21,9 +21,5 @@
*/
-->
<tr>
<td colspan="2"><div <#rt/>
<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
><#t/>
<td colspan="2"><div class="formButton"><#t/>
<#include "/${parameters.templateDir}/simple/submit.ftl" />
core/src/main/resources/template/xhtml/validation.js
+1 -2
View File
@@ -109,8 +109,7 @@ function addErrorXHTML(e, errorText) {
var tr = document.createElement("tr");
var td = document.createElement("td");
var span = document.createElement("span");
td.align = "center";
td.valign = "top";
td.className = "tdErrorMessage";
td.colSpan = 2;
span.setAttribute("class", "errorMessage");
span.setAttribute("className", "errorMessage"); //ie hack cause ie does not support setAttribute
core/src/site/resources/tags/reset.html
-8
View File
@@ -49,14 +49,6 @@ Please do not edit it directly.
<td align="left" valign="top">String</td>
<td align="left" valign="top">Set action attribute.</td>
</tr>
<tr>
<td align="left" valign="top">align</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
<td align="left" valign="top">HTML align attribute.</td>
</tr>
<tr>
<td align="left" valign="top">class</td>
<td align="left" valign="top">false</td>
core/src/site/resources/tags/submit.html
-8
View File
@@ -49,14 +49,6 @@ Please do not edit it directly.
<td align="left" valign="top">String</td>
<td align="left" valign="top">Set action attribute.</td>
</tr>
<tr>
<td align="left" valign="top">align</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
<td align="left" valign="top">HTML align attribute.</td>
</tr>
<tr>
<td align="left" valign="top">class</td>
<td align="left" valign="top">false</td>
core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
-5
View File
@@ -57,7 +57,6 @@ public class ResetTest extends AbstractUITagTest {
ResetTag tag = new ResetTag();
tag.setPageContext(pageContext);
tag.setLabel("mylabel");
tag.setAlign("left");
tag.setName("myname");
tag.setValue("%{foo}");
@@ -91,7 +90,6 @@ public class ResetTest extends AbstractUITagTest {
tag.setPageContext(pageContext);
tag.setLabel("mylabel");
tag.setType("button");
tag.setAlign("left");
tag.setName("myname");
tag.setValue("%{foo}");
@@ -166,7 +164,6 @@ public class ResetTest extends AbstractUITagTest {
tag.setLabel("mylabel");
tag.setAction("manager");
tag.setMethod("update");
tag.setAlign("left");
tag.doStartTag();
tag.doEndTag();
@@ -186,7 +183,6 @@ public class ResetTest extends AbstractUITagTest {
tag.setLabel("mylabel");
tag.setAction("manager");
tag.setMethod(null); // no method
tag.setAlign("left");
tag.doStartTag();
tag.doEndTag();
@@ -206,7 +202,6 @@ public class ResetTest extends AbstractUITagTest {
tag.setLabel("mylabel");
tag.setAction(null); // no action
tag.setMethod("update");
tag.setAlign("left");
tag.doStartTag();
tag.doEndTag();
core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
-5
View File
@@ -78,7 +78,6 @@ public class SubmitTest extends AbstractUITagTest {
SubmitTag tag = new SubmitTag();
tag.setPageContext(pageContext);
tag.setLabel("mylabel");
tag.setAlign("left");
tag.setName("myname");
tag.setValue("%{foo}");
tag.setDisabled("true");
@@ -116,7 +115,6 @@ public class SubmitTest extends AbstractUITagTest {
tag.setPageContext(pageContext);
tag.setLabel("mylabel");
tag.setType("button");
tag.setAlign("left");
tag.setName("myname");
tag.setValue("%{foo}");
@@ -173,7 +171,6 @@ public class SubmitTest extends AbstractUITagTest {
tag.setLabel("mylabel");
tag.setAction("manager");
tag.setMethod("update");
tag.setAlign("left");
tag.doStartTag();
tag.doEndTag();
@@ -193,7 +190,6 @@ public class SubmitTest extends AbstractUITagTest {
tag.setLabel("mylabel");
tag.setAction("manager");
tag.setMethod(null); // no method
tag.setAlign("left");
tag.doStartTag();
tag.doEndTag();
@@ -213,7 +209,6 @@ public class SubmitTest extends AbstractUITagTest {
tag.setLabel("mylabel");
tag.setAction(null); // no action
tag.setMethod("update");
tag.setAlign("left");
tag.doStartTag();
tag.doEndTag();
core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
+2 -2
View File
@@ -1,7 +1,7 @@
<tr>
<td valign="top" align="right">
<td class="tdCheckboxLabel">
</td>
<td valign="top" align="left">
<td class="tdCheckboxInput">
<input type="checkbox" name="foo" value="baz" checked="checked" id="someId" title="mytitle" onfocus="test();"/>
<input type="hidden" id="__checkbox_someId" name="__checkbox_foo" value="baz"/>
<label for="someId" class="checkboxLabel">mylabel</label>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
+2 -2
View File
@@ -1,7 +1,7 @@
<tr>
<td valign="top" align="right">
<td class="tdCheckboxLabel">
</td>
<td valign="top" align="left">
<td class="tdCheckboxInput">
<input type="checkbox" name="foo" value="baz" id="foo" title="mytitle"/>
<input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
<label for="foo" class="checkboxLabel">mylabel</label>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
+4 -4
View File
@@ -1,14 +1,14 @@
<tr errorFor="foo">
<td align="left" valign="top" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
<td class="tdCheckboxErrorMessage" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
</tr>
<tr errorFor="foo">
<td align="left" valign="top" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
<td class="tdCheckboxErrorMessage" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
</tr>
<tr>
<td valign="top" align="right">
<td class="tdCheckboxLabel">
</td>
<td valign="top" align="left">
<td class="tdCheckboxInput">
<input type="checkbox" name="foo" value="baz" checked="checked" id="foo" class="myErrorClass" title="mytitle" onclick="test();" ondblclick="test();"/>
<input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
<label for="foo" class="checkboxErrorLabel">mylabel</label>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt
+4 -4
View File
@@ -1,14 +1,14 @@
<tr errorFor="foo">
<td align="left" valign="top" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
<td class="tdCheckboxErrorMessage" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
</tr>
<tr errorFor="foo">
<td align="left" valign="top" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
<td class="tdCheckboxErrorMessage" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
</tr>
<tr>
<td valign="top" align="right">
<td class="tdCheckboxLabel">
</td>
<td valign="top" align="left">
<td class="tdCheckboxInput">
<input type="checkbox" name="foo" value="baz" checked="checked" id="foo" style="color:red" title="mytitle" onclick="test();" ondblclick="test();"/>
<input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
<label for="foo" class="checkboxErrorLabel">mylabel</label>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt
+2 -2
View File
@@ -1,8 +1,8 @@
<tr>
<td valign="top" align="right">
<td class="tdCheckboxLabel">
<label for="someId" class="checkboxLabel">mylabel:</label>
</td>
<td valign="top" align="left">
<td class="tdCheckboxInput">
<input type="checkbox" name="foo" value="baz" checked="checked" id="someId" title="mytitle" onfocus="test();"/>
<input type="hidden" id="__checkbox_someId" name="__checkbox_foo" value="baz"/>
</td>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt
+2 -2
View File
@@ -1,7 +1,7 @@
<tr>
<td valign="top" align="right">
<td class="tdCheckboxLabel">
</td>
<td valign="top" align="left">
<td class="tdCheckboxInput">
<input type="checkbox" name="foo" value="baz" checked="checked" disabled="disabled" id="foo" title="mytitle" />
<input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz" disabled="disabled"/>
<label for="foo" class="checkboxLabel">mylabel</label>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
+1 -1
View File
@@ -1,7 +1,7 @@
<form id="testAction" name="testAction" action="/testAction.action" method="post">
<table class="wwFormTable">
<tr>
<td align="left" valign="top" colspan="2"><label class="label">label:</label></td>
<td class="tdLabelTop" colspan="2"><label class="label">label:</label></td>
</tr>
<tr>
<td><input type="text" name=""/></td>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt
+1 -1
View File
@@ -1,5 +1,5 @@
<tr>
<td align="left" valign="top" colspan="2"><label for="myname" class="label">mylabel:</label></td>
<td class="tdLabelTop" colspan="2"><label for="myname" class="label">mylabel:</label></td>
</tr>
<tr>
<td><label id="myname">bar</label></td>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="left"><input type="reset" name="myname" value="bar"/></div></td>
<td colspan="2"><div class="formButton"><input type="reset" name="myname" value="bar"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="right"><input type="reset" name="myname" value="Reset" title="mytitle"/></div></td>
<td colspan="2"><div class="formButton"><input type="reset" name="myname" value="Reset" title="mytitle"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="right"><button type="reset" name="myname" value="bar">bar</button></div></td>
<td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar">bar</button></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="left"><button type="reset" name="myname" value="bar">mylabel</button></div></td>
<td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar">mylabel</button></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="right"><button type="reset" name="myname" value="bar" disabled="disabled">bar</button></div></td>
<td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar" disabled="disabled">bar</button></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="right"><button type="reset" name="myname" value="bar"><img alt="mylabel" src="some.gif"/></button></div></td>
<td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar"><img alt="mylabel" src="some.gif"/></button></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="left"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
<td colspan="2"><div class="formButton"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="right"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
<td colspan="2"><div class="formButton"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="right"><button type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1">bar</button></div></td>
<td colspan="2"><div class="formButton"><button type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1">bar</button></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="left"><button type="submit" id="myname" name="myname" value="bar">mylabel</button></div></td>
<td colspan="2"><div class="formButton"><button type="submit" id="myname" name="myname" value="bar">mylabel</button></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="right"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
<td colspan="2"><div class="formButton"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div align="right"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
<td colspan="2"><div class="formButton"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt
+1 -1
View File
@@ -1,5 +1,5 @@
<tr errorFor="myId">
<td align="center" valign="top" colspan="2"><span class="errorMessage">bar error message</span></td>
<td class="tdErrorMessage" colspan="2"><span class="errorMessage">bar error message</span></td>
</tr>
<tr>
<td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt
+1 -1
View File
@@ -7,7 +7,7 @@
</td>
</tr>
<tr errorFor="myId">
<td align="center" valign="top" colspan="2">
<td class="tdErrorMessage" colspan="2">
<span class="errorMessage">barerrormessage</span>
</td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt
+1 -1
View File
@@ -1,5 +1,5 @@
<tr errorFor="myId">
<td align="center" valign="top" colspan="2">
<td class="tdErrorMessage" colspan="2">
<span class="errorMessage">barerrormessage</span>
</td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
+2 -2
View File
@@ -2,9 +2,9 @@
<tdclass="tdLabel"></td>
<td>
<script type="text/javascript" src="/struts/inputtransferselect.js"></script>
<tableborder="0">
<table>
<tr><td><input type="text" name="collection_input" id="collection_input"/></td>
<td valign="middle"align="center"><inputtype="button"value="-&gt;"onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))"/>
<td class="tdTransferSelect"><inputtype="button"value="-&gt;"onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))"/>
<br/><br/>
<input type="button"value="&lt;-"onclick="removeOptions(document.getElementById('collection'))"/>
<br/><br/>
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
+2 -2
View File
@@ -2,7 +2,7 @@
<td class="tdLabel"></td>
<td>
<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
<table border="0">
<table>
<tr>
<td>
<label for="leftTitle">Title Left</label><br/>
@@ -16,7 +16,7 @@
<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt
+2 -2
View File
@@ -2,7 +2,7 @@
<td class="tdLabel"></td>
<td>
<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
<table border="0">
<table>
<tr>
<td>
<label for="leftTitle">Title Left</label><br/>
@@ -17,7 +17,7 @@
<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
+2 -2
View File
@@ -2,7 +2,7 @@
<td class="tdLabel"></td>
<td>
<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
<table border="0">
<table>
<tr>
<td>
<label for="leftTitle">Title Left</label><br/>
@@ -16,7 +16,7 @@
<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', '');" value="v" />
<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', '');" value="^" />
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
+2 -2
View File
@@ -2,7 +2,7 @@
<td class="tdLabel"></td>
<td>
<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
<table border="0">
<table>
<tr>
<td>
<label for="leftTitle">Title Left</label><br/>
@@ -17,7 +17,7 @@
<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt
+2 -2
View File
@@ -2,7 +2,7 @@
<td class="tdLabel"></td>
<td>
<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
<table border="0">
<table>
<tr>
<td>
<label for="leftTitle">Title Left</label><br/>
@@ -16,7 +16,7 @@
<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
+2 -2
View File
@@ -2,7 +2,7 @@
<td class="tdLabel"></td>
<td>
<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
<table border="0">
<table>
<tr>
<td>
<label for="leftTitle">Title Left</label><br/>
@@ -17,7 +17,7 @@
<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
+2 -2
View File
@@ -2,7 +2,7 @@
<td class="tdLabel"></td>
<td>
<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
<table border="0">
<table>
<tr>
<td>
<label for="leftTitle">Title Left</label><br/>
@@ -17,7 +17,7 @@
<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
</td>
<td valign="middle" align="center">
<td class="tdTransferSelect">
<input type="button" class="buttonCssClass" style="buttonCssStyle"
value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');alert('Moving Left');" /><br/><br/>
<input type="button" class="buttonCssClass" style="buttonCssStyle"
core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
+1 -1
View File
@@ -1,5 +1,5 @@
<tr errorFor="myId">
<td align="center" valign="top" colspan="2"><span class="errorMessage">bar error message</span></td>
<td class="tdErrorMessage" colspan="2"><span class="errorMessage">bar error message</span></td>
</tr>
<tr>
<td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
+1 -1
View File
@@ -1,5 +1,5 @@
<tr errorFor="myId">
<td align="center" valign="top" colspan="2"><span class="errorMessage">bar error message</span></td>
<td class="tdErrorMessage" colspan="2"><span class="errorMessage">bar error message</span></td>
</tr>
<tr>
<td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
+1 -1
View File
@@ -1,5 +1,5 @@
<tr errorFor="myId">
<td align="center" valign="top" colspan="2"><span class="errorMessage">bar error message</span></td>
<td class="tdErrorMessage" colspan="2"><span class="errorMessage">bar error message</span></td>
</tr>
<tr>
<td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>