removed FormButton align attribute
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a0b34806 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a0b34806 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a0b34806 Branch: refs/heads/master Commit: a0b34806b0f700a1fd240b698c4cec474711bbd0 Parents: af0f3cf Author: Aleksandr Mashchenko <[email protected]> Authored: Mon Jun 16 23:09:02 2014 +0300 Committer: Aleksandr Mashchenko <[email protected]> Committed: Mon Jun 16 23:09:02 2014 +0300 ---------------------------------------------------------------------- .../java/org/apache/struts2/components/FormButton.java | 10 ---------- .../java/org/apache/struts2/views/jsp/ui/ResetTag.java | 6 ------ .../java/org/apache/struts2/views/jsp/ui/SubmitTag.java | 6 ------ core/src/main/resources/template/css_xhtml/reset.ftl | 4 +--- core/src/main/resources/template/css_xhtml/styles.css | 1 + core/src/main/resources/template/css_xhtml/submit.ftl | 4 +--- core/src/main/resources/template/xhtml/controlheader.ftl | 3 --- core/src/main/resources/template/xhtml/reset.ftl | 6 +----- core/src/main/resources/template/xhtml/styles.css | 1 + core/src/main/resources/template/xhtml/submit.ftl | 6 +----- core/src/site/resources/tags/reset.html | 8 -------- core/src/site/resources/tags/submit.html | 8 -------- .../java/org/apache/struts2/views/jsp/ui/ResetTest.java | 5 ----- .../java/org/apache/struts2/views/jsp/ui/SubmitTest.java | 5 ----- .../resources/org/apache/struts2/views/jsp/ui/Reset-1.txt | 2 +- .../resources/org/apache/struts2/views/jsp/ui/Reset-2.txt | 2 +- .../resources/org/apache/struts2/views/jsp/ui/Reset-3.txt | 2 +- .../resources/org/apache/struts2/views/jsp/ui/Reset-4.txt | 2 +- .../resources/org/apache/struts2/views/jsp/ui/Reset-5.txt | 2 +- .../resources/org/apache/struts2/views/jsp/ui/Reset-6.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Submit-1.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Submit-2.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Submit-3.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Submit-4.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Submit-5.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Submit-6.txt | 2 +- 26 files changed, 18 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/java/org/apache/struts2/components/FormButton.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/FormButton.java b/core/src/main/java/org/apache/struts2/components/FormButton.java index 2bd66c3..ab99679 100644 --- a/core/src/main/java/org/apache/struts2/components/FormButton.java +++ b/core/src/main/java/org/apache/struts2/components/FormButton.java @@ -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") http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java index b1cc369..e266d6e 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java @@ -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; } http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java index 4cac5bf..bdb7b3b 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java @@ -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; } http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/resources/template/css_xhtml/reset.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl index 6d7734f..9c3a40a 100644 --- a/core/src/main/resources/template/css_xhtml/reset.ftl +++ b/core/src/main/resources/template/css_xhtml/reset.ftl @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/resources/template/css_xhtml/styles.css ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/css_xhtml/styles.css b/core/src/main/resources/template/css_xhtml/styles.css index 08a70f4..76babfc 100644 --- a/core/src/main/resources/template/css_xhtml/styles.css +++ b/core/src/main/resources/template/css_xhtml/styles.css @@ -37,3 +37,4 @@ .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;} http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/resources/template/css_xhtml/submit.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl index ffb4df9..1611ffb 100644 --- a/core/src/main/resources/template/css_xhtml/submit.ftl +++ b/core/src/main/resources/template/css_xhtml/submit.ftl @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/resources/template/xhtml/controlheader.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl index 4a15058..e1209cd 100644 --- a/core/src/main/resources/template/xhtml/controlheader.ftl +++ b/core/src/main/resources/template/xhtml/controlheader.ftl @@ -22,7 +22,4 @@ --> <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" /> <td -<#if parameters.align??> - align="${parameters.align?html}"<#t/> -</#if> ><#t/> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/resources/template/xhtml/reset.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/xhtml/reset.ftl b/core/src/main/resources/template/xhtml/reset.ftl index 8e6e2b5..7d6121c 100644 --- a/core/src/main/resources/template/xhtml/reset.ftl +++ b/core/src/main/resources/template/xhtml/reset.ftl @@ -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" /> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/resources/template/xhtml/styles.css ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css index 39fea48..91d5171 100644 --- a/core/src/main/resources/template/xhtml/styles.css +++ b/core/src/main/resources/template/xhtml/styles.css @@ -34,3 +34,4 @@ .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;} http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/main/resources/template/xhtml/submit.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/xhtml/submit.ftl b/core/src/main/resources/template/xhtml/submit.ftl index 7b82921..989e816 100644 --- a/core/src/main/resources/template/xhtml/submit.ftl +++ b/core/src/main/resources/template/xhtml/submit.ftl @@ -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" /> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/site/resources/tags/reset.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/reset.html b/core/src/site/resources/tags/reset.html index e7d2c5e..0019d5f 100644 --- a/core/src/site/resources/tags/reset.html +++ b/core/src/site/resources/tags/reset.html @@ -50,14 +50,6 @@ Please do not edit it directly. <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">cssClass</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/site/resources/tags/submit.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/submit.html b/core/src/site/resources/tags/submit.html index 61da097..8f8090e 100644 --- a/core/src/site/resources/tags/submit.html +++ b/core/src/site/resources/tags/submit.html @@ -50,14 +50,6 @@ Please do not edit it directly. <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">cssClass</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java index 90d5759..64a3b15 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java @@ -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(); http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java index 41f0cc5..df0f432 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java @@ -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(); http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt index c89899b..699faf7 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt index 279c143..2344fec 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt index 9497bb6..a9f63c0 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt index 3fa4c37..31707b3 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt index fbab3f6..c94fd1d 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt @@ -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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt index 39a2906..6e1526b 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt @@ -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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt index 9057dd2..ef5882c 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt index 42e7f1d..36b1554 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt index a2e9c8a..92fed2b 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt index 17b846d..c70f19f 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt index b55832d..d83c44f 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/a0b34806/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt index 59b886d..9cd5d02 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt @@ -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>
