You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by lu...@apache.org on 2013/12/12 22:39:39 UTC

svn commit: r1550540 - in /struts/sandbox/trunk/struts2examples/themes/src/main: resources/template/ resources/template/KUTheme/checkboxlist.ftl resources/template/KUTheme/theme.properties webapp/template/

Author: lukaszlenart
Date: Thu Dec 12 21:39:39 2013
New Revision: 1550540

URL: http://svn.apache.org/r1550540
Log:
Moves template directory under resources to finally put it on the classpath and uses proper theme hierarchy

Added:
    struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/
      - copied from r1550528, struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/
Removed:
    struts/sandbox/trunk/struts2examples/themes/src/main/webapp/template/
Modified:
    struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl
    struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties

Modified: struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl?rev=1550540&r1=1550528&r2=1550540&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl (original)
+++ struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/checkboxlist.ftl Thu Dec 12 21:39:39 2013
@@ -1,3 +1,3 @@
-<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
+<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/KUTheme_simple/checkboxlist.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /><#nt/>
\ No newline at end of file
+<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /><#nt/>
\ No newline at end of file

Modified: struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties?rev=1550540&r1=1550528&r2=1550540&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties (original)
+++ struts/sandbox/trunk/struts2examples/themes/src/main/resources/template/KUTheme/theme.properties Thu Dec 12 21:39:39 2013
@@ -1 +1 @@
-parent = xhtml
\ No newline at end of file
+parent = KUTheme_simple
\ No newline at end of file