removed FormButton align attribute

apache · Jun 16, 2014 · a0b3480 · a0b3480
1 parent af0f3cf
commit a0b3480
Show file tree

Hide file tree

Showing 26 changed files with 18 additions and 79 deletions.
diff --git 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 FormButton(ValueStack stack, HttpServletRequest request, HttpServletRespo
     //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 void evaluateExtraParams() {
             addParameter("name", name);
         }
 
-        addParameter("align", findString(align));
-
     }
 
     /**
@@ -158,10 +152,6 @@ public void setMethod(String method) {
         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")

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
@@ -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 @@ protected void populateParams() {
         Reset reset = ((Reset) component);
         reset.setAction(action);
         reset.setMethod(method);
-        reset.setAlign(align);
         reset.setType(type);
         reset.setSrc(src);
     }
@@ -64,10 +62,6 @@ public void setMethod(String method) {
         this.method = method;
     }
 
-    public void setAlign(String align) {
-        this.align = align;
-    }
-
     public void setType(String type) {
         this.type = type;
     }

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
@@ -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 @@ protected void populateParams() {
         Submit submit = ((Submit) component);
         submit.setAction(action);
         submit.setMethod(method);
-        submit.setAlign(align);
         submit.setType(type);
         submit.setSrc(src);
     }
@@ -65,10 +63,6 @@ public void setMethod(String method) {
         this.method = method;
     }
 
-    public void setAlign(String align) {
-        this.align = align;
-    }
-
     public String getType() {
         return type;
     }

diff --git 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>

diff --git 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;}
diff --git 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>

diff --git 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/>
diff --git 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" />
diff --git 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;}
diff --git 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" />
diff --git a/core/src/site/resources/tags/reset.html b/core/src/site/resources/tags/reset.html
@@ -49,14 +49,6 @@ <h2>Attributes</h2>
 					<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">cssClass</td>
 					<td align="left" valign="top">false</td>

diff --git a/core/src/site/resources/tags/submit.html b/core/src/site/resources/tags/submit.html
@@ -49,14 +49,6 @@ <h2>Attributes</h2>
 					<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">cssClass</td>
 					<td align="left" valign="top">false</td>

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
@@ -57,7 +57,6 @@ public void testSimple() throws Exception {
         ResetTag tag = new ResetTag();
         tag.setPageContext(pageContext);
         tag.setLabel("mylabel");
-        tag.setAlign("left");
         tag.setName("myname");
         tag.setValue("%{foo}");
 
@@ -91,7 +90,6 @@ public void testButtonWithLabel() throws Exception {
         tag.setPageContext(pageContext);
         tag.setLabel("mylabel");
         tag.setType("button");
-        tag.setAlign("left");
         tag.setName("myname");
         tag.setValue("%{foo}");
 
@@ -166,7 +164,6 @@ public void testSimpleThemeImageUsingActionAndMethod() throws Exception {
         tag.setLabel("mylabel");
         tag.setAction("manager");
         tag.setMethod("update");
-        tag.setAlign("left");
 
         tag.doStartTag();
         tag.doEndTag();
@@ -186,7 +183,6 @@ public void testSimpleThemeImageUsingActionOnly() throws Exception {
         tag.setLabel("mylabel");
         tag.setAction("manager");
         tag.setMethod(null); // no method
-        tag.setAlign("left");
 
         tag.doStartTag();
         tag.doEndTag();
@@ -206,7 +202,6 @@ public void testSimpleThemeImageUsingMethodOnly() throws Exception {
         tag.setLabel("mylabel");
         tag.setAction(null); // no action
         tag.setMethod("update");
-        tag.setAlign("left");
 
         tag.doStartTag();
         tag.doEndTag();

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
@@ -78,7 +78,6 @@ public void testSimple() throws Exception {
         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 void testButtonWithLabel() throws Exception {
         tag.setPageContext(pageContext);
         tag.setLabel("mylabel");
         tag.setType("button");
-        tag.setAlign("left");
         tag.setName("myname");
         tag.setValue("%{foo}");
 
@@ -173,7 +171,6 @@ public void testSimpleThemeImageUsingActionAndMethod() throws Exception {
         tag.setLabel("mylabel");
         tag.setAction("manager");
         tag.setMethod("update");
-        tag.setAlign("left");
 
         tag.doStartTag();
         tag.doEndTag();
@@ -193,7 +190,6 @@ public void testSimpleThemeImageUsingActionOnly() throws Exception {
         tag.setLabel("mylabel");
         tag.setAction("manager");
         tag.setMethod(null); // no method
-        tag.setAlign("left");
 
         tag.doStartTag();
         tag.doEndTag();
@@ -213,7 +209,6 @@ public void testSimpleThemeImageUsingMethodOnly() throws Exception {
         tag.setLabel("mylabel");
         tag.setAction(null); // no action
         tag.setMethod("update");
-        tag.setAlign("left");
 
         tag.doStartTag();
         tag.doEndTag();

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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>
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
@@ -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>