[jboss-cvs] jboss-seam/seam-gen/view/layout ...
Gavin King
gavin.king at jboss.com
Fri Mar 9 18:55:07 EST 2007
User: gavin
Date: 07/03/09 18:55:07
Modified: seam-gen/view/layout menu.xhtml menu.xhtml.ftl
template.xhtml
Log:
integrate richfaces with seam-gen JBSEAM-1004
Revision Changes Path
1.4 +13 -4 jboss-seam/seam-gen/view/layout/menu.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: menu.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/layout/menu.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- menu.xhtml 31 Jan 2007 04:45:36 -0000 1.3
+++ menu.xhtml 9 Mar 2007 23:55:07 -0000 1.4
@@ -1,8 +1,17 @@
-<div class="menuButtons"
+<rich:toolBar
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.com/products/seam/taglib">
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+ <rich:toolBarGroup>
+ <h:outputText value="#{projectName}:"/>
<s:link view="/home.xhtml" value="Home"/>
-</div>
+ </rich:toolBarGroup>
+ <rich:toolBarGroup location="right">
+ <h:outputText value="Welcome, #{identity.username}" rendered="#{identity.loggedIn}"/>
+ <s:link view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}"/>
+ <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
+ </rich:toolBarGroup>
+</rich:toolBar>
1.5 +17 -8 jboss-seam/seam-gen/view/layout/menu.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: menu.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/layout/menu.xhtml.ftl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- menu.xhtml.ftl 10 Feb 2007 02:04:37 -0000 1.4
+++ menu.xhtml.ftl 9 Mar 2007 23:55:07 -0000 1.5
@@ -1,13 +1,22 @@
-<div class="menuButtons"
+<rich:toolBar
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.com/products/seam/taglib">
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+ <rich:toolBarGroup>
+ <h:outputText value="${'#'}{projectName}:"/>
<s:link view="/home.xhtml" value="Home"/>
+ </rich:toolBarGroup>
<#foreach entity in c2j.getPOJOIterator(cfg.classMappings)>
<s:link view="/${entity.shortName}List.xhtml"
value="${entity.shortName} List"
propagation="none"/>
</#foreach>
-</div>
+ <rich:toolBarGroup location="right">
+ <h:outputText value="Welcome, ${'#'}{identity.username}" rendered="${'#'}{identity.loggedIn}"/>
+ <s:link view="/login.xhtml" value="Login" rendered="${'#'}{not identity.loggedIn}"/>
+ <s:link view="/home.xhtml" action="${'#'}{identity.logout}" value="Logout" rendered="${'#'}{identity.loggedIn}"/>
+ </rich:toolBarGroup>
+</rich:toolBar>
1.9 +3 -3 jboss-seam/seam-gen/view/layout/template.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: template.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/layout/template.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- template.xhtml 9 Feb 2007 22:49:38 -0000 1.8
+++ template.xhtml 9 Mar 2007 23:55:07 -0000 1.9
@@ -13,8 +13,9 @@
<body>
- <ui:include src="menu.xhtml"/>
- <ui:include src="loginout.xhtml"/>
+ <ui:include src="menu.xhtml">
+ <ui:param name="projectName" value="@projectName@"/>
+ </ui:include>
<div class="body">
@@ -25,7 +26,6 @@
<s:span> <s:message/></s:span>
</f:facet>
- <h1>@projectName@</h1>
<ui:insert name="body"/>
</div>
More information about the jboss-cvs-commits
mailing list