Author: tmjee
Date: Fri Jun 16 17:24:41 2006
New Revision: 414969
URL: http://svn.apache.org/viewvc?rev=414969&view=rev
Log:
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
Modified:
struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl
struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl
Modified:
struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl?rev=414969&r1=414968&r2=414969&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl
(original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl
Fri Jun 16 17:24:41 2006
@@ -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/>
Modified:
struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl?rev=414969&r1=414968&r2=414969&view=diff
==============================================================================
---
struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl
(original)
+++
struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl
Fri Jun 16 17:24:41 2006
@@ -1,2 +1,6 @@
<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" />
- <td>
+ <td
+<#if parameters.align?exists>
+ align="${parameters.align?html}"<#t/>
+</#if>
+><#t/>
