From 1de0e779f2be090e75f613ad9c87228ac92183ab Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Fri, 30 May 2014 09:27:43 +0300 Subject: [PATCH 1/7] converted align and valign to css text-align and vertical-align --- core/src/main/resources/template/css_xhtml/reset.ftl | 2 +- core/src/main/resources/template/css_xhtml/submit.ftl | 2 +- .../resources/template/simple/inputtransferselect.ftl | 2 +- .../resources/template/simple/optiontransferselect.ftl | 2 +- core/src/main/resources/template/simple/table.ftl | 10 +++++----- core/src/main/resources/template/xhtml/checkbox.ftl | 6 +++--- .../main/resources/template/xhtml/controlfooter.ftl | 2 +- .../resources/template/xhtml/controlheader-core.ftl | 4 ++-- .../main/resources/template/xhtml/controlheader.ftl | 2 +- core/src/main/resources/template/xhtml/reset.ftl | 2 +- core/src/main/resources/template/xhtml/submit.ftl | 2 +- .../org/apache/struts2/views/jsp/ui/Checkbox-1.txt | 4 ++-- .../org/apache/struts2/views/jsp/ui/Checkbox-2.txt | 4 ++-- .../org/apache/struts2/views/jsp/ui/Checkbox-3.txt | 8 ++++---- .../org/apache/struts2/views/jsp/ui/Checkbox-33.txt | 8 ++++---- .../org/apache/struts2/views/jsp/ui/Checkbox-5.txt | 4 ++-- .../org/apache/struts2/views/jsp/ui/Checkbox-6.txt | 4 ++-- .../org/apache/struts2/views/jsp/ui/Formtag-27.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Label-3.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-1.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-2.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-3.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-4.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-5.txt | 2 +- .../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 +- .../org/apache/struts2/views/jsp/ui/Textfield-2.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Textfield-8.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Textfield-9.txt | 2 +- .../struts2/views/jsp/ui/inputtransferselect-1.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-1.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-2.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-3.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-4.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-5.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-6.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-7.txt | 2 +- .../apache/struts2/views/jsp/ui/validationstyles-1.txt | 2 +- .../apache/struts2/views/jsp/ui/validationstyles-2.txt | 2 +- .../apache/struts2/views/jsp/ui/validationstyles-3.txt | 2 +- 45 files changed, 62 insertions(+), 62 deletions(-) diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl index 6d7734f99..ab6f6efab 100644 --- a/core/src/main/resources/template/css_xhtml/reset.ftl +++ b/core/src/main/resources/template/css_xhtml/reset.ftl @@ -31,7 +31,7 @@ <#if parameters.align??> - align="${parameters.align?html}"<#t/> + style="text-align: ${parameters.align?html};"<#t/> <#if parameters.id??> id="wwctrl_${parameters.id}"<#rt/> diff --git a/core/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl index ffb4df99a..b981d669a 100644 --- a/core/src/main/resources/template/css_xhtml/submit.ftl +++ b/core/src/main/resources/template/css_xhtml/submit.ftl @@ -31,7 +31,7 @@ <#if parameters.align??> - align="${parameters.align?html}"<#t/> + style="text-align: ${parameters.align?html};"<#t/> <#if parameters.id??> id="wwctrl_${parameters.id}"<#rt/> diff --git a/core/src/main/resources/template/simple/inputtransferselect.ftl b/core/src/main/resources/template/simple/inputtransferselect.ftl index 610eeb2aa..67cc01111 100644 --- a/core/src/main/resources/template/simple/inputtransferselect.ftl +++ b/core/src/main/resources/template/simple/inputtransferselect.ftl @@ -61,7 +61,7 @@ - + <#assign addLabel=parameters.addLabel?default("->")?html /><#t/> <#t/> diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl index 62136f723..571652bfa 100644 --- a/core/src/main/resources/template/simple/optiontransferselect.ftl +++ b/core/src/main/resources/template/simple/optiontransferselect.ftl @@ -47,7 +47,7 @@ - + <#if parameters.allowAddToLeft?default(true)><#t/> <#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/> <#if parameters.doubleHeaderKey??><#t/> diff --git a/core/src/main/resources/template/simple/table.ftl b/core/src/main/resources/template/simple/table.ftl index d7efb069f..7d403cdd5 100644 --- a/core/src/main/resources/template/simple/table.ftl +++ b/core/src/main/resources/template/simple/table.ftl @@ -24,7 +24,7 @@ <#assign tableModel = webTable.model/> <#if tableModel??> -

+

diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl index 4504b3f61..e93157206 100644 --- a/core/src/main/resources/template/xhtml/checkbox.ftl +++ b/core/src/main/resources/template/xhtml/checkbox.ftl @@ -28,7 +28,7 @@ errorFor="${parameters.id}"<#rt/> > - <#lt/> @@ -72,7 +72,7 @@ ${parameters.label?html}<#t/> <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> <#else> - - - <#lt/> diff --git a/core/src/main/resources/template/xhtml/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl index 73302705f..ec6b1acc6 100644 --- a/core/src/main/resources/template/xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/xhtml/controlheader-core.ftl @@ -29,7 +29,7 @@ <#if hasFieldErrors> <#list fieldErrors[parameters.name] as error> - <#lt/> @@ -47,7 +47,7 @@ --> <#if labelpos?default("") == 'top'> - - - - - - + - + - - - + - + - - - - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt index 033de8864..0fa78fb2a 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt @@ -1,7 +1,7 @@ - -
@@ -40,16 +40,16 @@ - - +
+ <#if false> - + <#else> - <@s.param name="${webTable.sortOrderLinkName}" value="ASC"/>"> + <@s.param name="${webTable.sortOrderLinkName}" value="ASC"/>">
<#rt/> + <#rt/> ${error?html}<#t/>
+ <#if labelpos?default("") == 'left'> <#if parameters.label??> <#if parameters.id??> @@ -107,7 +107,7 @@ ${parameters.label?html}<#t/> + <#if labelpos?default("") != 'top'> <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> diff --git a/core/src/main/resources/template/xhtml/controlfooter.ftl b/core/src/main/resources/template/xhtml/controlfooter.ftl index 37da2f864..afa1612ef 100644 --- a/core/src/main/resources/template/xhtml/controlfooter.ftl +++ b/core/src/main/resources/template/xhtml/controlfooter.ftl @@ -28,7 +28,7 @@ ${parameters.after?if_exists}<#t/> <#if hasFieldErrors> <#list fieldErrors[parameters.name] as error>
<#rt/> + <#rt/> ${error?html}<#t/>
<#rt/> + <#rt/> ${error?html}<#t/>
<#rt/> + <#rt/> <#else> <#rt/> diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl index 4a150586e..a69bd39df 100644 --- a/core/src/main/resources/template/xhtml/controlheader.ftl +++ b/core/src/main/resources/template/xhtml/controlheader.ftl @@ -23,6 +23,6 @@ <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" /> - align="${parameters.align?html}"<#t/> + style="text-align: ${parameters.align?html};"<#t/> ><#t/> diff --git a/core/src/main/resources/template/xhtml/reset.ftl b/core/src/main/resources/template/xhtml/reset.ftl index 8e6e2b596..34e0718a1 100644 --- a/core/src/main/resources/template/xhtml/reset.ftl +++ b/core/src/main/resources/template/xhtml/reset.ftl @@ -23,7 +23,7 @@
<#if parameters.align??> - align="${parameters.align?html}"<#t/> + style="text-align: ${parameters.align?html};"<#t/> ><#t/> <#include "/${parameters.templateDir}/simple/reset.ftl" /> diff --git a/core/src/main/resources/template/xhtml/submit.ftl b/core/src/main/resources/template/xhtml/submit.ftl index 7b8292150..71c8153a4 100644 --- a/core/src/main/resources/template/xhtml/submit.ftl +++ b/core/src/main/resources/template/xhtml/submit.ftl @@ -23,7 +23,7 @@
<#if parameters.align??> - align="${parameters.align?html}"<#t/> + style="text-align: ${parameters.align?html};"<#t/> ><#t/> <#include "/${parameters.templateDir}/simple/submit.ftl" /> diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt index 7a8637c9f..6db63a0c0 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt @@ -1,7 +1,7 @@
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt index 73d7f5055..1a9559226 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt @@ -1,7 +1,7 @@
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt index 5ba5904db..0e863cdbe 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt @@ -1,14 +1,14 @@
Some Foo ErrorSome Foo Error
Another Foo ErrorAnother Foo Error
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt index b969e3ab0..d379d56ef 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt @@ -1,14 +1,14 @@
Some Foo ErrorSome Foo Error
Another Foo ErrorAnother Foo Error
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt index f281d2d3f..e771e455a 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt @@ -1,8 +1,8 @@
+ +
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt index fab8cf3d3..442417518 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt @@ -1,7 +1,7 @@
- + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt index b12f19af7..701c21bdb 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt @@ -1,5 +1,5 @@ - + 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 c89899be9..685b21f96 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 @@ - + 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 279c1432d..7442b01ca 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 @@ - + 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 9497bb669..b22e46b72 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 @@ - + 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 3fa4c3755..6bd92a65a 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 @@ - + 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 fbab3f685..c42638454 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 @@ - + \ No newline at end of file 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 39a290662..1a3d04b31 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 @@ - + \ No newline at end of file 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 9057dd2ea..24a98d512 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 @@ - + 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 42e7f1d98..9a72d9970 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 @@ - + 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 a2e9c8a5d..f49d3d0e6 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 @@ - + 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 17b846d38..67a127445 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 @@ - + 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 b55832d0b..a4b3ccfa9 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 @@ - + 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 59b886d6f..c80fedc4b 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 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt index ae9d79e02..99965b991 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt @@ -1,5 +1,5 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt index e95f855b1..4ec1cdd53 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt @@ -7,7 +7,7 @@ - \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt index 10cd6942b..90950fbdc 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt @@ -1,5 +1,5 @@ - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt index 9b7f26da9..f62d399ab 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt @@ -4,7 +4,7 @@ - - - - - - - - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt index b6d01a416..0fa3cc7ef 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt @@ -1,5 +1,5 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt index 5d7f8b35d..7ffa50a41 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt @@ -1,5 +1,5 @@ - + From d0a6d6e895187422547d7e4a3e16d1276ba2e948 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Tue, 3 Jun 2014 19:38:43 +0300 Subject: [PATCH 2/7] js align and valign to style --- core/src/main/resources/template/xhtml/validation.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/resources/template/xhtml/validation.js b/core/src/main/resources/template/xhtml/validation.js index e63751b44..de4b0bd5d 100644 --- a/core/src/main/resources/template/xhtml/validation.js +++ b/core/src/main/resources/template/xhtml/validation.js @@ -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.style = "text-align: center; vertical-align: top;"; td.colSpan = 2; span.setAttribute("class", "errorMessage"); span.setAttribute("className", "errorMessage"); //ie hack cause ie does not support setAttribute From 8953ae3f24849b8f2db1ac3b45e846cc5f27c7a9 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Tue, 3 Jun 2014 20:15:03 +0300 Subject: [PATCH 3/7] bgcolor, cellpadding, cellspacing converted to css style in debug.ftl --- .../main/resources/template/simple/debug.ftl | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/core/src/main/resources/template/simple/debug.ftl b/core/src/main/resources/template/simple/debug.ftl index 8b2db3d6e..17152bff7 100644 --- a/core/src/main/resources/template/simple/debug.ftl +++ b/core/src/main/resources/template/simple/debug.ftl @@ -35,6 +35,13 @@ } --> + +

${parameters.id?html}<#else>debug');return false;">[Debug] @@ -43,7 +50,7 @@

Value Stack Contents

-
bar error messagebar error message
+ barerrormessage
+ barerrormessage
+



diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt index 96e54ad2a..d220bcd24 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt @@ -16,7 +16,7 @@ 		+

+

+

+

+

+

+

- 		bar error messagebar error message
bar error messagebar error message
bar error messagebar error message
+
<#assign index=1> @@ -54,8 +61,8 @@ <#assign renderRow=false> <#list stackObject.value.keySet() as propertyName> <#if renderRow==true><#else> <#assign renderRow=false> - - + + <#assign index= index + 1> @@ -65,14 +72,14 @@

Stack Context

These items are available using the #key notation -
ObjectProperty NameProperty Value
${propertyName}<#if stackObject.value.get(propertyName)??>${stackObject.value.get(propertyName).toString()?html}<#else>null${propertyName}<#if stackObject.value.get(propertyName)??>${stackObject.value.get(propertyName).toString()?html}<#else>null
+
<#assign index=1> <#list stack.context.keySet() as contextKey> - + From af0f3cf1d1ba589ae7654ef9408d8f35c342b333 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Thu, 5 Jun 2014 09:47:07 +0300 Subject: [PATCH 4/7] replaced inline styles with classes --- core/src/main/resources/template/css_xhtml/reset.ftl | 2 +- core/src/main/resources/template/css_xhtml/styles.css | 7 +++++++ core/src/main/resources/template/css_xhtml/submit.ftl | 2 +- .../resources/template/simple/inputtransferselect.ftl | 2 +- .../resources/template/simple/optiontransferselect.ftl | 2 +- core/src/main/resources/template/simple/table.ftl | 10 +++++----- core/src/main/resources/template/xhtml/checkbox.ftl | 6 +++--- .../main/resources/template/xhtml/controlfooter.ftl | 2 +- .../resources/template/xhtml/controlheader-core.ftl | 4 ++-- .../main/resources/template/xhtml/controlheader.ftl | 2 +- core/src/main/resources/template/xhtml/reset.ftl | 2 +- core/src/main/resources/template/xhtml/styles.css | 9 ++++++++- core/src/main/resources/template/xhtml/submit.ftl | 2 +- core/src/main/resources/template/xhtml/validation.js | 2 +- .../org/apache/struts2/views/jsp/ui/Checkbox-1.txt | 4 ++-- .../org/apache/struts2/views/jsp/ui/Checkbox-2.txt | 4 ++-- .../org/apache/struts2/views/jsp/ui/Checkbox-3.txt | 8 ++++---- .../org/apache/struts2/views/jsp/ui/Checkbox-33.txt | 8 ++++---- .../org/apache/struts2/views/jsp/ui/Checkbox-5.txt | 4 ++-- .../org/apache/struts2/views/jsp/ui/Checkbox-6.txt | 4 ++-- .../org/apache/struts2/views/jsp/ui/Formtag-27.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Label-3.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-1.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-2.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-3.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-4.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-5.txt | 2 +- .../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 +- .../org/apache/struts2/views/jsp/ui/Textfield-2.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Textfield-8.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Textfield-9.txt | 2 +- .../struts2/views/jsp/ui/inputtransferselect-1.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-1.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-2.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-3.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-4.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-5.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-6.txt | 2 +- .../struts2/views/jsp/ui/optiontransferselect-7.txt | 2 +- .../apache/struts2/views/jsp/ui/validationstyles-1.txt | 2 +- .../apache/struts2/views/jsp/ui/validationstyles-2.txt | 2 +- .../apache/struts2/views/jsp/ui/validationstyles-3.txt | 2 +- 48 files changed, 78 insertions(+), 64 deletions(-) diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl index ab6f6efab..6d7734f99 100644 --- a/core/src/main/resources/template/css_xhtml/reset.ftl +++ b/core/src/main/resources/template/css_xhtml/reset.ftl @@ -31,7 +31,7 @@ <#if parameters.align??> - style="text-align: ${parameters.align?html};"<#t/> + align="${parameters.align?html}"<#t/> <#if parameters.id??> id="wwctrl_${parameters.id}"<#rt/> diff --git a/core/src/main/resources/template/css_xhtml/styles.css b/core/src/main/resources/template/css_xhtml/styles.css index d17b53cf6..08a70f403 100644 --- a/core/src/main/resources/template/css_xhtml/styles.css +++ b/core/src/main/resources/template/css_xhtml/styles.css @@ -30,3 +30,10 @@ .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;} diff --git a/core/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl index b981d669a..ffb4df99a 100644 --- a/core/src/main/resources/template/css_xhtml/submit.ftl +++ b/core/src/main/resources/template/css_xhtml/submit.ftl @@ -31,7 +31,7 @@ <#if parameters.align??> - style="text-align: ${parameters.align?html};"<#t/> + align="${parameters.align?html}"<#t/> <#if parameters.id??> id="wwctrl_${parameters.id}"<#rt/> diff --git a/core/src/main/resources/template/simple/inputtransferselect.ftl b/core/src/main/resources/template/simple/inputtransferselect.ftl index 67cc01111..20c3084ce 100644 --- a/core/src/main/resources/template/simple/inputtransferselect.ftl +++ b/core/src/main/resources/template/simple/inputtransferselect.ftl @@ -61,7 +61,7 @@ - -
KeyValue
${contextKey} <#if stack.context.get(contextKey)??>${struts.toStringSafe(stack.context.get(contextKey))?html}<#else>null
+ <#assign addLabel=parameters.addLabel?default("->")?html /><#t/> <#t/> diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl index 571652bfa..6fa85a832 100644 --- a/core/src/main/resources/template/simple/optiontransferselect.ftl +++ b/core/src/main/resources/template/simple/optiontransferselect.ftl @@ -47,7 +47,7 @@ + <#if parameters.allowAddToLeft?default(true)><#t/> <#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/> <#if parameters.doubleHeaderKey??><#t/> diff --git a/core/src/main/resources/template/simple/table.ftl b/core/src/main/resources/template/simple/table.ftl index 7d403cdd5..d7efb069f 100644 --- a/core/src/main/resources/template/simple/table.ftl +++ b/core/src/main/resources/template/simple/table.ftl @@ -24,7 +24,7 @@ <#assign tableModel = webTable.model/> <#if tableModel??> -

+

diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl index e93157206..d84506538 100644 --- a/core/src/main/resources/template/xhtml/checkbox.ftl +++ b/core/src/main/resources/template/xhtml/checkbox.ftl @@ -28,7 +28,7 @@ errorFor="${parameters.id}"<#rt/> > - <#lt/> @@ -72,7 +72,7 @@ ${parameters.label?html}<#t/> <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> <#else> - - - <#lt/> diff --git a/core/src/main/resources/template/xhtml/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl index ec6b1acc6..5835a8434 100644 --- a/core/src/main/resources/template/xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/xhtml/controlheader-core.ftl @@ -29,7 +29,7 @@ <#if hasFieldErrors> <#list fieldErrors[parameters.name] as error> - <#lt/> @@ -47,7 +47,7 @@ --> <#if labelpos?default("") == 'top'> - - - - - - + - + - - - + - + - - - - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt index 0fa78fb2a..c54c8629a 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt @@ -1,7 +1,7 @@ - -
@@ -40,16 +40,16 @@ - - +
+ <#if false> - + <#else> - <@s.param name="${webTable.sortOrderLinkName}" value="ASC"/>"> + <@s.param name="${webTable.sortOrderLinkName}" value="ASC"/>">
<#rt/> + <#rt/> ${error?html}<#t/>
+ <#if labelpos?default("") == 'left'> <#if parameters.label??> <#if parameters.id??> @@ -107,7 +107,7 @@ ${parameters.label?html}<#t/> + <#if labelpos?default("") != 'top'> <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> diff --git a/core/src/main/resources/template/xhtml/controlfooter.ftl b/core/src/main/resources/template/xhtml/controlfooter.ftl index afa1612ef..ef3f3caef 100644 --- a/core/src/main/resources/template/xhtml/controlfooter.ftl +++ b/core/src/main/resources/template/xhtml/controlfooter.ftl @@ -28,7 +28,7 @@ ${parameters.after?if_exists}<#t/> <#if hasFieldErrors> <#list fieldErrors[parameters.name] as error>
<#rt/> + <#rt/> ${error?html}<#t/>
<#rt/> + <#rt/> ${error?html}<#t/>
<#rt/> + <#rt/> <#else> <#rt/> diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl index a69bd39df..4a150586e 100644 --- a/core/src/main/resources/template/xhtml/controlheader.ftl +++ b/core/src/main/resources/template/xhtml/controlheader.ftl @@ -23,6 +23,6 @@ <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" /> - style="text-align: ${parameters.align?html};"<#t/> + align="${parameters.align?html}"<#t/> ><#t/> diff --git a/core/src/main/resources/template/xhtml/reset.ftl b/core/src/main/resources/template/xhtml/reset.ftl index 34e0718a1..8e6e2b596 100644 --- a/core/src/main/resources/template/xhtml/reset.ftl +++ b/core/src/main/resources/template/xhtml/reset.ftl @@ -23,7 +23,7 @@
<#if parameters.align??> - style="text-align: ${parameters.align?html};"<#t/> + align="${parameters.align?html}"<#t/> ><#t/> <#include "/${parameters.templateDir}/simple/reset.ftl" /> diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css index dd549049b..39fea48f3 100644 --- a/core/src/main/resources/template/xhtml/styles.css +++ b/core/src/main/resources/template/xhtml/styles.css @@ -26,4 +26,11 @@ .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;} diff --git a/core/src/main/resources/template/xhtml/submit.ftl b/core/src/main/resources/template/xhtml/submit.ftl index 71c8153a4..7b8292150 100644 --- a/core/src/main/resources/template/xhtml/submit.ftl +++ b/core/src/main/resources/template/xhtml/submit.ftl @@ -23,7 +23,7 @@
<#if parameters.align??> - style="text-align: ${parameters.align?html};"<#t/> + align="${parameters.align?html}"<#t/> ><#t/> <#include "/${parameters.templateDir}/simple/submit.ftl" /> diff --git a/core/src/main/resources/template/xhtml/validation.js b/core/src/main/resources/template/xhtml/validation.js index de4b0bd5d..feb1a9d14 100644 --- a/core/src/main/resources/template/xhtml/validation.js +++ b/core/src/main/resources/template/xhtml/validation.js @@ -109,7 +109,7 @@ function addErrorXHTML(e, errorText) { var tr = document.createElement("tr"); var td = document.createElement("td"); var span = document.createElement("span"); - td.style = "text-align: center; vertical-align: top;"; + td.className = "tdErrorMessage"; td.colSpan = 2; span.setAttribute("class", "errorMessage"); span.setAttribute("className", "errorMessage"); //ie hack cause ie does not support setAttribute diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt index 6db63a0c0..b746088d2 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt @@ -1,7 +1,7 @@
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt index 1a9559226..caf46327b 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt @@ -1,7 +1,7 @@
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt index 0e863cdbe..68b91f323 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt @@ -1,14 +1,14 @@
Some Foo ErrorSome Foo Error
Another Foo ErrorAnother Foo Error
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt index d379d56ef..ef05dc427 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt @@ -1,14 +1,14 @@
Some Foo ErrorSome Foo Error
Another Foo ErrorAnother Foo Error
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt index e771e455a..49e093cae 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt @@ -1,8 +1,8 @@
+ +
+ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt index 442417518..a9b92445c 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt @@ -1,7 +1,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt index 701c21bdb..d66737f62 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt @@ -1,5 +1,5 @@ - + 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 685b21f96..c89899be9 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 @@ - + 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 7442b01ca..279c1432d 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 @@ - + 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 b22e46b72..9497bb669 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 @@ - + 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 6bd92a65a..3fa4c3755 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 @@ - + 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 c42638454..fbab3f685 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 @@ - + \ No newline at end of file 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 1a3d04b31..39a290662 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 @@ - + \ No newline at end of file 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 24a98d512..9057dd2ea 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 @@ - + 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 9a72d9970..42e7f1d98 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 @@ - + 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 f49d3d0e6..a2e9c8a5d 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 @@ - + 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 67a127445..17b846d38 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 @@ - + 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 a4b3ccfa9..b55832d0b 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 @@ - + 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 c80fedc4b..59b886d6f 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 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt index 99965b991..fc370890b 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt @@ -1,5 +1,5 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt index 4ec1cdd53..b3e3addc9 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt @@ -7,7 +7,7 @@ - \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt index 90950fbdc..a0cb05449 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt @@ -1,5 +1,5 @@ - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt index f62d399ab..e3acfbcc6 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt @@ -4,7 +4,7 @@ - - - - - - - - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt index 0fa3cc7ef..e965d4322 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt @@ -1,5 +1,5 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt index 7ffa50a41..67d52b247 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt @@ -1,5 +1,5 @@ - + From a0b34806b0f700a1fd240b698c4cec474711bbd0 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Mon, 16 Jun 2014 23:09:02 +0300 Subject: [PATCH 5/7] removed FormButton align attribute --- .../java/org/apache/struts2/components/FormButton.java | 10 ---------- .../java/org/apache/struts2/views/jsp/ui/ResetTag.java | 6 ------ .../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 +--- .../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 -------- .../org/apache/struts2/views/jsp/ui/ResetTest.java | 5 ----- .../org/apache/struts2/views/jsp/ui/SubmitTest.java | 5 ----- .../org/apache/struts2/views/jsp/ui/Reset-1.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-2.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-3.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-4.txt | 2 +- .../org/apache/struts2/views/jsp/ui/Reset-5.txt | 2 +- .../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(-) 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 2bd66c3ed..ab99679cd 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 input, " + "button and image.", 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 index b1cc369b1..e266d6ee7 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; } 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 4cac5bf9e..bdb7b3b44 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; } diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl index 6d7734f99..9c3a40af3 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> -<#if parameters.align??> - align="${parameters.align?html}"<#t/> - + class="formButton"<#t/> <#if parameters.id??> id="wwctrl_${parameters.id}"<#rt/> diff --git a/core/src/main/resources/template/css_xhtml/styles.css b/core/src/main/resources/template/css_xhtml/styles.css index 08a70f403..76babfc70 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;} diff --git a/core/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl index ffb4df99a..1611ffb5f 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> -<#if parameters.align??> - align="${parameters.align?html}"<#t/> - + class="formButton"<#t/> <#if parameters.id??> id="wwctrl_${parameters.id}"<#rt/> diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl index 4a150586e..e1209cd31 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" /> - - - - - - - - - - diff --git a/core/src/site/resources/tags/submit.html b/core/src/site/resources/tags/submit.html index 61da0977f..8f8090ed4 100644 --- a/core/src/site/resources/tags/submit.html +++ b/core/src/site/resources/tags/submit.html @@ -49,14 +49,6 @@ Please do not edit it directly. - - - - - - - - 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 90d5759b3..64a3b1571 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(); 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 41f0cc5b0..df0f4322f 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(); 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 c89899be9..699faf701 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 @@ - + 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 279c1432d..2344fec7a 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 @@ - + 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 9497bb669..a9f63c05f 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 @@ - + 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 3fa4c3755..31707b326 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 @@ - + 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 fbab3f685..c94fd1d94 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 @@ - + \ No newline at end of file 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 39a290662..6e1526bf6 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 @@ - + \ No newline at end of file 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 9057dd2ea..ef5882ccb 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 @@ - + 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 42e7f1d98..36b1554f5 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 @@ - + 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 a2e9c8a5d..92fed2bd2 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 @@ - + 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 17b846d38..c70f19f08 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 @@ - + 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 b55832d0b..d83c44fcf 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 @@ - + 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 59b886d6f..9cd5d0246 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 @@ - + From 94f8be90a81d54ec40748d6a02e292a5d46a3293 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Mon, 16 Jun 2014 23:12:19 +0300 Subject: [PATCH 6/7] removed border from transferselects tables --- core/src/main/resources/template/simple/inputtransferselect.ftl | 2 +- .../src/main/resources/template/simple/optiontransferselect.ftl | 2 +- .../org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt | 2 +- .../org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt | 2 +- .../org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt | 2 +- .../org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt | 2 +- .../org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt | 2 +- .../org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt | 2 +- .../org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt | 2 +- .../org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/main/resources/template/simple/inputtransferselect.ftl b/core/src/main/resources/template/simple/inputtransferselect.ftl index 20c3084ce..afef1615e 100644 --- a/core/src/main/resources/template/simple/inputtransferselect.ftl +++ b/core/src/main/resources/template/simple/inputtransferselect.ftl @@ -24,7 +24,7 @@ <#assign temporaryVariable = stack.setValue("#inputtransferselect_js_included", "true") /><#t/> <#t/> -
bar error messagebar error message
+ barerrormessage
+ barerrormessage
+



diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt index d220bcd24..b28df0237 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt @@ -16,7 +16,7 @@ 		+

+

+

+

+

+

+

- 		bar error messagebar error message
bar error messagebar error message
bar error messagebar error message
- align="${parameters.align?html}"<#t/> - ><#t/> diff --git a/core/src/main/resources/template/xhtml/reset.ftl b/core/src/main/resources/template/xhtml/reset.ftl index 8e6e2b596..7d6121c38 100644 --- a/core/src/main/resources/template/xhtml/reset.ftl +++ b/core/src/main/resources/template/xhtml/reset.ftl @@ -21,11 +21,7 @@ */ -->
-<#if parameters.align??> - align="${parameters.align?html}"<#t/> - -><#t/> +
<#t/> <#include "/${parameters.templateDir}/simple/reset.ftl" />
<#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 index 39fea48f3..91d5171ee 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;} diff --git a/core/src/main/resources/template/xhtml/submit.ftl b/core/src/main/resources/template/xhtml/submit.ftl index 7b8292150..989e81656 100644 --- a/core/src/main/resources/template/xhtml/submit.ftl +++ b/core/src/main/resources/template/xhtml/submit.ftl @@ -21,9 +21,5 @@ */ -->
-<#if parameters.align??> - align="${parameters.align?html}"<#t/> - -><#t/> +
<#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 index e7d2c5e81..0019d5fd2 100644 --- a/core/src/site/resources/tags/reset.html +++ b/core/src/site/resources/tags/reset.html @@ -49,14 +49,6 @@ Please do not edit it directly.
String Set action attribute.
alignfalsefalseStringHTML align attribute.
cssClass falseString Set action attribute.
alignfalsefalseStringHTML align attribute.
cssClass false
+
<#if parameters.leftTitle??><#t/> diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl index 6fa85a832..c68595681 100644 --- a/core/src/main/resources/template/simple/optiontransferselect.ftl +++ b/core/src/main/resources/template/simple/optiontransferselect.ftl @@ -24,7 +24,7 @@ <#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/> <#t/> - +
<#if parameters.leftTitle??><#t/> diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt index e3acfbcc6..47324f347 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt @@ -2,7 +2,7 @@ - +


diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt index b28df0237..be8fd8fce 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt @@ -2,7 +2,7 @@ 		- +

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt index ce55f655c..3e3642190 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt @@ -2,7 +2,7 @@ 		- +

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt index 13be1dfa4..a7905457b 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt @@ -2,7 +2,7 @@ 		- +

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt index 3e55b069d..4454ed2f9 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt @@ -2,7 +2,7 @@ 		- +

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt index 0e9bdd91a..cbcde657c 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt @@ -2,7 +2,7 @@ 		- +

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt index 992c30bc7..68f689b7b 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt @@ -2,7 +2,7 @@ 		- +

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt index 0392c0a57..75f5aaf4c 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt @@ -2,7 +2,7 @@ 		- +
- - - - - - - - diff --git a/core/src/site/resources/tags/submit.html b/core/src/site/resources/tags/submit.html index b3139ecca..d1b7e1db8 100644 --- a/core/src/site/resources/tags/submit.html +++ b/core/src/site/resources/tags/submit.html @@ -49,14 +49,6 @@ Please do not edit it directly. - - - - - - - -

From bcf4d80b48dcb68c1c511e109cbc5214586c9e45 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Fri, 26 Jun 2015 01:02:16 +0300 Subject: [PATCH 7/7] site html-s --- core/src/site/resources/tags/reset.html | 8 -------- core/src/site/resources/tags/submit.html | 8 -------- 2 files changed, 16 deletions(-) diff --git a/core/src/site/resources/tags/reset.html b/core/src/site/resources/tags/reset.html index 42528eded..006302af3 100644 --- a/core/src/site/resources/tags/reset.html +++ b/core/src/site/resources/tags/reset.html @@ -49,14 +49,6 @@ Please do not edit it directly. 		String Set action attribute.
alignfalsefalseStringHTML align attribute.
class falseString Set action attribute.
alignfalsefalseStringHTML align attribute.
class false