[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes messages.jspf.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/05/28 12:42:30

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
                        messages.xhtml.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes
                        messages.jspf.vsl
  Log:
  make regular jsp/facelets messages use the new settable messages title property
  
  Revision  Changes    Path
  1.4       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/messages.xhtml.vsl
  
  Index: messages.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/messages.xhtml.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- messages.xhtml.vsl	27 May 2008 16:15:09 -0000	1.3
  +++ messages.xhtml.vsl	28 May 2008 19:42:29 -0000	1.4
  @@ -3,6 +3,6 @@
         xmlns:tr="http://myfaces.apache.org/trinidad"
         xmlns:h="http://java.sun.com/jsf/html">
       <ui:composition>
  -        <tr:messages globalOnly="true" text="#{messages['errors.header']}" rendered="#{!hideGlobalMessages}"/>
  +        <tr:messages globalOnly="true" text="#{${formMessagesProperty}Title}" rendered="#{!hideGlobalMessages}"/>
       </ui:composition>
   </html>
  
  
  
  1.3       +4 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/messages.jspf.vsl
  
  Index: messages.jspf.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/messages.jspf.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- messages.jspf.vsl	27 May 2008 16:15:09 -0000	1.2
  +++ messages.jspf.vsl	28 May 2008 19:42:30 -0000	1.3
  @@ -1 +1,4 @@
  -<h:messages errorClass="error" warnClass="warn" fatalClass="fatal" infoClass="info" globalOnly="true" rendered="#{!hideGlobalMessages}"/>
  +<h:panelGrid columns="1" cellpadding="2" cellspacing="2" rendered="#{!hideGlobalMessages and !empty facesContext.maximumSeverity}">
  +    <h:outputText value="#{${formMessagesProperty}Title}" escape="false" rendered="#{!empty ${formMessagesProperty}Title}"/>
  +    <h:messages globalOnly="true" showDetail="false"/>
  +</h:panelGrid>