diff --git a/CLAUDE.md b/CLAUDE.md index 5f338f789a..a536f59d06 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 0000000000..a4e6b2d7d2 --- /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 1b57083b33..5c1cf37ff8 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 b2eeaca629..e5b644ad4b 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -180,6 +180,9 @@ Component Tag Example
  • Action Tag Example
    • +
  • Html 5 theme
  • 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 0000000000..28424860e4 --- /dev/null +++ b/apps/showcase/src/main/webapp/WEB-INF/html5/index.jsp @@ -0,0 +1,77 @@ + +<%@ 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 +

    +
    +
    +
    +
    + 
    <s:a/>
    +
    +
    + index +
    +
    +
    +
    + 
    <s:actionerror/>
    +
    +
    + +
    +
    +
    +
    + 
    <s:actionmessage/>
    +
    +
    + +
    +
    +
    +
    + 
    <s:fielderror/>
    +
    +
    + +
    +
    +
    + + diff --git a/apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml b/apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml index 88cd74843d..2d1dffb60b 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 0000000000..10b48b5eb0 --- /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 99c1d4797f..faca26e7b2 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 void renderTemplate(TemplateRenderingContext templateContext) throws Exce 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/resources/template/html5/a-close.ftl b/core/src/main/resources/template/html5/a-close.ftl new file mode 100644 index 0000000000..f7f352c71b --- /dev/null +++ b/core/src/main/resources/template/html5/a-close.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" /> +<#compress> + + id="${attributes.id}" + +<#if attributes.href??> + href="${attributes.href?no_esc}" + +<#if attributes.disabled!false> + disabled="disabled" + +<#if attributes.tabindex??> + tabindex="${attributes.tabindex}" + +<#if attributes.cssClass??> + class="${attributes.cssClass}" + +<#if attributes.cssStyle??> + style="${attributes.cssStyle}" + +<#if attributes.title??> + title="${attributes.title}" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> +>${tag.escapeHtmlBody()?then(attributes.body, attributes.body?no_esc)} + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..2ffa2ec5d1 --- /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 0000000000..ef2501c053 --- /dev/null +++ b/core/src/main/resources/template/html5/actionerror.ftl @@ -0,0 +1,44 @@ +<#ftl strip_whitespace=true strip_text=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. + */ +--> +<#compress> + <#if (actionErrors?? && actionErrors?size > 0)> +

          + id="${attributes.id}" + + <#if attributes.cssClass??> + class="${attributes.cssClass}" + <#else> + class="errorMessage" + + <#if attributes.cssStyle??> + style="${attributes.cssStyle}" + + > + <#list actionErrors as error> + <#if error??><#t/> +
        • <#if attributes.escape>${error!}<#else>${error!?no_esc}
          • + + +
        + + 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 0000000000..e9efb58b27 --- /dev/null +++ b/core/src/main/resources/template/html5/actionmessage.ftl @@ -0,0 +1,44 @@ +<#ftl strip_whitespace=true strip_text=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. + */ +--> +<#compress> + <#if (actionMessages?? && actionMessages?size > 0 && !attributes.isEmptyList)> +
          + id="${attributes.id}" + + <#if attributes.cssClass??> + class="${attributes.cssClass}" + <#else> + class="actionMessage" + + <#if attributes.cssStyle??> + style="${attributes.cssStyle}" + + > + <#list actionMessages as message> + <#if message??><#t/> +
        • <#if attributes.escape>${message!}<#else>${message!?no_esc}
          • + + +
        + + \ No newline at end of file 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 0000000000..10f5300dd7 --- /dev/null +++ b/core/src/main/resources/template/html5/checkbox.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. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /> +<#compress> + + checked="checked" + +<#if attributes.disabled!false> + disabled="disabled" + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}" + +<#if attributes.id?has_content> + id="${attributes.id}" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /> +<#if attributes.title?has_content> + title="${attributes.title}" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> +/> +<#if attributes.submitUnchecked!false> + + disabled="disabled" + + /> + + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..a55732a82b --- /dev/null +++ b/core/src/main/resources/template/html5/checkboxlist.ftl @@ -0,0 +1,120 @@ +<#-- +/* + * 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" /> +<#compress> +<#assign itemCount = 0/> +<#if attributes.list??> +<@s.iterator value="attributes.list"> + <#assign itemCount = itemCount + 1/> + <#if attributes.listKey??> + <#assign itemKey = stack.findValue(attributes.listKey)/> + <#assign itemKeyStr = stack.findString(attributes.listKey)/> + <#else> + <#assign itemKey = stack.findValue('top')/> + <#assign itemKeyStr = stack.findString('top')> + + <#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))/> + <#elseif attributes.listValue??> + <#assign itemValue = stack.findString(attributes.listValue)!""/> + <#else> + <#assign itemValue = stack.findString('top')/> + + <#if attributes.listCssClass??> + <#if stack.findString(attributes.listCssClass)??> + <#assign itemCssClass= stack.findString(attributes.listCssClass)/> + <#else> + <#assign itemCssClass = ''/> + + + <#if attributes.listCssStyle??> + <#if stack.findString(attributes.listCssStyle)??> + <#assign itemCssStyle= stack.findString(attributes.listCssStyle)/> + <#else> + <#assign itemCssStyle = ''/> + + + <#if attributes.listTitle??> + <#if stack.findString(attributes.listTitle)??> + <#assign itemTitle= stack.findString(attributes.listTitle)/> + <#else> + <#assign itemTitle = ''/> + + + + id="${attributes.id}-${itemCount}" +<#else> + id="${attributes.name}-${itemCount}" + +<#if tag.contains(attributes.nameValue, itemKey)> + checked="checked" + +<#if attributes.disabled!false> + disabled="disabled" + +<#if itemCssClass??> + class="${itemCssClass}" +<#else> +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}" + + +<#if itemCssStyle??> + style="${itemCssStyle}" +<#else> +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}" + + +<#if itemTitle??> + title="${itemTitle}" +<#else> +<#if attributes.title?has_content> + title="${attributes.title}" + + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /> +<#global evaluate_dynamic_attributes = true/> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> + + + +<#else> + + + disabled="disabled" + + /> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..2e950c49c0 --- /dev/null +++ b/core/src/main/resources/template/html5/combobox.ftl @@ -0,0 +1,102 @@ +<#-- +/* + * 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" /> +<#compress> + <#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /> + <#if attributes.list??> + + + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..bd81fcb15a --- /dev/null +++ b/core/src/main/resources/template/html5/common-attributes.ftl @@ -0,0 +1,25 @@ +<#-- +/* + * 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. + */ +--> +<#compress> +<#if attributes.accesskey?has_content> + accesskey="${attributes.accesskey}" + + 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 0000000000..1626c3cd92 --- /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 0000000000..1626c3cd92 --- /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 0000000000..00ea4b9fc9 --- /dev/null +++ b/core/src/main/resources/template/html5/css.ftl @@ -0,0 +1,35 @@ +<#-- +/* + * 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. + */ +--> +<#compress> +<#assign hasFieldErrors = attributes.name?? && fieldErrors?? && fieldErrors.get(attributes.name)??/> +<#if attributes.cssClass?has_content && !(hasFieldErrors && attributes.cssErrorClass??)> + class="${attributes.cssClass}" +<#elseif attributes.cssClass?has_content && (hasFieldErrors && attributes.cssErrorClass??)> + class="${attributes.cssClass} ${attributes.cssErrorClass}" +<#elseif !(attributes.cssClass?has_content) && (hasFieldErrors && attributes.cssErrorClass??)> + class="${attributes.cssErrorClass}" + +<#if attributes.cssStyle?has_content && !(hasFieldErrors && (attributes.cssErrorStyle?? || attributes.cssErrorClass??))> + style="${attributes.cssStyle}" +<#elseif hasFieldErrors && attributes.cssErrorStyle??> + style="${attributes.cssErrorStyle}" + + 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 0000000000..25f198f447 --- /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 0000000000..fef4f6fa5c --- /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 0000000000..14ff8668c7 --- /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 0000000000..64ea3dfa61 --- /dev/null +++ b/core/src/main/resources/template/html5/dynamic-attributes.ftl @@ -0,0 +1,45 @@ +<#-- +/* + * 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. + */ +--> +<#compress> +<#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}" + + + 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 0000000000..1626c3cd92 --- /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 0000000000..7bc1be01bd --- /dev/null +++ b/core/src/main/resources/template/html5/fielderror.ftl @@ -0,0 +1,84 @@ +<#-- +/* + * 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. + */ +--> +<#compress> + <#if fieldErrors??> + <#assign eKeys = fieldErrors.keySet()> + <#assign eKeysSize = eKeys.size()> + <#assign doneStartUlTag=false> + <#assign doneEndUlTag=false> + <#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))> +
          + id="${attributes.id}" + + <#if attributes.cssClass?has_content> + class="${attributes.cssClass}" + <#else> + class="errorMessage" + + <#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}" + + > + <#assign doneStartUlTag=true> + + <#list eValue as eEachValue> +
        • <#if attributes.escape>${eEachValue!}<#else>${eEachValue!?no_esc} +
          • + + + + + <#if (haveMatchedErrorField && (!doneEndUlTag))> +
        + <#assign doneEndUlTag=true> + + <#else> + <#if (eKeysSize > 0)> +
          + class="${attributes.cssClass}" + <#else> + class="errorMessage" + + <#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}" + + > + <#list eKeys as eKey> + <#assign eValue = fieldErrors.get(eKey)> + <#list eValue as eEachValue> +
        • <#if attributes.escape>${eEachValue!}<#else>${eEachValue!?no_esc} +
          • + + +
        + + + + 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 0000000000..386ae0fa2b --- /dev/null +++ b/core/src/main/resources/template/html5/file.ftl @@ -0,0 +1,49 @@ +<#-- +/* + * 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" /> +<#compress> + + size="${attributes.get("size")}" + +<#if attributes.disabled!false> + disabled="disabled" + +<#if attributes.accept?has_content> + accept="${attributes.accept}" + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}" + +<#if attributes.id?has_content> + id="${attributes.id}" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /> +<#if attributes.title?has_content> + title="${attributes.title}" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> +/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..b170ba2941 --- /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. + */ +--> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..b7c74c5d3b --- /dev/null +++ b/core/src/main/resources/template/html5/form.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" /> +<#compress> +<#if (attributes.validate!false == false)> + <#if attributes.onsubmit?has_content> + ${tag.addParameter('onsubmit', "${attributes.onsubmit}") } + + +
        + id="${attributes.id}" + +<#if attributes.name?has_content> + name="${attributes.name}" + +<#if attributes.onsubmit?has_content> + onsubmit="<#outputformat 'JavaScript'>${attributes.onsubmit}" + +<#if attributes.onreset?has_content> + onreset="<#outputformat 'JavaScript'>${attributes.onreset}" + +<#if attributes.action?has_content> + action="${attributes.action}" + +<#if attributes.target?has_content> + target="${attributes.target}" + +<#if attributes.method?has_content> + method="${attributes.method}" +<#else> + method="post" + +<#if attributes.enctype?has_content> + enctype="${attributes.enctype}" + +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}" + +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}" + +<#if attributes.title?has_content> + title="${attributes.title}" + +<#if attributes.acceptcharset?has_content> + accept-charset="${attributes.acceptcharset}" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> +<#if attributes.onreset?has_content> + onreset="${attributes.onreset}" + +> + 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 0000000000..66f278dddd --- /dev/null +++ b/core/src/main/resources/template/html5/head.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. + */ +--> +<#compress> +<@s.script src="${base}${attributes.staticContentPath}/utils.js" /> + 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 0000000000..afcc6b20b2 --- /dev/null +++ b/core/src/main/resources/template/html5/hidden.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. + */ +--> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlheader.ftl" /> +<#compress> + + value="<@s.property value="attributes.nameValue"/>" + +<#if attributes.id?has_content> + id="${attributes.id}" + +<#if attributes.cssClass?has_content> + class="${attributes.cssClass}" + +<#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}" + +<#if attributes.disabled!false> + disabled="disabled" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> +/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..066f9534aa --- /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 0000000000..7a5641a991 --- /dev/null +++ b/core/src/main/resources/template/html5/label.ftl @@ -0,0 +1,42 @@ +<#-- +/* + * 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" /> +<#compress> + + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..0f0befd312 --- /dev/null +++ b/core/src/main/resources/template/html5/link.ftl @@ -0,0 +1,74 @@ +<#-- +/* + * 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" /> +<#compress> + + rel="${attributes.rel}" + <#else> + rel="stylesheet" + + <#if attributes.type?has_content> + type="${attributes.type}" + <#else> + type="text/css" + + <#if attributes.href?has_content> + href="${attributes.href}" + + <#if attributes.hreflang?has_content> + hreflang="${attributes.hreflang}" + + <#if attributes.disabled?has_content && attributes.disabled == "true"> + disabled + + <#if attributes.media?has_content> + media="${attributes.media}" + <#else> + media="all" + + <#if attributes.title?has_content> + title="${attributes.title}" + + <#if attributes.as?has_content> + as="${attributes.as}" + + <#if attributes.referrerpolicy?has_content> + referrerpolicy="${attributes.referrerpolicy}" + + <#if attributes.sizes?has_content> + sizes="${attributes.sizes}" + + <#if attributes.crossorigin?has_content> + crossorigin="${attributes.crossorigin}" + + <#if attributes.integrity?has_content> + integrity="${attributes.integrity}" + + <#if attributes.importance?has_content> + importance="${attributes.importance}" + + <#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /> + <#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> + <#include "/${attributes.templateDir}/${attributes.expandTheme}/nonce.ftl" /> + /> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..8570d97861 --- /dev/null +++ b/core/src/main/resources/template/html5/nonce.ftl @@ -0,0 +1,25 @@ +<#-- +/* + * 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. + */ +--> +<#compress> +<#if attributes.nonce?has_content> + nonce="${attributes.nonce}" + + 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 0000000000..e3d7ab4d7e --- /dev/null +++ b/core/src/main/resources/template/html5/optgroup.ftl @@ -0,0 +1,71 @@ +<#-- +/* + * 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. + */ +--> +<#compress> + <#if attributes.optGroupInternalListUiBeanList??> + <#assign optGroupInternalListUiBeans=attributes.optGroupInternalListUiBeanList /> + <#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" /> + > + <#list optGroupInternalListUiBean.attributes.list as optGroupBean> + <#assign trash=stack.push(optGroupBean) /> + <#assign tmpKey=stack.findValue(optGroupInternalListUiBean.attributes.listKey) /> + <#assign tmpValue=stack.findValue(optGroupInternalListUiBean.attributes.listValue) /> + <#assign tmpKeyStr = tmpKey.toString() /> + <#assign optGroupItemCssClass = ''/> + <#if optGroupInternalListUiBean.attributes.listCssClass??> + <#assign optGroupItemCssClass= stack.findString(optGroupInternalListUiBean.attributes.listCssClass)!''/> + + <#assign optGroupItemCssStyle = ''/> + <#if optGroupInternalListUiBean.attributes.listCssStyle??> + <#assign optGroupItemCssStyle= stack.findString(optGroupInternalListUiBean.attributes.listCssStyle)!''/> + + <#assign optGroupItemTitle = ''/> + <#if optGroupInternalListUiBean.attributes.listTitle??> + <#assign optGroupItemTitle= stack.findString(optGroupInternalListUiBean.attributes.listTitle)!''/> + + <#lt> + <#assign trash=stack.pop() /> + + + + + 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 0000000000..f689f195a3 --- /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 0000000000..63d8079691 --- /dev/null +++ b/core/src/main/resources/template/html5/password.ftl @@ -0,0 +1,55 @@ +<#-- +/* + * 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" /> +<#compress> + + size="${attributes.get("size")}" + +<#if attributes.maxlength?has_content> + maxlength="${attributes.maxlength}" + +<#if attributes.nameValue?? && attributes.showPassword!false> + value="<@s.property value="attributes.nameValue"/>" + +<#if attributes.disabled!false> + disabled="disabled" + +<#if attributes.readonly!false> + readonly="readonly" + +<#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}" + +<#if attributes.id?has_content> + id="${attributes.id}" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /> +<#if attributes.title?has_content> + title="${attributes.title}" + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /> +<#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> +/> + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..0d94cd74ee --- /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/> +<#else> + <#assign value = keyValue?string/> + + ${aKey?keep_after(prefix)}="${value}" + + + + 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 0000000000..13a597f70d --- /dev/null +++ b/core/src/main/resources/template/html5/radiomap.ftl @@ -0,0 +1,107 @@ +<#-- +/* + * 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" /> +<#compress> + <@s.iterator value="attributes.list"> + <#if attributes.listKey??> + <#assign itemKey = stack.findValue(attributes.listKey)/> + <#assign itemKeyStr = stack.findString(attributes.listKey)/> + <#else> + <#assign itemKey = stack.findValue('top')/> + <#assign itemKeyStr = stack.findString('top')> + + <#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)!''/> + <#if valueKey?has_content> + <#assign itemValue = struts.getText(valueKey) /> + <#else> + <#assign itemValue = attributes.listValueKey /> + + <#elseif attributes.listValue??> + <#assign itemValue = stack.findString(attributes.listValue)/> + <#else> + <#assign itemValue = stack.findString('top')/> + + <#if attributes.listCssClass??> + <#if stack.findString(attributes.listCssClass)??> + <#assign itemCssClass= stack.findString(attributes.listCssClass)/> + <#else> + <#assign itemCssClass = ''/> + + + <#if attributes.listCssStyle??> + <#if stack.findString(attributes.listCssStyle)??> + <#assign itemCssStyle= stack.findString(attributes.listCssStyle)/> + <#else> + <#assign itemCssStyle = ''/> + + + <#if attributes.listTitle??> + <#if stack.findString(attributes.listTitle)??> + <#assign itemTitle= stack.findString(attributes.listTitle)/> + <#else> + <#assign itemTitle = ''/> + + + + name="${attributes.name?no_esc}" + + id="${attributes.id}${itemKeyStr?replace(".", "_")}" + <#if tag.contains(attributes.nameValue!'', itemKey)> + checked="checked" + + <#if itemKey??> + value="${itemKeyStr}" + + <#if attributes.disabled!false> + disabled="disabled" + + <#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}" + + <#if itemCssClass?has_content> + class="${itemCssClass}" + + <#if itemCssStyle?has_content> + style="${itemCssStyle}" + + <#if itemTitle?has_content> + title="${itemTitle}" + <#else> + <#if attributes.title?has_content> + title="${attributes.title}" + + + <#include "/${attributes.templateDir}/${attributes.expandTheme}/css.ftl" /> + <#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /> + <#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /> + <#global evaluate_dynamic_attributes = true/> + <#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> + /> + + + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..02d36e9e54 --- /dev/null +++ b/core/src/main/resources/template/html5/reset.ftl @@ -0,0 +1,84 @@ +<#-- +/* + * 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" /> +<#compress> + <#if attributes.type?? && attributes.type=="button"> + + <#else> + + name="${attributes.name}" + + <#if attributes.nameValue??> + value="<@s.property value="attributes.nameValue"/>" + + <#if attributes.cssClass?has_content> + class="${attributes.cssClass}" + + <#if attributes.cssStyle?has_content> + style="${attributes.cssStyle}" + + <#if attributes.title?has_content> + title="${attributes.title}" + + <#if attributes.disabled!false> + disabled="disabled" + + <#if attributes.tabindex?has_content> + tabindex="${attributes.tabindex}" + + <#include "/${attributes.templateDir}/${attributes.expandTheme}/scripting-events.ftl" /> + <#include "/${attributes.templateDir}/${attributes.expandTheme}/common-attributes.ftl" /> + <#include "/${attributes.templateDir}/${attributes.expandTheme}/dynamic-attributes.ftl" /> + /> + + +<#include "/${attributes.templateDir}/${attributes.expandTheme}/controlfooter.ftl" /> 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 0000000000..e0f64a41eb --- /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. + */ +--> + 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 0000000000..2f5855bfae --- /dev/null +++ b/core/src/main/resources/template/html5/script.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. + */ +--> +<#compress> +