diff --git a/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl index 91b03390e..daa4f6e20 100644 --- a/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl +++ b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl @@ -21,9 +21,7 @@ - diff --git a/core/src/main/resources/template/css_xhtml/head.ftl b/core/src/main/resources/template/css_xhtml/head.ftl index df9916cc8..d30a25aa8 100644 --- a/core/src/main/resources/template/css_xhtml/head.ftl +++ b/core/src/main/resources/template/css_xhtml/head.ftl @@ -18,7 +18,5 @@ * under the License. */ --> - - rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css' includeParams='none' encode='false' />" type="text/css" /> + rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css' includeParams='none' encode='false' />" type="text/css" /> <#include "/${parameters.templateDir}/simple/head.ftl" /> diff --git a/core/src/main/resources/template/simple/combobox.ftl b/core/src/main/resources/template/simple/combobox.ftl index 2f6f4a9b9..390e20df2 100644 --- a/core/src/main/resources/template/simple/combobox.ftl +++ b/core/src/main/resources/template/simple/combobox.ftl @@ -18,9 +18,7 @@ * under the License. */ --> - - <#lt/>" <#rt/> - <#include "/${parameters.templateDir}/simple/nonce.ftl" /> - /> + <#lt/> + <#lt/>" <#include "/${parameters.templateDir}/simple/nonce.ftl" /> /> <#t/> \ No newline at end of file diff --git a/core/src/main/resources/template/simple/form-close.ftl b/core/src/main/resources/template/simple/form-close.ftl index 469df763a..192932929 100644 --- a/core/src/main/resources/template/simple/form-close.ftl +++ b/core/src/main/resources/template/simple/form-close.ftl @@ -21,9 +21,7 @@ <#if (parameters.customOnsubmitEnabled??)> - -<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-tooltips.ftl" /> \ No newline at end of file +<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-tooltips.ftl" /> diff --git a/core/src/main/resources/template/simple/head.ftl b/core/src/main/resources/template/simple/head.ftl index 15d12f996..30047158c 100644 --- a/core/src/main/resources/template/simple/head.ftl +++ b/core/src/main/resources/template/simple/head.ftl @@ -18,6 +18,4 @@ * under the License. */ --> - \ No newline at end of file + \ No newline at end of file diff --git a/core/src/main/resources/template/simple/inputtransferselect.ftl b/core/src/main/resources/template/simple/inputtransferselect.ftl index 4eacbbd0f..dae1a07c3 100644 --- a/core/src/main/resources/template/simple/inputtransferselect.ftl +++ b/core/src/main/resources/template/simple/inputtransferselect.ftl @@ -19,9 +19,7 @@ */ --> <#if !stack.findValue("#inputtransferselect_js_included")??><#t/> - + <#assign temporaryVariable = stack.setValue("#inputtransferselect_js_included", "true") /><#t/> <#t/> diff --git a/core/src/main/resources/template/simple/link.ftl b/core/src/main/resources/template/simple/link.ftl index 31821e0c6..b4af7f302 100644 --- a/core/src/main/resources/template/simple/link.ftl +++ b/core/src/main/resources/template/simple/link.ftl @@ -20,8 +20,7 @@ --> <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> - -<#include "/${parameters.templateDir}/simple/nonce.ftl" /> + <#if parameters.href?has_content> href="${parameters.href}"<#rt/> diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl index d0b328be1..910dc6a95 100644 --- a/core/src/main/resources/template/simple/optiontransferselect.ftl +++ b/core/src/main/resources/template/simple/optiontransferselect.ftl @@ -19,9 +19,7 @@ */ --> <#if !stack.findValue("#optiontransferselect_js_included")??><#t/> - + <#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/> <#t/>
diff --git a/core/src/main/resources/template/simple/updownselect.ftl b/core/src/main/resources/template/simple/updownselect.ftl index e8683fcce..4f57b849a 100644 --- a/core/src/main/resources/template/simple/updownselect.ftl +++ b/core/src/main/resources/template/simple/updownselect.ftl @@ -19,9 +19,7 @@ */ --> <#if !stack.findValue("#optiontransferselect_js_included")??><#t/> - + <#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/> <#t/>
diff --git a/core/src/main/resources/template/xhtml/form-close-validate.ftl b/core/src/main/resources/template/xhtml/form-close-validate.ftl index 7fc151074..0a17aac84 100644 --- a/core/src/main/resources/template/xhtml/form-close-validate.ftl +++ b/core/src/main/resources/template/xhtml/form-close-validate.ftl @@ -32,9 +32,7 @@ Only the following validators are supported: END SNIPPET: supported-validators --> <#if ((parameters.validate!false == true) && (parameters.performValidation!false == true))> - + <#if parameters.onsubmit??> ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id?replace('[^a-zA-Z0-9_]', '_', 'r')}();")} <#else> diff --git a/core/src/main/resources/template/xhtml/head.ftl b/core/src/main/resources/template/xhtml/head.ftl index 61a77831a..48678f269 100644 --- a/core/src/main/resources/template/xhtml/head.ftl +++ b/core/src/main/resources/template/xhtml/head.ftl @@ -18,7 +18,5 @@ * under the License. */ --> - -/> + /> <#include "/${parameters.templateDir}/simple/head.ftl" />