You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by tm...@apache.org on 2006/05/28 16:17:18 UTC
svn commit: r409958 - in /struts/action2/trunk/core/src/main:
java/org/apache/struts/action2/components/template/
java/org/apache/struts/action2/views/freemarker/ resources/template/ajax/
resources/template/css_xhtml/ resources/template/xhtml/
Author: tmjee
Date: Sun May 28 07:17:17 2006
New Revision: 409958
URL: http://svn.apache.org/viewvc?rev=409958&view=rev
Log:
WW-1304
Added:
struts/action2/trunk/core/src/main/resources/template/css_xhtml/control-close.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/control.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
struts/action2/trunk/core/src/main/resources/template/xhtml/control-close.ftl
struts/action2/trunk/core/src/main/resources/template/xhtml/control.ftl
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
struts/action2/trunk/core/src/main/resources/template/ajax/controlheader.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/form.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/head.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/submit.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/textarea.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/theme.properties
struts/action2/trunk/core/src/main/resources/template/css_xhtml/checkboxlist.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/combobox.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/doubleselect.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/file.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-close.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/form.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/label.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/password.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/radiomap.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/richtexteditor.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/select.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/text.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/textarea.ftl
struts/action2/trunk/core/src/main/resources/template/css_xhtml/updownselect.ftl
struts/action2/trunk/core/src/main/resources/template/xhtml/form-close.ftl
struts/action2/trunk/core/src/main/resources/template/xhtml/form.ftl
Modified: struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java (original)
+++ struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java Sun May 28 07:17:17 2006
@@ -109,6 +109,7 @@
SimpleHash model = freemarkerManager.buildTemplateModel(stack, action, servletContext, req, res, config.getObjectWrapper());
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)
Modified: struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java (original)
+++ struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java Sun May 28 07:17:17 2006
@@ -134,7 +134,7 @@
String base = ResourceUtil.getResourceBase(req);
location = base + "/" + location;
}
-
+
Template template = configuration.getTemplate(location, deduceLocale());
TemplateModel model = createModel();
Modified: struts/action2/trunk/core/src/main/resources/template/ajax/controlheader.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/controlheader.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/ajax/controlheader.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/controlheader.ftl Sun May 28 07:17:17 2006
@@ -1,4 +1,5 @@
-<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /-->
+<#--include "/${parameters.templateDir}/${themeProperties.parent}/controlheader-core.ftl" /-->
<#if parameters.form?exists && parameters.form.validate?default(false) == true>
<#-- can't mutate the data model in freemarker -->
<#if parameters.onblur?exists>
@@ -8,3 +9,5 @@
</#if>
</#if>
<td>
+<#include "/${parameters.templateDir}/${themeProperties.parent}/controlheader.ftl" />
+
\ No newline at end of file
Modified: struts/action2/trunk/core/src/main/resources/template/ajax/form.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/form.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/ajax/form.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/form.ftl Sun May 28 07:17:17 2006
@@ -3,7 +3,7 @@
<script src="${base}/dwr/interface/validator.js"></script>
<script src="${base}/dwr/engine.js"></script>
<script src="${base}/struts/ajax/validation.js"></script>
-<script src="${base}/struts/xhtml/validation.js"></script>
+<script src="${base}/struts/${themeProperties.parent}/validation.js"></script>
</#if>
<form<#rt/>
<#if parameters.namespace?exists>
@@ -39,7 +39,10 @@
${tag.addParameter("ajaxSubmit", "true")}
onSubmit="return isAjaxFormSubmit(this);"
>
+<#include "/${parameters.templateDir}/${themeProperties.parent}/control.ftl" />
+<#--
<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
<#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}"<#rt/>
</#if>
>
+-->
Modified: struts/action2/trunk/core/src/main/resources/template/ajax/head.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/head.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/ajax/head.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/head.ftl Sun May 28 07:17:17 2006
@@ -1,4 +1,5 @@
-<#include "/${parameters.templateDir}/xhtml/head.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/head.ftl" /-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/head.ftl" />
<script language="JavaScript" type="text/javascript"
src="<@saf.url includeParams='none' value='/struts/ajax/dojoRequire.js' encode='false'/>"></script>
<script language="JavaScript" type="text/javascript"
Modified: struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl Sun May 28 07:17:17 2006
@@ -1,5 +1,8 @@
+<#--
<tr>
<td colspan="2"><div <#rt/>
+-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/controlheader.ftl" />
<#if parameters.align?exists>
align="${parameters.align?html}"<#t/>
</#if>
@@ -37,4 +40,6 @@
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
><#if parameters.nameValue?exists><@saf.property value="parameters.nameValue"/><#rt/></#if></button></div>
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/controlfooter.ftl" />
+
Modified: struts/action2/trunk/core/src/main/resources/template/ajax/submit.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/submit.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/ajax/submit.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/submit.ftl Sun May 28 07:17:17 2006
@@ -2,5 +2,6 @@
<#include "/${parameters.templateDir}/ajax/submit-ajax.ftl" />
${tag.addFormParameter("ajaxSubmit", "false")}
<#else>
-<#include "/${parameters.templateDir}/xhtml/submit.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/submit.ftl" /-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/submit.ftl" />
</#if>
Modified: struts/action2/trunk/core/src/main/resources/template/ajax/textarea.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/textarea.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/ajax/textarea.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/textarea.ftl Sun May 28 07:17:17 2006
@@ -41,4 +41,5 @@
</#if>
</textarea>
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/ajax/theme.properties
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/theme.properties?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/ajax/theme.properties (original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/theme.properties Sun May 28 07:17:17 2006
@@ -1 +1 @@
-parent = xhtml
+parent=xhtml
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/checkboxlist.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/checkboxlist.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/checkboxlist.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/checkboxlist.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/combobox.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/combobox.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/combobox.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/combobox.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/combobox.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
Added: struts/action2/trunk/core/src/main/resources/template/css_xhtml/control-close.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/control-close.ftl?rev=409958&view=auto
==============================================================================
(empty)
Added: struts/action2/trunk/core/src/main/resources/template/css_xhtml/control.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/control.ftl?rev=409958&view=auto
==============================================================================
(empty)
Added: struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl?rev=409958&view=auto
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl (added)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl Sun May 28 07:17:17 2006
@@ -0,0 +1,50 @@
+<#--
+ Only show message if errors are available.
+ This will be done if ActionSupport is used.
+-->
+<#assign hasFieldErrors = parameters.name?exists && fieldErrors?exists && fieldErrors[parameters.name]?exists/>
+<div <#rt/><#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
+
+<#if hasFieldErrors>
+<div <#rt/><#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
+<#list fieldErrors[parameters.name] as error>
+ <div<#rt/>
+ <#if parameters.id?exists>
+ errorFor="${parameters.id}"<#rt/>
+ </#if>
+ class="errorMessage">
+ ${error?html}
+ </div><#t/>
+</#list>
+</div><#t/>
+</#if>
+
+<#if parameters.label?exists>
+<#if parameters.labelposition?default("top") == 'top'>
+<div <#rt/>
+<#else>
+<span <#rt/>
+</#if>
+<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
+ <label <#t/>
+<#if parameters.id?exists>
+ for="${parameters.id?html}" <#t/>
+</#if>
+<#if hasFieldErrors>
+ class="errorLabel"<#t/>
+<#else>
+ class="label"<#t/>
+</#if>
+ ><#t/>
+<#if parameters.required?default(false)>
+ <span class="required">*</span><#t/>
+</#if>
+ ${parameters.label?html}:
+<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
+ </label><#t/>
+<#if parameters.labelposition?default("top") == 'top'>
+</div> <br/><#rt/>
+<#else>
+</span> <#rt/>
+</#if>
+</#if>
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl Sun May 28 07:17:17 2006
@@ -1,54 +1,4 @@
-<#--
- Only show message if errors are available.
- This will be done if ActionSupport is used.
--->
-<#assign hasFieldErrors = parameters.name?exists && fieldErrors?exists && fieldErrors[parameters.name]?exists/>
-<div <#rt/><#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
-
-<#if hasFieldErrors>
-<div <#rt/><#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
-<#list fieldErrors[parameters.name] as error>
- <div<#rt/>
- <#if parameters.id?exists>
- errorFor="${parameters.id}"<#rt/>
- </#if>
- class="errorMessage">
- ${error?html}
- </div><#t/>
-</#list>
-</div><#t/>
-</#if>
-
-<#if parameters.label?exists>
-<#if parameters.labelposition?default("top") == 'top'>
-<div <#rt/>
-<#else>
-<span <#rt/>
-</#if>
-<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
- <label <#t/>
-<#if parameters.id?exists>
- for="${parameters.id?html}" <#t/>
-</#if>
-<#if hasFieldErrors>
- class="errorLabel"<#t/>
-<#else>
- class="label"<#t/>
-</#if>
- ><#t/>
-<#if parameters.required?default(false)>
- <span class="required">*</span><#t/>
-</#if>
- ${parameters.label?html}:
-<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
- </label><#t/>
-<#if parameters.labelposition?default("top") == 'top'>
-</div> <br/><#rt/>
-<#else>
-</span> <#rt/>
-</#if>
-</#if>
-
+<#include "/${parameters.templateDir}/css_xhtml/controlheader-core.ftl">
<#if parameters.labelposition?default("top") == 'top'>
<div <#rt/>
<#else>
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/datepicker.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/doubleselect.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/doubleselect.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/doubleselect.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/doubleselect.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/doubleselect.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/file.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/file.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/file.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/file.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/file.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-close.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-close.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-close.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/form-close.ftl Sun May 28 07:17:17 2006
@@ -1,2 +1,3 @@
+<#include "/${parameters.templateDir}/xhtml/control-close.ftl" />
<#include "/${parameters.templateDir}/simple/form-close.ftl" />
<#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/form.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/form.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/form.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/form.ftl Sun May 28 07:17:17 2006
@@ -1,2 +1,3 @@
<#include "/${parameters.templateDir}/css_xhtml/form-validate.ftl" />
<#include "/${parameters.templateDir}/simple/form.ftl" />
+<#include "/${parameters.templateDir}/css_xhtml/control.ftl">
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/label.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/label.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/label.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/label.ftl Sun May 28 07:17:17 2006
@@ -1,4 +1,5 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<label<#rt/>
<#if parameters.id?exists>
id="${parameters.id?html}"<#rt/>
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/optiontransferselect.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/password.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/password.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/password.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/password.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/password.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/radiomap.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/radiomap.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/radiomap.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/radiomap.ftl Sun May 28 07:17:17 2006
@@ -1,4 +1,5 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/radiomap.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
<#nt/>
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/richtexteditor.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/richtexteditor.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/richtexteditor.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/richtexteditor.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/richtexteditor.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/select.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/select.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/select.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/select.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/select.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/text.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/text.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/text.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/text.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" / -->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/text.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/textarea.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/textarea.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/textarea.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/textarea.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/textarea.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/css_xhtml/updownselect.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/css_xhtml/updownselect.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/css_xhtml/updownselect.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/css_xhtml/updownselect.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/updownselect.ftl" />
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Added: struts/action2/trunk/core/src/main/resources/template/xhtml/control-close.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/xhtml/control-close.ftl?rev=409958&view=auto
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/xhtml/control-close.ftl (added)
+++ struts/action2/trunk/core/src/main/resources/template/xhtml/control-close.ftl Sun May 28 07:17:17 2006
@@ -0,0 +1 @@
+</table>
\ No newline at end of file
Added: struts/action2/trunk/core/src/main/resources/template/xhtml/control.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/xhtml/control.ftl?rev=409958&view=auto
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/xhtml/control.ftl (added)
+++ struts/action2/trunk/core/src/main/resources/template/xhtml/control.ftl Sun May 28 07:17:17 2006
@@ -0,0 +1,4 @@
+<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
+<#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+>
\ No newline at end of file
Modified: struts/action2/trunk/core/src/main/resources/template/xhtml/form-close.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/xhtml/form-close.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/xhtml/form-close.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/xhtml/form-close.ftl Sun May 28 07:17:17 2006
@@ -1,3 +1,3 @@
-</table>
+<#include "/${parameters.templateDir}/xhtml/control-close.ftl" />
<#include "/${parameters.templateDir}/simple/form-close.ftl" />
<#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" />
Modified: struts/action2/trunk/core/src/main/resources/template/xhtml/form.ftl
URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/xhtml/form.ftl?rev=409958&r1=409957&r2=409958&view=diff
==============================================================================
--- struts/action2/trunk/core/src/main/resources/template/xhtml/form.ftl (original)
+++ struts/action2/trunk/core/src/main/resources/template/xhtml/form.ftl Sun May 28 07:17:17 2006
@@ -1,6 +1,3 @@
<#include "/${parameters.templateDir}/xhtml/form-validate.ftl" />
<#include "/${parameters.templateDir}/simple/form.ftl" />
-<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
-<#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}"<#rt/>
-</#if>
->
+<#include "/${parameters.templateDir}/xhtml/control.ftl" />