Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-1304

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@409958 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Toby Jee
2006-05-28 14:17:17 +00:00
parent 52b4d7c9bc
commit b57be5495d
33 changed files with 111 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
+1
View File
@@ -109,6 +109,7 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine {
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)
core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
+1 -1
View File
@@ -134,7 +134,7 @@ public class FreemarkerResult extends StrutsResultSupport {
String base = ResourceUtil.getResourceBase(req);
location = base + "/" + location;
}
Template template = configuration.getTemplate(location, deduceLocale());
TemplateModel model = createModel();
core/src/main/resources/template/ajax/controlheader.ftl
+4 -1
View File
@@ -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" />
core/src/main/resources/template/ajax/form.ftl
+4 -1
View File
@@ -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>
>
-->
core/src/main/resources/template/ajax/head.ftl
+2 -1
View File
@@ -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"
core/src/main/resources/template/ajax/submit-ajax.ftl
+6 -1
View File
@@ -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" />
core/src/main/resources/template/ajax/submit.ftl
+2 -1
View File
@@ -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>
core/src/main/resources/template/ajax/textarea.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/ajax/theme.properties
+1 -1
View File
@@ -1 +1 @@
parent = xhtml
parent=xhtml
core/src/main/resources/template/css_xhtml/checkboxlist.ftl
+2 -1
View File
@@ -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/>
core/src/main/resources/template/css_xhtml/combobox.ftl
+2 -1
View File
@@ -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/>
core/src/main/resources/template/css_xhtml/control-close.ftl
View File
core/src/main/resources/template/css_xhtml/control.ftl
View File
core/src/main/resources/template/css_xhtml/controlheader-core.ftl
+50
View File
@@ -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>
core/src/main/resources/template/css_xhtml/controlheader.ftl
+1 -51
View File
@@ -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>
core/src/main/resources/template/css_xhtml/datepicker.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/doubleselect.ftl
+2 -1
View File
@@ -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/>
core/src/main/resources/template/css_xhtml/file.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/form-close.ftl
+1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/form.ftl
+1
View File
@@ -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">
core/src/main/resources/template/css_xhtml/label.ftl
+2 -1
View File
@@ -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/>
core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/password.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/radiomap.ftl
+2 -1
View File
@@ -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/>
core/src/main/resources/template/css_xhtml/richtexteditor.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/select.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/text.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/textarea.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/css_xhtml/updownselect.ftl
+2 -1
View File
@@ -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" />
core/src/main/resources/template/xhtml/control-close.ftl
+1
View File
@@ -0,0 +1 @@
</table>
core/src/main/resources/template/xhtml/control.ftl
+4
View File
@@ -0,0 +1,4 @@
<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
<#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}"<#rt/>
</#if>
>
core/src/main/resources/template/xhtml/form-close.ftl
+1 -1
View File
@@ -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" />
core/src/main/resources/template/xhtml/form.ftl
+1 -4
View File
@@ -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" />