From e24d2f2d3ef1003c835d055278365462246d8bb6 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 14 Dec 2025 19:24:05 +0100 Subject: [PATCH] WW-5444 Add HTML5 theme with comprehensive unit tests (#1422) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * WW-5444 Defines new html5 theme * feat(themes): move html5 theme from showcase to core - Move 42 FreeMarker templates to core/src/main/resources/template/html5/ - Remove duplicate templates from showcase - Makes html5 theme available to all applications via struts2-core.jar - Enables unit testing in core module - Fix Html5Action import from XWork2 to Struts2 package - Add Apache license header to Html5Action Resolves WW-5444 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * docs: add implementation plan for html5 theme migration Add detailed implementation plan documenting the migration of html5 theme from showcase to core, including step-by-step instructions, verification procedures, and acceptance criteria. Related to WW-5444 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * test(html5-theme): add comprehensive unit tests and fix template variables - Add testGenericHtml5() methods to 13 UI tag test classes - Create theme.properties with parent=simple configuration - Migrate all 32 HTML5 templates from deprecated 'parameters' to 'attributes' variable - Exclude DoubleSelect and UpDownSelect (not supported in HTML5 theme) - All 26 HTML5 theme tests passing (100% success rate) Components tested: Textfield, Textarea, Password, Checkbox, CheckboxList, Radio, Select, File, Hidden, Label, ComboBox, Reset, Submit 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * docs: update CLAUDE.md and remove jakarta-migration-helper agent - Update CLAUDE.md with current project guidelines - Update test-runner agent documentation - Remove deprecated jakarta-migration-helper agent 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * Adds missing header * test(html5-theme): complete unit test coverage for remaining 5 tag classes Add HTML5 theme tests to ActionErrorTagTest, ActionMessageTagTest, FieldErrorTagTest, AnchorTest, and FormTagTest. This completes Phase 1 of the HTML5 theme testing plan. Changes: - Add 24 new HTML5 theme unit tests across 5 test classes - Create 17 expected output files for HTML5 theme validation - Test coverage: action errors, action messages, field errors, anchors, and forms - All tests verify HTML5 clean markup without table-based layouts Coverage: 18 of 18 UI tag test classes now have HTML5 tests (100%) Tests passing: 24/24 HTML5 tests successful 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * test(html5-theme): add integration tests for showcase application - Create Html5TagExampleTest with 5 comprehensive integration tests - Add fielderror tag demonstration to html5/index.jsp - Validate HTML5 theme rendering, error display, and clean markup - All tests passing (5/5) with HtmlUnit and Jetty integration Tests validate: - Page load and HTTP status (200) - Action errors, messages, and field errors display - Clean semantic markup (ul lists, no table layouts) - Anchor tag rendering - Namespace isolation under /html5 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude * feat(html5-theme): WW-5444 replace FreeMarker compress with Struts compress tag - Create CompressModel.java to enable <@s.compress> in FreeMarker templates - Register compress tag in StrutsModels.java for @s namespace access - Migrate all 29 HTML5 theme templates from <#compress> to <@s.compress> - Maintain identical compression behavior (uses same >\\s+< regex pattern) - All 153 HTML5 theme unit tests pass without modification This change leverages the new configurable Compress component (WW-5256) which provides devMode awareness and security protections while maintaining the same whitespace removal behavior as FreeMarker's built-in directive. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 * feat(html5-theme): WW-5444 simplifies tags templates and extends example --------- Co-authored-by: Claude --- CLAUDE.md | 3 +- .../struts2/showcase/action/Html5Action.java | 32 + apps/showcase/src/main/resources/struts.xml | 6 + .../main/webapp/WEB-INF/decorators/main.jsp | 69 +- .../src/main/webapp/WEB-INF/html5/index.jsp | 283 +++++++ .../src/main/webapp/WEB-INF/sitemesh3.xml | 1 + .../struts2/showcase/Html5TagExampleTest.java | 183 ++++ .../template/FreemarkerTemplateEngine.java | 1 + .../views/freemarker/tags/CompressModel.java | 39 + .../views/freemarker/tags/StrutsModels.java | 11 +- .../main/resources/template/html5/a-close.ftl | 48 ++ core/src/main/resources/template/html5/a.ftl | 20 + .../resources/template/html5/actionerror.ftl | 41 + .../template/html5/actionmessage.ftl | 41 + .../resources/template/html5/checkbox.ftl | 50 ++ .../resources/template/html5/checkboxlist.ftl | 117 +++ .../resources/template/html5/combobox.ftl | 101 +++ .../template/html5/common-attributes.ftl | 23 + .../template/html5/controlfooter.ftl | 20 + .../template/html5/controlheader.ftl | 20 + .../src/main/resources/template/html5/css.ftl | 33 + .../template/html5/datetextfield.ftl | 21 + .../main/resources/template/html5/debug.ftl | 92 +++ .../resources/template/html5/doubleselect.ftl | 21 + .../template/html5/dynamic-attributes.ftl | 43 + .../main/resources/template/html5/empty.ftl | 20 + .../resources/template/html5/fielderror.ftl | 80 ++ .../main/resources/template/html5/file.ftl | 47 ++ .../resources/template/html5/form-close.ftl | 22 + .../main/resources/template/html5/form.ftl | 68 ++ .../main/resources/template/html5/head.ftl | 21 + .../main/resources/template/html5/hidden.ftl | 41 + .../template/html5/inputtransferselect.ftl | 21 + .../main/resources/template/html5/label.ftl | 40 + .../main/resources/template/html5/link.ftl | 72 ++ .../main/resources/template/html5/nonce.ftl | 23 + .../resources/template/html5/optgroup.ftl | 69 ++ .../template/html5/optiontransferselect.ftl | 21 + .../resources/template/html5/password.ftl | 53 ++ .../html5/prefixed-dynamic-attributes.ftl | 37 + .../resources/template/html5/radiomap.ftl | 105 +++ .../main/resources/template/html5/reset.ftl | 85 ++ .../resources/template/html5/script-close.ftl | 21 + .../main/resources/template/html5/script.ftl | 52 ++ .../template/html5/scripting-events.ftl | 62 ++ .../main/resources/template/html5/select.ftl | 145 ++++ .../resources/template/html5/submit-close.ftl | 27 + .../main/resources/template/html5/submit.ftl | 92 +++ .../main/resources/template/html5/text.ftl | 54 ++ .../resources/template/html5/textarea.ftl | 63 ++ .../resources/template/html5/theme.properties | 19 + .../main/resources/template/html5/token.ftl | 22 + .../resources/template/html5/updownselect.ftl | 21 + .../views/jsp/ui/ActionErrorTagTest.java | 82 ++ .../views/jsp/ui/ActionMessageTagTest.java | 82 ++ .../struts2/views/jsp/ui/AnchorTest.java | 111 +++ .../views/jsp/ui/CheckboxListTest.java | 13 + .../struts2/views/jsp/ui/CheckboxTest.java | 11 + .../struts2/views/jsp/ui/ComboBoxTest.java | 13 + .../views/jsp/ui/FieldErrorTagTest.java | 99 +++ .../apache/struts2/views/jsp/ui/FileTest.java | 11 + .../struts2/views/jsp/ui/FormTagTest.java | 125 +++ .../struts2/views/jsp/ui/HiddenTest.java | 11 + .../struts2/views/jsp/ui/LabelTest.java | 11 + .../struts2/views/jsp/ui/PasswordTest.java | 11 + .../struts2/views/jsp/ui/RadioTest.java | 13 + .../struts2/views/jsp/ui/ResetTest.java | 11 + .../struts2/views/jsp/ui/SelectTest.java | 13 + .../struts2/views/jsp/ui/SubmitTest.java | 11 + .../struts2/views/jsp/ui/TextareaTest.java | 11 + .../struts2/views/jsp/ui/TextfieldTest.java | 11 + .../views/jsp/ui/Anchor-dynamic-html5.txt | 6 + .../struts2/views/jsp/ui/Formtag-1-html5.txt | 1 + .../views/jsp/ui/Formtag-dynamic-html5.txt | 1 + .../views/jsp/ui/Formtag-enctype-html5.txt | 1 + .../views/jsp/ui/Formtag-method-html5.txt | 1 + .../views/jsp/ui/Formtag-validate-html5.txt | 1 + .../views/jsp/ui/actionerror-1-html5.txt | 0 .../views/jsp/ui/actionerror-3-html5.txt | 1 + .../views/jsp/ui/actionmessage-1-html5.txt | 0 .../views/jsp/ui/actionmessage-3-html5.txt | 1 + .../views/jsp/ui/fielderror-2-html5.txt | 0 .../views/jsp/ui/fielderror-3-html5.txt | 1 + .../views/jsp/ui/fielderror-6-html5.txt | 1 + .../jsp/ui/fielderror-filtered-html5.txt | 1 + .../struts2/views/jsp/ui/href-1-html5.txt | 4 + .../struts2/views/jsp/ui/href-3-html5.txt | 1 + .../views/jsp/ui/href-disabled-html5.txt | 1 + ...-11-23-WW-5444-move-html5-theme-to-core.md | 398 +++++++++ .../2025-11-26-WW-5444-html5-missing-tests.md | 779 ++++++++++++++++++ .../2025-11-23-WW-5444-html5-theme-testing.md | 518 ++++++++++++ ...25-11-26-WW-5444-html5-theme-validation.md | 413 ++++++++++ 92 files changed, 5461 insertions(+), 41 deletions(-) create mode 100644 apps/showcase/src/main/java/org/apache/struts2/showcase/action/Html5Action.java create mode 100644 apps/showcase/src/main/webapp/WEB-INF/html5/index.jsp create mode 100644 apps/showcase/src/test/java/it/org/apache/struts2/showcase/Html5TagExampleTest.java create mode 100644 core/src/main/java/org/apache/struts2/views/freemarker/tags/CompressModel.java create mode 100644 core/src/main/resources/template/html5/a-close.ftl create mode 100644 core/src/main/resources/template/html5/a.ftl create mode 100644 core/src/main/resources/template/html5/actionerror.ftl create mode 100644 core/src/main/resources/template/html5/actionmessage.ftl create mode 100644 core/src/main/resources/template/html5/checkbox.ftl create mode 100644 core/src/main/resources/template/html5/checkboxlist.ftl create mode 100644 core/src/main/resources/template/html5/combobox.ftl create mode 100644 core/src/main/resources/template/html5/common-attributes.ftl create mode 100644 core/src/main/resources/template/html5/controlfooter.ftl create mode 100644 core/src/main/resources/template/html5/controlheader.ftl create mode 100644 core/src/main/resources/template/html5/css.ftl create mode 100644 core/src/main/resources/template/html5/datetextfield.ftl create mode 100644 core/src/main/resources/template/html5/debug.ftl create mode 100644 core/src/main/resources/template/html5/doubleselect.ftl create mode 100644 core/src/main/resources/template/html5/dynamic-attributes.ftl create mode 100644 core/src/main/resources/template/html5/empty.ftl create mode 100644 core/src/main/resources/template/html5/fielderror.ftl create mode 100644 core/src/main/resources/template/html5/file.ftl create mode 100644 core/src/main/resources/template/html5/form-close.ftl create mode 100644 core/src/main/resources/template/html5/form.ftl create mode 100644 core/src/main/resources/template/html5/head.ftl create mode 100644 core/src/main/resources/template/html5/hidden.ftl create mode 100644 core/src/main/resources/template/html5/inputtransferselect.ftl create mode 100644 core/src/main/resources/template/html5/label.ftl create mode 100644 core/src/main/resources/template/html5/link.ftl create mode 100644 core/src/main/resources/template/html5/nonce.ftl create mode 100644 core/src/main/resources/template/html5/optgroup.ftl create mode 100644 core/src/main/resources/template/html5/optiontransferselect.ftl create mode 100644 core/src/main/resources/template/html5/password.ftl create mode 100644 core/src/main/resources/template/html5/prefixed-dynamic-attributes.ftl create mode 100644 core/src/main/resources/template/html5/radiomap.ftl create mode 100644 core/src/main/resources/template/html5/reset.ftl create mode 100644 core/src/main/resources/template/html5/script-close.ftl create mode 100644 core/src/main/resources/template/html5/script.ftl create mode 100644 core/src/main/resources/template/html5/scripting-events.ftl create mode 100644 core/src/main/resources/template/html5/select.ftl create mode 100644 core/src/main/resources/template/html5/submit-close.ftl create mode 100644 core/src/main/resources/template/html5/submit.ftl create mode 100644 core/src/main/resources/template/html5/text.ftl create mode 100644 core/src/main/resources/template/html5/textarea.ftl create mode 100644 core/src/main/resources/template/html5/theme.properties create mode 100644 core/src/main/resources/template/html5/token.ftl create mode 100644 core/src/main/resources/template/html5/updownselect.ftl create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/Anchor-dynamic-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-dynamic-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-enctype-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-method-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-validate-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-1-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-3-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-1-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-3-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-2-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-filtered-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/href-1-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/href-3-html5.txt create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/href-disabled-html5.txt create mode 100644 thoughts/shared/plans/2025-11-23-WW-5444-move-html5-theme-to-core.md create mode 100644 thoughts/shared/plans/2025-11-26-WW-5444-html5-missing-tests.md create mode 100644 thoughts/shared/research/2025-11-23-WW-5444-html5-theme-testing.md create mode 100644 thoughts/shared/validation/2025-11-26-WW-5444-html5-theme-validation.md diff --git a/CLAUDE.md b/CLAUDE.md index 5f338f789..a536f59d0 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -165,10 +165,9 @@ When running tests, use this priority order: ### Specialized Agents - `security-analyzer` - OGNL injection scanning, CVE detection -- `test-runner` - Maven test execution and coverage analysis +- `test-runner` - Maven test execution and coverage analysis, use this agent to RUN the tests - `code-quality-checker` - JavaDoc compliance, pattern consistency - `config-validator` - struts.xml validation, interceptor analysis -- `jakarta-migration-helper` - Jakarta EE migration assistance - `codebase-analyzer` - Project structure and architecture analysis - `codebase-locator` - Code and file location assistance - `codebase-pattern-finder` - Pattern examples and usage diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/Html5Action.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/Html5Action.java new file mode 100644 index 000000000..a4e6b2d7d --- /dev/null +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/Html5Action.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.struts2.showcase.action; + +import org.apache.struts2.ActionSupport; + +public class Html5Action extends ActionSupport { + + @Override + public String execute() throws Exception { + addActionError("Action error: only html5"); + addActionMessage("Action message: only html5"); + addFieldError("testField", "Field error: only html5"); + return super.execute(); + } +} diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml index 1b57083b3..5c1cf37ff 100644 --- a/apps/showcase/src/main/resources/struts.xml +++ b/apps/showcase/src/main/resources/struts.xml @@ -160,6 +160,12 @@ + + + /WEB-INF/html5/index.jsp + + + diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index b2eeaca62..b0440732d 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -132,54 +132,49 @@
  • Non UI Tags
  • UI Tags
  • @@ -271,7 +266,7 @@
    • - Help + Help
      • Help
        • @@ -317,9 +312,7 @@
        Copyright © 2003- - - The Apache Software Foundation. - + The Apache Software Foundation.
        diff --git a/apps/showcase/src/main/webapp/WEB-INF/html5/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/html5/index.jsp new file mode 100644 index 000000000..c5ce4793f --- /dev/null +++ b/apps/showcase/src/main/webapp/WEB-INF/html5/index.jsp @@ -0,0 +1,283 @@ + +<%@ taglib prefix="s" uri="/struts-tags" %> + + + + + + + + + + Struts2 Showcase - Html5 theme + + + +
        +
        +
        +
        +

        Html 5 tags demo

        +

        All the tags on this page are from html5 theme. Back to main Showcase App page

        +
        +
        +
        + + +
        +
        +
        +

        Link Components

        +
        +
        +
        +
        +
        + 
        <s:a/>
        +
        +
        + index +
        +
        + + +
        +
        +
        +

        Error & Message Components

        +
        +
        +
        +
        +
        + 
        <s:actionerror/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:actionmessage/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:fielderror/>
        +
        +
        + +
        +
        + + +
        +
        +
        +

        Form Components

        +
        +
        +
        + +
        +
        + 
        <s:form/>
        +
        +
        +

        Form wrapper (wraps all components below)

        +
        +
        +
        +
        + 
        <s:textfield/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:password/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:textarea/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:hidden/>
        +
        +
        + +

        Hidden field with value="secret" (not visible)

        +
        +
        +
        +
        + 
        <s:checkbox/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:radio/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:select/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:checkboxlist/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:file/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:token/>
        +
        +
        + +

        CSRF token (hidden, check page source)

        +
        +
        +
        +
        + 
        <s:submit/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:reset/>
        +
        +
        + +
        +
        +         + + +
        +
        +
        +

        Advanced Selection Components

        +
        +
        +
        +
        +
        + 
        <s:combobox/>
        +
        +
        + +
        +
        + + +
        +
        +
        +

        Utility & Display Components

        +
        +
        +
        +
        +
        + 
        <s:label/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:script/>
        +
        +
        + + console.log('HTML5 theme script tag example'); + +

        Script tag (check browser console for output)

        +
        +
        +
        +
        + 
        <s:debug/>
        +
        +
        + +
        +
        +
        +
        + 
        <s:head/>
        +
        +
        +

        Already used in page <head> section (line 30)

        +
        +
        +
        +
        + 
        <s:link/>
        +
        +
        +

        Already used in page <head> section for CSS (lines 27, 29)

        +
        +
        +
        + + +         \ No newline at end of file diff --git a/apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml b/apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml index 88cd74843..2d1dffb60 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml @@ -27,4 +27,5 @@ + \ No newline at end of file diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/Html5TagExampleTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/Html5TagExampleTest.java new file mode 100644 index 000000000..10b48b5eb --- /dev/null +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/Html5TagExampleTest.java @@ -0,0 +1,183 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package it.org.apache.struts2.showcase; + +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlPage; +import org.junit.Assert; +import org.junit.Test; + +/** + * Integration tests for HTML5 theme rendering in showcase application. + *

        + * Tests validate that the HTML5 theme produces clean, semantic HTML5 markup + * without table-based layouts and properly displays action errors, action messages, + * and field errors. + */ +public class Html5TagExampleTest { + + /** + * Tests basic HTML5 theme rendering and page load. + *

        + * Verifies: + * - Page loads successfully (200 status) + * - HTML5 doctype is present + * - Page contains expected content + */ + @Test + public void testHtml5PageLoad() throws Exception { + try (final WebClient webClient = new WebClient()) { + webClient.getOptions().setThrowExceptionOnFailingStatusCode(false); + webClient.getOptions().setJavaScriptEnabled(false); + + final HtmlPage page = webClient.getPage( + ParameterUtils.getBaseUrl() + "/html5/index.action" + ); + + Assert.assertEquals(200, page.getWebResponse().getStatusCode()); + + String pageContent = page.asNormalizedText(); + Assert.assertTrue("Page should contain HTML5 demo title", + pageContent.contains("Html 5 tags demo")); + } + } + + /** + * Tests HTML5 theme error and message display. + *

        + * Verifies: + * - Action errors are displayed + * - Action messages are displayed + * - Field errors are displayed + * - Errors use clean HTML5 markup + */ + @Test + public void testHtml5ErrorDisplay() throws Exception { + try (final WebClient webClient = new WebClient()) { + webClient.getOptions().setThrowExceptionOnFailingStatusCode(false); + webClient.getOptions().setJavaScriptEnabled(false); + + final HtmlPage page = webClient.getPage( + ParameterUtils.getBaseUrl() + "/html5/index.action" + ); + + String pageContent = page.asNormalizedText(); + + // Verify action error is displayed + Assert.assertTrue("Page should display action error", + pageContent.contains("Action error: only html5")); + + // Verify action message is displayed + Assert.assertTrue("Page should display action message", + pageContent.contains("Action message: only html5")); + + // Verify field error is displayed + Assert.assertTrue("Page should display field error", + pageContent.contains("Field error: only html5")); + } + } + + /** + * Tests that HTML5 theme uses clean, semantic markup without tables. + *

        + * Verifies: + * - No table-based layout for error messages + * - Uses semantic HTML5 elements + * - Error lists use <ul> elements + */ + @Test + public void testHtml5CleanMarkup() throws Exception { + try (final WebClient webClient = new WebClient()) { + webClient.getOptions().setThrowExceptionOnFailingStatusCode(false); + webClient.getOptions().setJavaScriptEnabled(false); + + final HtmlPage page = webClient.getPage( + ParameterUtils.getBaseUrl() + "/html5/index.action" + ); + + String pageAsXml = page.asXml(); + + // HTML5 theme should use

          for error lists + Assert.assertTrue("Errors should be displayed in
            lists", + pageAsXml.contains("]*>.*errorMessage.*.*")); + } + } + + /** + * Tests HTML5 theme anchor tag rendering. + *

            + * Verifies: + * - Anchor tags are rendered correctly + * - Links have proper href attributes + * - HTML5 theme attributes are applied + */ + @Test + public void testHtml5AnchorTag() throws Exception { + try (final WebClient webClient = new WebClient()) { + webClient.getOptions().setJavaScriptEnabled(false); + + final HtmlPage page = webClient.getPage( + ParameterUtils.getBaseUrl() + "/html5/index.action" + ); + + String pageContent = page.asNormalizedText(); + + // Verify anchor tag content is present + Assert.assertTrue("Page should contain 'index' link", + pageContent.contains("index")); + + // Verify back link to showcase + Assert.assertTrue("Page should contain 'Back' link", + pageContent.contains("Back")); + } + } + + /** + * Tests that HTML5 theme components are properly namespaced. + *

            + * Verifies: + * - HTML5 action is accessible under /html5 namespace + * - Theme-specific rendering is applied + * - No conflicts with other themes + */ + @Test + public void testHtml5Namespace() throws Exception { + try (final WebClient webClient = new WebClient()) { + webClient.getOptions().setThrowExceptionOnFailingStatusCode(false); + + final HtmlPage page = webClient.getPage( + ParameterUtils.getBaseUrl() + "/html5/index.action" + ); + + Assert.assertEquals("HTML5 action should return 200 status", + 200, page.getWebResponse().getStatusCode()); + + String pageAsXml = page.asXml(); + + // Verify the page uses HTML5 theme by checking for theme-specific patterns + // HTML5 theme should not use table-based layouts + Assert.assertFalse("HTML5 theme should not use table layout for errors", + pageAsXml.matches("(?s).*]*>.*errorMessage.*.*")); + } + } +} diff --git a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java index 99c1d4797..faca26e7b 100644 --- a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java @@ -127,6 +127,7 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine { model.put("tag", templateContext.getTag()); model.put("themeProperties", getThemeProps(templateContext.getTemplate())); + // the BodyContent JSP writer doesn't like it when FM flushes automatically -- // so let's just not do it (it will be flushed eventually anyway) diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CompressModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CompressModel.java new file mode 100644 index 000000000..770930656 --- /dev/null +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CompressModel.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.struts2.views.freemarker.tags; + +import org.apache.struts2.util.ValueStack; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Compress; + +/** + * @see Compress + */ +public class CompressModel extends TagModel { + public CompressModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + super(stack, req, res); + } + + @Override + protected Component getBean() { + return new Compress(stack); + } +} diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java index 28c6e3926..dea1ac8ee 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java @@ -74,6 +74,7 @@ public class StrutsModels { protected InputTransferSelectModel inputtransferselect; protected ScriptModel script; protected LinkModel link; + protected CompressModel compress; public StrutsModels(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { @@ -153,6 +154,7 @@ public class StrutsModels { return hidden; } + public LabelModel getLabel() { if (label == null) { label = new LabelModel(stack, req, res); @@ -385,7 +387,7 @@ public class StrutsModels { } public UpDownSelectModel getUpdownselect() { - if (updownselect == null) { + if (updownselect == null) { updownselect = new UpDownSelectModel(stack, req, res); } return updownselect; @@ -427,4 +429,11 @@ public class StrutsModels { return inputtransferselect; } + public CompressModel getCompress() { + if (compress == null) { + compress = new CompressModel(stack, req, res); + } + return compress; + } + } diff --git a/core/src/main/resources/template/html5/a-close.ftl b/core/src/main/resources/template/html5/a-close.ftl new file mode 100644 index 000000000..a79301f8b --- /dev/null +++ b/core/src/main/resources/template/html5/a-close.ftl @@ -0,0 +1,48 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> + +<#if attributes.id??> + id="${attributes.id}"<#rt/> + +<#if attributes.href??> + href="${attributes.href?no_esc}"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#if attributes.tabindex??> + tabindex="${attributes.tabindex}"<#rt/> + +<#if attributes.cssClass??> + class="${attributes.cssClass}"<#rt/> + +<#if attributes.cssStyle??> + style="${attributes.cssStyle}"<#rt/> + +<#if attributes.title??> + title="${attributes.title}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +>${tag.escapeHtmlBody()?then(attributes.body, attributes.body?no_esc)}<#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/a.ftl b/core/src/main/resources/template/html5/a.ftl new file mode 100644 index 000000000..2ffa2ec5d --- /dev/null +++ b/core/src/main/resources/template/html5/a.ftl @@ -0,0 +1,20 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> \ No newline at end of file diff --git a/core/src/main/resources/template/html5/actionerror.ftl b/core/src/main/resources/template/html5/actionerror.ftl new file mode 100644 index 000000000..49b411c64 --- /dev/null +++ b/core/src/main/resources/template/html5/actionerror.ftl @@ -0,0 +1,41 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if (actionErrors?? && actionErrors?size > 0)> + +<#if attributes.id??> + id="${attributes.id}"<#rt/> + +<#if attributes.cssClass??> + class="${attributes.cssClass}"<#rt/> +<#else> + class="errorMessage"<#rt/> + +<#if attributes.cssStyle??> + style="${attributes.cssStyle}"<#rt/> + +><#rt/> +<#list actionErrors as error> +<#if error??> +

          • <#if attributes.escape>${error!}<#else>${error!?no_esc}
            • <#rt/> + + +
          <#rt/> + diff --git a/core/src/main/resources/template/html5/actionmessage.ftl b/core/src/main/resources/template/html5/actionmessage.ftl new file mode 100644 index 000000000..86b4c9be5 --- /dev/null +++ b/core/src/main/resources/template/html5/actionmessage.ftl @@ -0,0 +1,41 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if (actionMessages?? && actionMessages?size > 0 && !attributes.isEmptyList)> + +<#if attributes.id??> + id="${attributes.id}"<#rt/> + +<#if attributes.cssClass??> + class="${attributes.cssClass}"<#rt/> +<#else> + class="actionMessage"<#rt/> + +<#if attributes.cssStyle??> + style="${attributes.cssStyle}"<#rt/> + +><#rt/> +<#list actionMessages as message> +<#if message??><#t/> +
        • <#if attributes.escape>${message!}<#else>${message!?no_esc}
          • <#rt/> + + +
        <#rt/> + diff --git a/core/src/main/resources/template/html5/checkbox.ftl b/core/src/main/resources/template/html5/checkbox.ftl new file mode 100644 index 000000000..b042e457b --- /dev/null +++ b/core/src/main/resources/template/html5/checkbox.ftl @@ -0,0 +1,50 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> + +<#if attributes.nameValue?? && attributes.nameValue> + checked="checked"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}"<#rt/> + +<#if attributes.id?has_content> + id="${attributes.id}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /><#rt/> +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +/><#rt/> +<#if attributes.submitUnchecked!false> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +/><#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/checkboxlist.ftl b/core/src/main/resources/template/html5/checkboxlist.ftl new file mode 100644 index 000000000..7a1d81f0d --- /dev/null +++ b/core/src/main/resources/template/html5/checkboxlist.ftl @@ -0,0 +1,117 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> +<#assign itemCount = 0/><#t/> +<#if attributes.list??> +<@s.iterator value="attributes.list"><#rt/> +<#assign itemCount = itemCount + 1/><#rt/> +<#if attributes.listKey??> + <#assign itemKey = stack.findValue(attributes.listKey)/><#rt/> + <#assign itemKeyStr = stack.findString(attributes.listKey)/><#rt/> +<#else> + <#assign itemKey = stack.findValue('top')/><#rt/> + <#assign itemKeyStr = stack.findString('top')><#rt/> + +<#if attributes.listLabelKey??> +<#-- checks the valueStack for the 'valueKey.' The valueKey is then looked-up in the locale + file for it's localized value. This is then used as a label --> + <#assign itemValue = struts.getText(stack.findString(attributes.listLabelKey))/><#rt/> +<#elseif attributes.listValue??> + <#assign itemValue = stack.findString(attributes.listValue)!""/><#rt/> +<#else> + <#assign itemValue = stack.findString('top')/><#rt/> + +<#if attributes.listCssClass??> +<#if stack.findString(attributes.listCssClass)??> + <#assign itemCssClass= stack.findString(attributes.listCssClass)/><#rt/> +<#else> + <#assign itemCssClass = ''/><#rt/> + + +<#if attributes.listCssStyle??> +<#if stack.findString(attributes.listCssStyle)??> + <#assign itemCssStyle= stack.findString(attributes.listCssStyle)/><#rt/> +<#else> + <#assign itemCssStyle = ''/><#rt/> + + +<#if attributes.listTitle??> +<#if stack.findString(attributes.listTitle)??> + <#assign itemTitle= stack.findString(attributes.listTitle)/><#rt/> +<#else> + <#assign itemTitle = ''/><#rt/> + + + +<#if attributes.id?has_content> + id="${attributes.id}-${itemCount}"<#rt/> +<#else> + id="${attributes.name}-${itemCount}"<#rt/> + +<#if tag.contains(attributes.nameValue, itemKey)> + checked="checked"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#if itemCssClass??> + class="${itemCssClass}"<#rt/> +<#else> +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}"<#rt/> + + +<#if itemCssStyle??> + style="${itemCssStyle}"<#rt/> +<#else> +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}"<#rt/> + + +<#if itemTitle??> + title="${itemTitle}"<#rt/> +<#else> +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#global evaluate_dynamic_attributes = true/><#t/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> + +<#if attributes.id?has_content> + for="${attributes.id}-${itemCount}"<#rt/> +<#else> + for="${attributes.name}-${itemCount}"<#rt/> + + class="checkboxLabel">${itemValue}<#rt/> + +<#else> + + + value=""<#rt/> +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + + /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/combobox.ftl b/core/src/main/resources/template/html5/combobox.ftl new file mode 100644 index 000000000..2ef917f78 --- /dev/null +++ b/core/src/main/resources/template/html5/combobox.ftl @@ -0,0 +1,101 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<@s.script> +function autoPopulate_${attributes.escapedId}(targetElement) { +<#if attributes.headerKey?? && attributes.headerValue??> + if (targetElement.options[targetElement.selectedIndex].value == '${attributes.headerKey?js_string}') { + return; + } + +<#if attributes.emptyOption!false> + if (targetElement.options[targetElement.selectedIndex].value == '') { + return; + } + + targetElement.form.elements['${attributes.name?js_string}'].value=targetElement.options[targetElement.selectedIndex].value; +} + +<#include "/${attributes.templateDir}/html5/text.ftl" /><#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /> +<#if attributes.list??> +<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/common-attributes.ftl b/core/src/main/resources/template/html5/common-attributes.ftl new file mode 100644 index 000000000..424316dad --- /dev/null +++ b/core/src/main/resources/template/html5/common-attributes.ftl @@ -0,0 +1,23 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if attributes.accesskey?has_content> + accesskey="${attributes.accesskey}"<#rt/> + diff --git a/core/src/main/resources/template/html5/controlfooter.ftl b/core/src/main/resources/template/html5/controlfooter.ftl new file mode 100644 index 000000000..1626c3cd9 --- /dev/null +++ b/core/src/main/resources/template/html5/controlfooter.ftl @@ -0,0 +1,20 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> diff --git a/core/src/main/resources/template/html5/controlheader.ftl b/core/src/main/resources/template/html5/controlheader.ftl new file mode 100644 index 000000000..1626c3cd9 --- /dev/null +++ b/core/src/main/resources/template/html5/controlheader.ftl @@ -0,0 +1,20 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> diff --git a/core/src/main/resources/template/html5/css.ftl b/core/src/main/resources/template/html5/css.ftl new file mode 100644 index 000000000..9a3ea6c39 --- /dev/null +++ b/core/src/main/resources/template/html5/css.ftl @@ -0,0 +1,33 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#assign hasFieldErrors = attributes.name?? && fieldErrors?? && fieldErrors.get(attributes.name)??/><#t/> +<#if attributes.cssClass?has_content && !(hasFieldErrors && attributes.cssErrorClass??)> + class="${attributes.cssClass}"<#rt/> +<#elseif attributes.cssClass?has_content && (hasFieldErrors && attributes.cssErrorClass??)> + class="${attributes.cssClass} ${attributes.cssErrorClass}"<#rt/> +<#elseif !(attributes.cssClass?has_content) && (hasFieldErrors && attributes.cssErrorClass??)> + class="${attributes.cssErrorClass}"<#rt/> + +<#if attributes.cssStyle?has_content && !(hasFieldErrors && (attributes.cssErrorStyle?? || attributes.cssErrorClass??))> + style="${attributes.cssStyle}"<#rt/> +<#elseif hasFieldErrors && attributes.cssErrorStyle??> + style="${attributes.cssErrorStyle}"<#rt/> + diff --git a/core/src/main/resources/template/html5/datetextfield.ftl b/core/src/main/resources/template/html5/datetextfield.ftl new file mode 100644 index 000000000..25f198f44 --- /dev/null +++ b/core/src/main/resources/template/html5/datetextfield.ftl @@ -0,0 +1,21 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +
        Tag 
        <s:datetextfield/>
        works only with the JavaTemplates Plugin!
        diff --git a/core/src/main/resources/template/html5/debug.ftl b/core/src/main/resources/template/html5/debug.ftl new file mode 100644 index 000000000..fef4f6fa5 --- /dev/null +++ b/core/src/main/resources/template/html5/debug.ftl @@ -0,0 +1,92 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<@s.script> + function toggleDebug(debugId) { + var debugDiv = document.getElementById(debugId); + if (debugDiv) { + var display = debugDiv.style.display; + if (display == 'none') { + debugDiv.style.display = 'block'; + } else if (display == 'block') { + debugDiv.style.display = 'none'; + } + } + } + + + +
        + +[Debug] + +<@s.script> + document.getElementById('toggle-button').onclick = function() { + toggleDebug('<#if attributes.id??>${attributes.id}<#else>debug'); + return false; + } + diff --git a/core/src/main/resources/template/html5/doubleselect.ftl b/core/src/main/resources/template/html5/doubleselect.ftl new file mode 100644 index 000000000..14ff8668c --- /dev/null +++ b/core/src/main/resources/template/html5/doubleselect.ftl @@ -0,0 +1,21 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +
        Tag 
        <s:doubleselect/>
        is not supported in this theme!
        diff --git a/core/src/main/resources/template/html5/dynamic-attributes.ftl b/core/src/main/resources/template/html5/dynamic-attributes.ftl new file mode 100644 index 000000000..0ed526ec6 --- /dev/null +++ b/core/src/main/resources/template/html5/dynamic-attributes.ftl @@ -0,0 +1,43 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#function acceptKey(key)> + <#if dynamic_attributes_ignore??> + <#return !key?starts_with(dynamic_attributes_ignore) > + <#else> + <#return true> + + +<#if (attributes.dynamicAttributes?? && attributes.dynamicAttributes?size > 0)> +<#assign aKeys = attributes.dynamicAttributes.keySet()> +<#list aKeys?filter(acceptKey) as aKey> +<#assign keyValue = attributes.dynamicAttributes.get(aKey)/> +<#if keyValue?is_string> + <#if evaluate_dynamic_attributes!false == true> + <#assign value = struts.translateVariables(keyValue)!keyValue/> + <#else> + <#assign value = keyValue/> + +<#else> + <#assign value = keyValue?string/> + + ${aKey}="${value}"<#rt/> + + diff --git a/core/src/main/resources/template/html5/empty.ftl b/core/src/main/resources/template/html5/empty.ftl new file mode 100644 index 000000000..1626c3cd9 --- /dev/null +++ b/core/src/main/resources/template/html5/empty.ftl @@ -0,0 +1,20 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> diff --git a/core/src/main/resources/template/html5/fielderror.ftl b/core/src/main/resources/template/html5/fielderror.ftl new file mode 100644 index 000000000..4b43045aa --- /dev/null +++ b/core/src/main/resources/template/html5/fielderror.ftl @@ -0,0 +1,80 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if fieldErrors??> +<#assign eKeys = fieldErrors.keySet()><#t/> +<#assign eKeysSize = eKeys.size()><#t/> +<#assign doneStartUlTag=false><#t/> +<#assign doneEndUlTag=false><#t/> +<#assign haveMatchedErrorField=false> +<#if (fieldErrorFieldNames?size > 0) > +<#list fieldErrorFieldNames as fieldErrorFieldName> +<#list eKeys as eKey> +<#if (eKey = fieldErrorFieldName)> +<#assign haveMatchedErrorField=true> +<#assign eValue = fieldErrors.get(fieldErrorFieldName)> +<#if (haveMatchedErrorField && (!doneStartUlTag))> + +<#if attributes.id?has_content> + id="${attributes.id}"<#rt/> + +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}"<#rt/> +<#else> + class="errorMessage"<#rt/> + +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}"<#rt/> + +><#rt/> +<#assign doneStartUlTag=true><#t/> + +<#list eValue as eEachValue> +
      • <#if attributes.escape>${eEachValue!}<#else>${eEachValue!?no_esc}
        • <#rt/> + + + + +<#if (haveMatchedErrorField && (!doneEndUlTag))> +
      <#rt/> +<#assign doneEndUlTag=true> + +<#else> +<#if (eKeysSize > 0)> + +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}"<#rt/> +<#else> + class="errorMessage"<#rt/> + +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}"<#rt/> + +><#rt/> +<#list eKeys as eKey> +<#assign eValue = fieldErrors.get(eKey)><#t/> +<#list eValue as eEachValue> +
    • <#if attributes.escape>${eEachValue!}<#else>${eEachValue!?no_esc}
      • <#rt/> + + +
    <#rt/> + + + \ No newline at end of file diff --git a/core/src/main/resources/template/html5/file.ftl b/core/src/main/resources/template/html5/file.ftl new file mode 100644 index 000000000..c204b9171 --- /dev/null +++ b/core/src/main/resources/template/html5/file.ftl @@ -0,0 +1,47 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> + + name="${(attributes.name!"")}"<#rt/> +<#if attributes.get("size")?has_content> + size="${attributes.get("size")}"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#if attributes.accept?has_content> + accept="${attributes.accept}"<#rt/> + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}"<#rt/> + +<#if attributes.id?has_content> + id="${attributes.id}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /><#rt/> +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +/><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/form-close.ftl b/core/src/main/resources/template/html5/form-close.ftl new file mode 100644 index 000000000..f9efdacb0 --- /dev/null +++ b/core/src/main/resources/template/html5/form-close.ftl @@ -0,0 +1,22 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/form.ftl b/core/src/main/resources/template/html5/form.ftl new file mode 100644 index 000000000..127759c48 --- /dev/null +++ b/core/src/main/resources/template/html5/form.ftl @@ -0,0 +1,68 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> +<#if (attributes.validate!false == false) && (attributes.onsubmit?has_content)> + ${tag.addParameter('onsubmit', "${attributes.onsubmit}") }<#rt/> + + +<#if attributes.id?has_content> + id="${attributes.id}"<#rt/> + +<#if attributes.name?has_content> + name="${attributes.name}"<#rt/> + +<#if attributes.onsubmit?has_content> + onsubmit="<#outputformat 'JavaScript'>${attributes.onsubmit}"<#rt/> + +<#if attributes.onreset?has_content> + onreset="<#outputformat 'JavaScript'>${attributes.onreset}"<#rt/> + +<#if attributes.action?has_content> + action="${attributes.action}"<#rt/> + +<#if attributes.target?has_content> + target="${attributes.target}"<#rt/> + +<#if attributes.method?has_content> + method="${attributes.method}"<#rt/> +<#else> + method="post"<#rt/> + +<#if attributes.enctype?has_content> + enctype="${attributes.enctype}"<#rt/> + +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}"<#rt/> + +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}"<#rt/> + +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + +<#if attributes.acceptcharset?has_content> + accept-charset="${attributes.acceptcharset}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +<#if attributes.onreset?has_content> + onreset="${attributes.onreset}"<#rt/> + +><#rt/> diff --git a/core/src/main/resources/template/html5/head.ftl b/core/src/main/resources/template/html5/head.ftl new file mode 100644 index 000000000..630159774 --- /dev/null +++ b/core/src/main/resources/template/html5/head.ftl @@ -0,0 +1,21 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<@s.script src="${base}${attributes.staticContentPath}/utils.js" /><#rt/> diff --git a/core/src/main/resources/template/html5/hidden.ftl b/core/src/main/resources/template/html5/hidden.ftl new file mode 100644 index 000000000..c70412d14 --- /dev/null +++ b/core/src/main/resources/template/html5/hidden.ftl @@ -0,0 +1,41 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> + + name="${(attributes.name!"")}"<#rt/> +<#if attributes.nameValue??> + value="<@s.property value="attributes.nameValue"/>"<#rt/> + +<#if attributes.id?has_content> + id="${attributes.id}"<#rt/> + +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}"<#rt/> + +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> +/><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/inputtransferselect.ftl b/core/src/main/resources/template/html5/inputtransferselect.ftl new file mode 100644 index 000000000..066f9534a --- /dev/null +++ b/core/src/main/resources/template/html5/inputtransferselect.ftl @@ -0,0 +1,21 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +
    Tag 
    <s:inputtransferselect/>
    is not supported in this theme!
    \ No newline at end of file diff --git a/core/src/main/resources/template/html5/label.ftl b/core/src/main/resources/template/html5/label.ftl new file mode 100644 index 000000000..a1826089d --- /dev/null +++ b/core/src/main/resources/template/html5/label.ftl @@ -0,0 +1,40 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> + +<#if attributes.id?has_content> + id="${attributes.id}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /><#rt/> +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + +<#if attributes.for?has_content> + for="${attributes.for}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +><#rt/> +<#if attributes.nameValue??> +<@s.property value="attributes.nameValue"/><#rt/> + +<#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/link.ftl b/core/src/main/resources/template/html5/link.ftl new file mode 100644 index 000000000..441612052 --- /dev/null +++ b/core/src/main/resources/template/html5/link.ftl @@ -0,0 +1,72 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> + +<#if attributes.rel?has_content> + rel="${attributes.rel}"<#rt/> +<#else> + rel="stylesheet"<#rt/> + +<#if attributes.type?has_content> + type="${attributes.type}"<#rt/> +<#else> + type="text/css"<#rt/> + +<#if attributes.href?has_content> + href="${attributes.href}"<#rt/> + +<#if attributes.hreflang?has_content> + hreflang="${attributes.hreflang}"<#rt/> + +<#if attributes.disabled?has_content && attributes.disabled == "true"> + disabled<#rt/> + +<#if attributes.media?has_content> + media="${attributes.media}"<#rt/> +<#else> + media="all"<#rt/> + +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + +<#if attributes.as?has_content> + as="${attributes.as}"<#rt/> + +<#if attributes.referrerpolicy?has_content> + referrerpolicy="${attributes.referrerpolicy}"<#rt/> + +<#if attributes.sizes?has_content> + sizes="${attributes.sizes}"<#rt/> + +<#if attributes.crossorigin?has_content> + crossorigin="${attributes.crossorigin}"<#rt/> + +<#if attributes.integrity?has_content> + integrity="${attributes.integrity}"<#rt/> + +<#if attributes.importance?has_content> + importance="${attributes.importance}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/nonce.ftl" /><#rt/> +/><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/nonce.ftl b/core/src/main/resources/template/html5/nonce.ftl new file mode 100644 index 000000000..73eab4e2c --- /dev/null +++ b/core/src/main/resources/template/html5/nonce.ftl @@ -0,0 +1,23 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if attributes.nonce?has_content> + nonce="${attributes.nonce}"<#rt/> + diff --git a/core/src/main/resources/template/html5/optgroup.ftl b/core/src/main/resources/template/html5/optgroup.ftl new file mode 100644 index 000000000..f0e3c71d0 --- /dev/null +++ b/core/src/main/resources/template/html5/optgroup.ftl @@ -0,0 +1,69 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if attributes.optGroupInternalListUiBeanList??> +<#assign optGroupInternalListUiBeans=attributes.optGroupInternalListUiBeanList /><#t/> +<#list optGroupInternalListUiBeans as optGroupInternalListUiBean> + +<#if optGroupInternalListUiBean.attributes.label?has_content> + label="${optGroupInternalListUiBean.attributes.label}"<#rt> + +<#if optGroupInternalListUiBean.attributes.disabled!false> + disabled="disabled"<#rt> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +><#rt/> +<#list optGroupInternalListUiBean.attributes.list as optGroupBean> +<#assign trash=stack.push(optGroupBean) /><#t/> +<#assign tmpKey=stack.findValue(optGroupInternalListUiBean.attributes.listKey) /><#t/> +<#assign tmpValue=stack.findValue(optGroupInternalListUiBean.attributes.listValue) /><#t/> +<#assign tmpKeyStr = tmpKey.toString() /><#t/> +<#assign optGroupItemCssClass = ''/><#t/> +<#if optGroupInternalListUiBean.attributes.listCssClass??> + <#assign optGroupItemCssClass= stack.findString(optGroupInternalListUiBean.attributes.listCssClass)!''/><#t/> + +<#assign optGroupItemCssStyle = ''/> +<#if optGroupInternalListUiBean.attributes.listCssStyle??> + <#assign optGroupItemCssStyle= stack.findString(optGroupInternalListUiBean.attributes.listCssStyle)!''/><#t/> + +<#assign optGroupItemTitle = ''/> +<#if optGroupInternalListUiBean.attributes.listTitle??> + <#assign optGroupItemTitle= stack.findString(optGroupInternalListUiBean.attributes.listTitle)!''/><#t/> + +<#rt/> +<#assign trash=stack.pop() /><#t/> + +<#rt/> + + diff --git a/core/src/main/resources/template/html5/optiontransferselect.ftl b/core/src/main/resources/template/html5/optiontransferselect.ftl new file mode 100644 index 000000000..f689f195a --- /dev/null +++ b/core/src/main/resources/template/html5/optiontransferselect.ftl @@ -0,0 +1,21 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +
    Tag 
    <s:optiontransferselect/>
    is not supported in this theme!
    \ No newline at end of file diff --git a/core/src/main/resources/template/html5/password.ftl b/core/src/main/resources/template/html5/password.ftl new file mode 100644 index 000000000..1ba91826d --- /dev/null +++ b/core/src/main/resources/template/html5/password.ftl @@ -0,0 +1,53 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> + + name="${(attributes.name!"")}"<#rt/> +<#if attributes.get("size")?has_content> + size="${attributes.get("size")}"<#rt/> + +<#if attributes.maxlength?has_content> + maxlength="${attributes.maxlength}"<#rt/> + +<#if attributes.nameValue?? && attributes.showPassword!false> + value="<@s.property value="attributes.nameValue"/>"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#if attributes.readonly!false> + readonly="readonly"<#rt/> + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}"<#rt/> + +<#if attributes.id?has_content> + id="${attributes.id}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /><#rt/> +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/prefixed-dynamic-attributes.ftl b/core/src/main/resources/template/html5/prefixed-dynamic-attributes.ftl new file mode 100644 index 000000000..ebac1a502 --- /dev/null +++ b/core/src/main/resources/template/html5/prefixed-dynamic-attributes.ftl @@ -0,0 +1,37 @@ +<#ftl strip_text=true strip_whitespace=true/> +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#macro prefixedDynamicAttributes prefix> +<#if (attributes.dynamicAttributes?? && attributes.dynamicAttributes?size > 0)> +<#assign aKeys = attributes.dynamicAttributes.keySet()> +<#list aKeys as aKey> +<#if aKey?starts_with(prefix)> +<#assign keyValue = attributes.dynamicAttributes.get(aKey)/> +<#if keyValue?is_string> + <#assign value = struts.translateVariables(keyValue)!keyValue/><#t/> +<#else> + <#assign value = keyValue?string/><#t/> + + ${aKey?keep_after(prefix)}="${value}"<#rt/> + + + + diff --git a/core/src/main/resources/template/html5/radiomap.ftl b/core/src/main/resources/template/html5/radiomap.ftl new file mode 100644 index 000000000..5826fe47f --- /dev/null +++ b/core/src/main/resources/template/html5/radiomap.ftl @@ -0,0 +1,105 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> +<@s.iterator value="attributes.list"> +<#if attributes.listKey??> + <#assign itemKey = stack.findValue(attributes.listKey)/><#t/> + <#assign itemKeyStr = stack.findString(attributes.listKey)/><#t/> +<#else> + <#assign itemKey = stack.findValue('top')/><#t/> + <#assign itemKeyStr = stack.findString('top')><#t/> + +<#if attributes.listValueKey??> +<#-- checks the valueStack for the 'valueKey.' The valueKey is then looked-up in the locale +file for it's localized value. This is then used as a label --> + <#assign valueKey = stack.findString(attributes.listValueKey)!''/><#t/> +<#if valueKey?has_content> + <#assign itemValue = struts.getText(valueKey) /><#t/> +<#else> + <#assign itemValue = attributes.listValueKey /><#t/> + +<#elseif attributes.listValue??> + <#assign itemValue = stack.findString(attributes.listValue)/><#t/> +<#else> + <#assign itemValue = stack.findString('top')/><#t/> + +<#if attributes.listCssClass??> +<#if stack.findString(attributes.listCssClass)??> + <#assign itemCssClass= stack.findString(attributes.listCssClass)/><#t/> +<#else> + <#assign itemCssClass = ''/><#t/> + + +<#if attributes.listCssStyle??> +<#if stack.findString(attributes.listCssStyle)??> + <#assign itemCssStyle= stack.findString(attributes.listCssStyle)/><#t/> +<#else> + <#assign itemCssStyle = ''/><#t/> + + +<#if attributes.listTitle??> +<#if stack.findString(attributes.listTitle)??> + <#assign itemTitle= stack.findString(attributes.listTitle)/><#t/> +<#else> + <#assign itemTitle = ''/><#t/> + + + +<#if attributes.name?has_content> + name="${attributes.name?no_esc}"<#rt/> + + id="${attributes.id}${itemKeyStr?replace(".", "_")}"<#rt/> +<#if tag.contains(attributes.nameValue!'', itemKey)> + checked="checked"<#rt/> + +<#if itemKey??> + value="${itemKeyStr}"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}"<#rt/> + +<#if itemCssClass?has_content> + class="${itemCssClass}"<#rt/> + +<#if itemCssStyle?has_content> + style="${itemCssStyle}"<#rt/> + +<#if itemTitle?has_content> + title="${itemTitle}"<#rt/> +<#else> +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#global evaluate_dynamic_attributes = true/><#t/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +/><#rt/> +<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/reset.ftl b/core/src/main/resources/template/html5/reset.ftl new file mode 100644 index 000000000..7b1b13409 --- /dev/null +++ b/core/src/main/resources/template/html5/reset.ftl @@ -0,0 +1,85 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> +<#if attributes.type?? && attributes.type=="button"> +<#rt/> +<#else> + +<#if attributes.name?has_content> + name="${attributes.name}"<#rt/> + +<#if attributes.nameValue??> + value="<@s.property value="attributes.nameValue"/>"<#rt/> + +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}"<#rt/> + +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}"<#rt/> + +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +/><#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/script-close.ftl b/core/src/main/resources/template/html5/script-close.ftl new file mode 100644 index 000000000..9feb7f66f --- /dev/null +++ b/core/src/main/resources/template/html5/script-close.ftl @@ -0,0 +1,21 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#rt/> diff --git a/core/src/main/resources/template/html5/script.ftl b/core/src/main/resources/template/html5/script.ftl new file mode 100644 index 000000000..33defbb62 --- /dev/null +++ b/core/src/main/resources/template/html5/script.ftl @@ -0,0 +1,52 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> + +<#if attributes.async?has_content && attributes.async == "true"> + async<#rt/> + +<#if attributes.charset?has_content> + charset="${attributes.charset}"<#rt/> + +<#if attributes.defer?has_content && attributes.defer=="true"> + defer<#rt/> + +<#if attributes.type?has_content> + type="${attributes.type}"<#rt/> + +<#if attributes.src?has_content> + src="${attributes.src}"<#rt/> + +<#if attributes.referrerpolicy?has_content> + referrerpolicy="${attributes.referrerpolicy}"<#rt/> + +<#if attributes.nomodule?has_content && attributes.nomodule=="true"> + nomodule<#rt/> + +<#if attributes.integrity?has_content> + integrity="${attributes.integrity}"<#rt/> + +<#if attributes.crossorigin?has_content> + crossorigin="${attributes.crossorigin}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/nonce.ftl" /><#rt/> +><#rt/> diff --git a/core/src/main/resources/template/html5/scripting-events.ftl b/core/src/main/resources/template/html5/scripting-events.ftl new file mode 100644 index 000000000..5ae25a3e0 --- /dev/null +++ b/core/src/main/resources/template/html5/scripting-events.ftl @@ -0,0 +1,62 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if attributes.onclick??> + onclick="<#outputformat 'JavaScript'>${attributes.onclick}"<#rt/> + +<#if attributes.ondblclick??> + ondblclick="<#outputformat 'JavaScript'>${attributes.ondblclick}"<#rt/> + +<#if attributes.onmousedown??> + onmousedown="<#outputformat 'JavaScript'>${attributes.onmousedown}"<#rt/> + +<#if attributes.onmouseup??> + onmouseup="<#outputformat 'JavaScript'>${attributes.onmouseup}"<#rt/> + +<#if attributes.onmouseover??> + onmouseover="<#outputformat 'JavaScript'>${attributes.onmouseover}"<#rt/> + +<#if attributes.onmousemove??> + onmousemove="<#outputformat 'JavaScript'>${attributes.onmousemove}"<#rt/> + +<#if attributes.onmouseout??> + onmouseout="<#outputformat 'JavaScript'>${attributes.onmouseout}"<#rt/> + +<#if attributes.onfocus??> + onfocus="<#outputformat 'JavaScript'>${attributes.onfocus}"<#rt/> + +<#if attributes.onblur??> + onblur="<#outputformat 'JavaScript'>${attributes.onblur}"<#rt/> + +<#if attributes.onkeypress??> + onkeypress="<#outputformat 'JavaScript'>${attributes.onkeypress}"<#rt/> + +<#if attributes.onkeydown??> + onkeydown="<#outputformat 'JavaScript'>${attributes.onkeydown}"<#rt/> + +<#if attributes.onkeyup??> + onkeyup="<#outputformat 'JavaScript'>${attributes.onkeyup}"<#rt/> + +<#if attributes.onselect??> + onselect="<#outputformat 'JavaScript'>${attributes.onselect}"<#rt/> + +<#if attributes.onchange??> + onchange="<#outputformat 'JavaScript'>${attributes.onchange}"<#rt/> + diff --git a/core/src/main/resources/template/html5/select.ftl b/core/src/main/resources/template/html5/select.ftl new file mode 100644 index 000000000..0d6153fa0 --- /dev/null +++ b/core/src/main/resources/template/html5/select.ftl @@ -0,0 +1,145 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> +<#setting number_format="#.#####"><#t/> + + name="${(attributes.name!"")}"<#rt/> +<#if attributes.get("size")?has_content> + size="${attributes.get("size")}"<#rt/> + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}"<#rt/> + +<#if attributes.id?has_content> + id="${attributes.id}"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /><#rt/> +<#if attributes.title?has_content> + title="${attributes.title}"<#rt/> + +<#if attributes.multiple!false> + multiple="multiple"<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /><#rt/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /><#rt/> +><#rt/> +<#if attributes.headerKey?? && attributes.headerValue??> +<#rt/> + +<#if attributes.emptyOption!false> +<#rt/> + +<@s.iterator value="attributes.list"> +<#if attributes.listKey??> +<#if stack.findValue(attributes.listKey)??> + <#assign itemKey = stack.findValue(attributes.listKey)/><#t/> + <#assign itemKeyStr = stack.findString(attributes.listKey)/><#t/> +<#else> + <#assign itemKey = ''/><#t/> + <#assign itemKeyStr = ''/><#t/> + +<#else> + <#assign itemKey = stack.findValue('top')/><#t/> + <#assign itemKeyStr = stack.findString('top')><#t/> + +<#if attributes.listValueKey??> +<#-- checks the valueStack for the 'valueKey.' The valueKey is then looked-up in the locale file for it's +localized value. This is then used as a label --> + <#assign valueKey = stack.findString(attributes.listValueKey)!'' /><#t/> +<#if valueKey?has_content> + <#assign itemValue = struts.getText(valueKey) /><#t/> +<#else> + <#assign itemValue = attributes.listValueKey /><#t/> + +<#elseif attributes.listValue??> +<#if stack.findString(attributes.listValue)??> + <#assign itemValue = stack.findString(attributes.listValue)/><#t/> +<#else> + <#assign itemValue = ''/><#t/> + +<#else> + <#assign itemValue = stack.findString('top')/><#t/> + +<#if attributes.listCssClass??> +<#if stack.findString(attributes.listCssClass)??> + <#assign itemCssClass= stack.findString(attributes.listCssClass)/><#t/> +<#else> + <#assign itemCssClass = ''/><#t/> + + +<#if attributes.listCssStyle??> +<#if stack.findString(attributes.listCssStyle)??> + <#assign itemCssStyle= stack.findString(attributes.listCssStyle)/><#t/> +<#else> + <#assign itemCssStyle = ''/><#t/> + + +<#if attributes.listTitle??> +<#if stack.findString(attributes.listTitle)??> + <#assign itemTitle= stack.findString(attributes.listTitle)/><#t/> +<#else> + <#assign itemTitle = ''/><#t/> + + +<#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/optgroup.ftl" /><#rt/> +<#rt/> +<#if attributes.multiple!false> +<#if (attributes.id?? && attributes.name??)> + + +<#if (attributes.id?? && !attributes.name??)> + + +<#if ( !attributes.id?? && attributes.name??)> + + +<#if ( !attributes.id?? && !attributes.name??)> + + +<#if attributes.disabled!false> + disabled="disabled"<#rt/> + +/><#rt/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/submit-close.ftl b/core/src/main/resources/template/html5/submit-close.ftl new file mode 100644 index 000000000..5289ef654 --- /dev/null +++ b/core/src/main/resources/template/html5/submit-close.ftl @@ -0,0 +1,27 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if attributes.type?? && attributes.type=="button"> +<#if attributes.body?length gt 0>${tag.escapeHtmlBody()?then(attributes.body, attributes.body?no_esc)}<#elseif attributes.label??><@s.property value="attributes.label"/> +<#rt/> +<#else> +${tag.escapeHtmlBody()?then(attributes.body, attributes.body?no_esc)}<#t/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /><#rt/> diff --git a/core/src/main/resources/template/html5/submit.ftl b/core/src/main/resources/template/html5/submit.ftl new file mode 100644 index 000000000..5d683249d --- /dev/null +++ b/core/src/main/resources/template/html5/submit.ftl @@ -0,0 +1,92 @@ +<#-- +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /><#rt/> +<#if attributes.type?? && attributes.type=="button"> +