[struts] 01/01: Merge pull request #629 from apache/WW-5255-script-link

[lu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 5a30cdbede0f68f24be6f2656d4c2e5aca6dcef8
Merge: 054f1f4cd 4a585347e
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sat Nov 5 08:28:57 2022 +0100

    Merge pull request #629 from apache/WW-5255-script-link
    
    [WW-5255] Fixes <s:script/> and <s:link/> and uses them across tags

 .../src/main/webapp/WEB-INF/decorators/main.jsp    |  19 +-
 .../struts2/interceptor/debugging/console.ftl      |   8 +-
 .../src/main/resources/template/css_xhtml/head.ftl |   2 +-
 .../main/resources/template/simple/combobox.ftl    |  14 +-
 core/src/main/resources/template/simple/debug.ftl  |  16 +-
 .../resources/template/simple/doubleselect.ftl     |   4 +-
 .../template/simple/form-close-tooltips.ftl        |  11 +-
 .../main/resources/template/simple/form-close.ftl  |   4 +-
 core/src/main/resources/template/simple/head.ftl   |   2 +-
 .../template/simple/inputtransferselect.ftl        |   2 +-
 core/src/main/resources/template/simple/link.ftl   |  47 +-
 core/src/main/resources/template/simple/nonce.ftl  |   4 +-
 .../template/simple/optiontransferselect.ftl       |   2 +-
 core/src/main/resources/template/simple/script.ftl |  33 +-
 .../resources/template/simple/updownselect.ftl     |   4 +-
 .../template/xhtml/form-close-validate.ftl         |   8 +-
 .../main/resources/template/xhtml/form-close.ftl   |   4 +-
 .../resources/template/xhtml/form-validate.ftl     |   2 +-
 core/src/main/resources/template/xhtml/head.ftl    |   2 +-
 core/src/main/resources/template/xhtml/link.ftl    |  21 -
 core/src/main/resources/template/xhtml/script.ftl  |  21 -
 .../freemarker/FreemarkerResultMockedTest.java     |   3 +-
 .../apache/struts2/views/jsp/ui/LinkTagTest.java   |   6 +-
 .../views/freemarker/callActionFreeMarker.ftl      |   4 +-
 .../views/freemarker/callActionFreeMarker2.ftl     |   4 +-
 .../struts2/views/freemarker/customTextField.ftl   |   2 -
 .../struts2/views/freemarker/dynaAttributes.ftl    |   2 -
 .../views/freemarker/incompatible-improvements.ftl |   4 +-
 .../struts2/views/freemarker/manual-list.ftl       |   2 -
 .../org/apache/struts2/views/freemarker/nested.ftl |   4 +-
 .../apache/struts2/views/freemarker/nonceTest.ftl  |   2 -
 .../apache/struts2/views/freemarker/something.ftl  |   2 -
 .../apache/struts2/views/jsp/ui/HeadTagTest-1.txt  |   4 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-1.txt  |   2 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-2.txt  |   4 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-3.txt  |   2 +-
 .../resources/config-browser/config-styles.css     | 812 ---------------------
 .../resources/config-browser/config-styles.ftl     | 710 ++++++++++++++++++
 .../main/resources/config-browser/page-header.ftl  |  10 +-
 .../resources/config-browser/showValidators.ftl    |  34 +-
 .../resources/config-browser/validatorDetails.ftl  |   8 +-
 41 files changed, 853 insertions(+), 998 deletions(-)