| commit | b2c7ab297d6c35ef2d3fb8a477b4937a6a5a1fde | [log] [tgz] |
|---|---|---|
| author | Lukasz Lenart <lukaszlenart@apache.org> | Thu Dec 12 21:39:39 2013 +0000 |
| committer | Lukasz Lenart <lukaszlenart@apache.org> | Thu Dec 12 21:39:39 2013 +0000 |
| tree | 843b42dd849d75b4b7be1b6a08e5dda8bcc7c144 | |
| parent | 5568a9305aa66b54a5b7a64e0ca6ec2133744b34 [diff] |
Moves template directory under resources to finally put it on the classpath and uses proper theme hierarchy git-svn-id: https://svn.apache.org/repos/asf/struts/sandbox/trunk@1550540 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl b/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl new file mode 100644 index 0000000..818bc4b --- /dev/null +++ b/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl
@@ -0,0 +1,3 @@ +<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" /> +<#include "/${parameters.templateDir}/KUTheme_simple/checkboxlist.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /><#nt/> \ No newline at end of file
diff --git a/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties b/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties new file mode 100644 index 0000000..4fde597 --- /dev/null +++ b/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties
@@ -0,0 +1 @@ +parent = KUTheme_simple \ No newline at end of file
diff --git a/struts2examples/themes/src/main/webapp/template/KUTheme_simple/checkboxlist.ftl b/struts2examples/themes/src/main/resources/template/KUTheme_simple/checkboxlist.ftl similarity index 100% rename from struts2examples/themes/src/main/webapp/template/KUTheme_simple/checkboxlist.ftl rename to struts2examples/themes/src/main/resources/template/KUTheme_simple/checkboxlist.ftl
diff --git a/struts2examples/themes/src/main/webapp/template/KUTheme_simple/theme.properties b/struts2examples/themes/src/main/resources/template/KUTheme_simple/theme.properties similarity index 100% rename from struts2examples/themes/src/main/webapp/template/KUTheme_simple/theme.properties rename to struts2examples/themes/src/main/resources/template/KUTheme_simple/theme.properties
diff --git a/struts2examples/themes/src/main/webapp/template/KUTheme/checkboxlist.ftl b/struts2examples/themes/src/main/webapp/template/KUTheme/checkboxlist.ftl deleted file mode 100644 index 8f6a25c..0000000 --- a/struts2examples/themes/src/main/webapp/template/KUTheme/checkboxlist.ftl +++ /dev/null
@@ -1,3 +0,0 @@ -<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" /> -<#include "/${parameters.templateDir}/KUTheme_simple/checkboxlist.ftl" /> -<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /><#nt/> \ No newline at end of file
diff --git a/struts2examples/themes/src/main/webapp/template/KUTheme/theme.properties b/struts2examples/themes/src/main/webapp/template/KUTheme/theme.properties deleted file mode 100644 index 49429d0..0000000 --- a/struts2examples/themes/src/main/webapp/template/KUTheme/theme.properties +++ /dev/null
@@ -1 +0,0 @@ -parent = xhtml \ No newline at end of file