Repository: struts Updated Branches: refs/heads/develop d63deb975 -> 3ceb3b973
Uses simplest approach to inline s:hidden tag to xhtml theme Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3ceb3b97 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3ceb3b97 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3ceb3b97 Branch: refs/heads/develop Commit: 3ceb3b973ea53a5e0f8f2c3b772eb50daee6aec0 Parents: d63deb9 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Mar 13 21:49:54 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Mar 13 21:49:54 2014 +0100 ---------------------------------------------------------------------- core/src/main/resources/template/xhtml/hidden.ftl | 8 +++++--- .../resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt | 6 ++---- .../resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt | 6 ++---- 3 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/3ceb3b97/core/src/main/resources/template/xhtml/hidden.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/xhtml/hidden.ftl b/core/src/main/resources/template/xhtml/hidden.ftl index 3ff0f05..92881ab 100644 --- a/core/src/main/resources/template/xhtml/hidden.ftl +++ b/core/src/main/resources/template/xhtml/hidden.ftl @@ -20,6 +20,8 @@ * under the License. */ --> -<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" /> -<#include "/${parameters.templateDir}/simple/hidden.ftl" /> -<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /> +<tr style="display:none;"> + <td colspan="2"> + <#include "/${parameters.templateDir}/simple/hidden.ftl" /> + </td> +</tr> http://git-wip-us.apache.org/repos/asf/struts/blob/3ceb3b97/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt index fafc7ba..875ee46 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt @@ -1,7 +1,5 @@ -<tr> - <td class="tdLabel"> - </td> - <td> +<tr style="display:none;"> + <td colspan="2"> <input type="hidden" name="myname" value="bar" id="myname"/> </td> </tr> http://git-wip-us.apache.org/repos/asf/struts/blob/3ceb3b97/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt index df7e11b..a5376ff 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt @@ -1,7 +1,5 @@ -<tr> - <td class="tdLabel"> - </td> - <td> +<tr style="display:none;"> + <td colspan="2"> <input type="hidden" name="myname" value="bar" id="myname" disabled="disabled"/> </td> </tr>
