Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 69222 invoked from network); 1 Aug 2007 16:22:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Aug 2007 16:22:43 -0000 Received: (qmail 66810 invoked by uid 500); 1 Aug 2007 16:22:42 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 66412 invoked by uid 500); 1 Aug 2007 16:22:41 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 66403 invoked by uid 99); 1 Aug 2007 16:22:41 -0000 Received: from Unknown (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2007 09:22:41 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2007 16:22:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5B26B1A981A; Wed, 1 Aug 2007 09:22:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r561856 - in /struts/struts2/trunk/core/src/main/resources/template/simple: actionerror.ftl actionmessage.ftl fielderror.ftl Date: Wed, 01 Aug 2007 16:22:19 -0000 To: commits@struts.apache.org From: jholmes@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070801162220.5B26B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jholmes Date: Wed Aug 1 09:22:11 2007 New Revision: 561856 URL: http://svn.apache.org/viewvc?view=rev&rev=561856 Log: WW-2080 actionError, actionMessage and fieldError Freemarker templates do not honor the cssClass and cssStyle attributes Modified: struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl Modified: struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl?view=diff&rev=561856&r1=561855&r2=561856 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl Wed Aug 1 09:22:11 2007 @@ -23,7 +23,16 @@ <#if (actionErrors?exists && actionErrors?size > 0)>
    <#list actionErrors as error> -
  • ${error}
    • +
  • +<#if parameters.cssClass?exists> + class="${parameters.cssClass?html}"<#rt/> +<#else> + class="errorMessage"<#rt/> + +<#if parameters.cssStyle?exists> + style="${parameters.cssStyle?html}"<#rt/> + +>${error}
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl?view=diff&rev=561856&r1=561855&r2=561856 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl Wed Aug 1 09:22:11 2007 @@ -23,7 +23,16 @@ <#if (actionMessages?exists && actionMessages?size > 0)>
    <#list actionMessages as message> -
  • ${message}
    • +
  • +<#if parameters.cssClass?exists> + class="${parameters.cssClass?html}"<#rt/> +<#else> + class="actionMessage"<#rt/> + +<#if parameters.cssStyle?exists> + style="${parameters.cssStyle?html}"<#rt/> + +>${message}
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl?view=diff&rev=561856&r1=561855&r2=561856 ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl Wed Aug 1 09:22:11 2007 @@ -37,7 +37,16 @@ <#assign doneStartUlTag=true><#t/> <#t/> <#list eValue as eEachValue><#t/> -
  • ${eEachValue}
    • +
  • +<#if parameters.cssClass?exists> + class="${parameters.cssClass?html}"<#rt/> +<#else> + class="errorMessage"<#rt/> + +<#if parameters.cssStyle?exists> + style="${parameters.cssStyle?html}"<#rt/> + +>${eEachValue}
    • <#t/> <#t/> <#t/> @@ -52,7 +61,16 @@ <#list eKeys as eKey><#t/> <#assign eValue = fieldErrors[eKey]><#t/> <#list eValue as eEachValue><#t/> -
  • ${eEachValue}
    • +
  • +<#if parameters.cssClass?exists> + class="${parameters.cssClass?html}"<#rt/> +<#else> + class="errorMessage"<#rt/> + +<#if parameters.cssStyle?exists> + style="${parameters.cssStyle?html}"<#rt/> + +>${eEachValue}
    • <#t/> <#t/>