andromdaplugins-cvs

[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout head.xhtml.vsl layout.xhtml.vsl

[Leif J. <le...@us...>]

  User: leifj   
  Date: 06/12/30 12:10:22

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
                        head.xhtml.vsl layout.xhtml.vsl
  Log:
  layout bugfixes
  
  Revision  Changes    Path
  1.2       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/head.xhtml.vsl
  
  Index: head.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/head.xhtml.vsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- head.xhtml.vsl	5 Dec 2006 19:39:25 -0000	1.1
  +++ head.xhtml.vsl	30 Dec 2006 20:10:22 -0000	1.2
  @@ -9,7 +9,7 @@
       <meta HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=UTF-8"/>
       <title>#{messages['application.name']}<c:if test="${!empty viewTitle}"> ~ ${viewTitle}</c:if></title>
   #if ($outputCustomResources)
  -    <link rel="stylesheet" type="text/css" href="css/custom.css" />
  +    <link rel="stylesheet" type="text/css" href="/css/custom.css" />
   #end
       <trh:script source="/js/common.js"/>
       <trh:script source="/js/key-events.js"/>
  
  
  
  1.3       +10 -12    cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
  
  Index: layout.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- layout.xhtml.vsl	11 Dec 2006 13:43:57 -0000	1.2
  +++ layout.xhtml.vsl	30 Dec 2006 20:10:22 -0000	1.3
  @@ -11,7 +11,7 @@
       <ui:insert name="head">
           <ui:include src="head.xhtml"/>  
       </ui:insert>
  -
  +    <c:set var="remoteUser" value="${pageContext.request.remoteUser}" scope="request"/>
       <trh:body>
         <tr:form> 
           <ui:insert name="title"/>
  @@ -26,33 +26,31 @@
               </f:facet>
   #if ($stringUtils.isNotBlank($securityRealm))
               <f:facet name="infoUser">
  -               <c:set var="remoteUser" value="${pageContext.request.remoteUser}" scope="request"/>
  -               <c:if test="${!empty remoteUser}">
  -                  <t:graphicImage url="/images/user.gif"/>
  +               <tr:panelGroupLayout>
  +                  <tr:image source="/images/user.gif"/>
                        <h:outputText value=" #{remoteUser}"/>
  -                  </h:panelGroup>
  -               </c:if>
  +               </tr:panelGroupLayout>
               </f:facet>
   #end
   #if ($navigationStyle.equals("full"))
               <f:facet name="navigation1">
                   <tr:navigationPane hint="tabs" level="0" var="item" value="#{menuModel.model}">
                     <f:facet name="nodeStamp">
  -                    <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
  +                    <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
                     </f:facet>
                   </tr:navigationPane>
               </f:facet>
               <f:facet name="navigation2">
                   <tr:navigationPane hint="bar" level="1" var="item" value="#{menuModel.model}">
                     <f:facet name="nodeStamp">
  -                    <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
  +                    <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
                     </f:facet>
                   </tr:navigationPane>
               </f:facet>
               <f:facet name="navigation3">
                   <tr:navigationPane hint="list" level="2" var="item" value="#{menuModel.model}">
                     <f:facet name="nodeStamp">
  -                    <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
  +                    <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
                     </f:facet>
                   </tr:navigationPane>
               </f:facet>
  @@ -61,7 +59,7 @@
   	    <f:facet name="navigation3">
                   <tr:navigationTree var="item" value="#{menuModel.model}">
                      <f:facet name="nodeStamp">
  -                      <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
  +                      <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
                      </f:facet>
                   </tr:navigationTree>
               </f:facet>
  @@ -79,7 +77,7 @@
               <f:facet name="location">
                   <tr:breadCrumbs var="item" value="#{menuModel.model}">
                     <f:facet name="nodeStamp">
  -                    <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
  +                    <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
                     </f:facet>
                   </tr:breadCrumbs>
               </f:facet>
  
  
  

[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout head.xhtml.vsl layout.xhtml.vsl

[Leif J. <le...@us...>]

  User: leifj   
  Date: 07/02/23 13:19:38

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
                        head.xhtml.vsl layout.xhtml.vsl
  Log:
  reach request via the ExternalContext
  
  Revision  Changes    Path
  1.3       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/head.xhtml.vsl
  
  Index: head.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/head.xhtml.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- head.xhtml.vsl	30 Dec 2006 20:10:22 -0000	1.2
  +++ head.xhtml.vsl	23 Feb 2007 21:19:38 -0000	1.3
  @@ -9,7 +9,7 @@
       <meta HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=UTF-8"/>
       <title>#{messages['application.name']}<c:if test="${!empty viewTitle}"> ~ ${viewTitle}</c:if></title>
   #if ($outputCustomResources)
  -    <link rel="stylesheet" type="text/css" href="/css/custom.css" />
  +    <link rel="stylesheet" type="text/css" href="${facesContext.externalContext.request.contextPath}/css/custom.css" />
   #end
       <trh:script source="/js/common.js"/>
       <trh:script source="/js/key-events.js"/>
  
  
  
  1.5       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
  
  Index: layout.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- layout.xhtml.vsl	18 Jan 2007 10:11:07 -0000	1.4
  +++ layout.xhtml.vsl	23 Feb 2007 21:19:38 -0000	1.5
  @@ -11,7 +11,7 @@
       <ui:insert name="head">
           <ui:include src="head.xhtml"/>  
       </ui:insert>
  -    <c:set var="remoteUser" value="${pageContext.request.remoteUser}" scope="request"/>
  +    <c:set var="remoteUser" value="${facesContext.externalContext.request.userPrincipal.name}" scope="request"/>
       <trh:body>
         <tr:form> 
           <ui:insert name="title"/>