From a0614954f48a34e12e80cdfd1651ca5ec841a511 Mon Sep 17 00:00:00 2001
From: Toby Jee <tmjee@apache.org>
Date: Sat, 17 Jun 2006 00:24:41 +0000
Subject: [PATCH] WW-1304  - refactor some of the bits in ajax theme
 (submit-ajax.ftl) that uses    <td>..<td>  etc to xhtml's controlheader.ftl
 where it should really be as xhtml uses <td>...<td> to arrange its components

git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@414969 13f79535-47bb-0310-9956-ffa450edef68
---
 core/src/main/resources/template/ajax/submit-ajax.ftl    | 4 ----
 core/src/main/resources/template/xhtml/controlheader.ftl | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/resources/template/ajax/submit-ajax.ftl b/core/src/main/resources/template/ajax/submit-ajax.ftl
index f46e56654..a66bf8998 100644
--- a/core/src/main/resources/template/ajax/submit-ajax.ftl
+++ b/core/src/main/resources/template/ajax/submit-ajax.ftl
@@ -3,10 +3,6 @@
     <td colspan="2"><div <#rt/>
 -->
 <#include "/${parameters.templateDir}/${themeProperties.parent}/controlheader.ftl" />
-<#if parameters.align?exists>
-    align="${parameters.align?html}"<#t/>
-</#if>
-><#t/>
 <button type="submit" dojoType="BindButton"<#rt/>
 <#if parameters.form?exists && parameters.form.id?exists>
  formId="${parameters.form.id}"<#rt/>
diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
index d67ccbf40..acdf2d92a 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -1,2 +1,6 @@
 <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" />
-    <td>
+    <td
+<#if parameters.align?exists>
+    align="${parameters.align?html}"<#t/>
+</#if>
+><#t/>