[seam-commits] Seam SVN: r9262 - in trunk/seam-gen: view/layout and 1 other directory.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sat Oct 11 17:21:16 EDT 2008
Author: dan.j.allen
Date: 2008-10-11 17:21:16 -0400 (Sat, 11 Oct 2008)
New Revision: 9262
Modified:
trunk/seam-gen/icefaces/view/layout/menu.xhtml
trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl
trunk/seam-gen/view/layout/menu.xhtml
trunk/seam-gen/view/layout/menu.xhtml.ftl
Log:
conversation should not be propagated for links in the toolbar since these are "exit" or "sidestep" links
Modified: trunk/seam-gen/icefaces/view/layout/menu.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/layout/menu.xhtml 2008-10-11 21:14:55 UTC (rev 9261)
+++ trunk/seam-gen/icefaces/view/layout/menu.xhtml 2008-10-11 21:21:16 UTC (rev 9262)
@@ -12,14 +12,14 @@
<ice:panelGrid id="menuPanelGrid" columns="2" columnClasses="leftMenu,rightMenu">
<ice:panelGroup id="menuPanelGroupLeft" >
<h:outputText id="menuProjectName" value="#{projectName}:"/>
- <s:link id="menuHomeId" view="/home.xhtml" value="Home"/>
+ <s:link id="menuHomeId" view="/home.xhtml" value="Home" propagation="none"/>
<!-- @newMenuItem@ -->
</ice:panelGroup>
<ice:panelGroup id="menuPanelGroupRight" >
<h:outputText id="menuWelcomeId" value="signed in as: #{identity.username}" rendered="#{identity.loggedIn}"/>
- <s:link id="menuLoginId" view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}"/>
- <s:link id="menuLogoutId" view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
+ <s:link id="menuLoginId" view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}" propagation="none"/>
+ <s:link id="menuLogoutId" view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}" propagation="none"/>
</ice:panelGroup>
</ice:panelGrid>
</td>
Modified: trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2008-10-11 21:14:55 UTC (rev 9261)
+++ trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2008-10-11 21:21:16 UTC (rev 9262)
@@ -12,7 +12,7 @@
<ice:panelGrid id="menuPanelGrid" columns="2" columnClasses="leftMenu,rightMenu">
<ice:panelGroup id="leftMenuId" >
<ice:outputText id="menuProjectNameId" value="${'#'}{projectName}:"/>
- <s:link id="menuHomeId" view="/home.xhtml" value="Home"/>
+ <s:link id="menuHomeId" view="/home.xhtml" value="Home" propagation="none"/>
<#foreach entity in c2j.getPOJOIterator(cfg.classMappings)>
<s:link view="/${entity.shortName}List.xhtml"
value="${entity.shortName} List"
@@ -25,8 +25,8 @@
</ice:panelGroup>
<ice:panelGroup id="rightMenuId">
<h:outputText id="menuWelcomeId" value="signed in as: ${'#'}{identity.username}" rendered="${'#'}{identity.loggedIn}"/>
- <s:link view="/login.xhtml" id="menuLoginId" value="Login" rendered="${'#'}{not identity.loggedIn}" />
- <s:link view="/home.xhtml" id="menulogoutId" action="${'#'}{identity.logout}" value="Logout" rendered="${'#'}{identity.loggedIn}"/>
+ <s:link view="/login.xhtml" id="menuLoginId" value="Login" rendered="${'#'}{not identity.loggedIn}" propagation="none"/>
+ <s:link view="/home.xhtml" id="menulogoutId" action="${'#'}{identity.logout}" value="Logout" rendered="${'#'}{identity.loggedIn}" propagation="none"/>
</ice:panelGroup>
</ice:panelGrid>
</td>
Modified: trunk/seam-gen/view/layout/menu.xhtml
===================================================================
--- trunk/seam-gen/view/layout/menu.xhtml 2008-10-11 21:14:55 UTC (rev 9261)
+++ trunk/seam-gen/view/layout/menu.xhtml 2008-10-11 21:21:16 UTC (rev 9262)
@@ -7,12 +7,12 @@
xmlns:rich="http://richfaces.org/rich">
<rich:toolBarGroup>
<h:outputText value="#{projectName}:"/>
- <s:link view="/home.xhtml" value="Home"/>
+ <s:link view="/home.xhtml" value="Home" propagation="none"/>
</rich:toolBarGroup>
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
<h:outputText value="signed in as: #{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}"/>
+ <s:link view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}" propagation="none"/>
+ <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}" propagation="none"/>
</rich:toolBarGroup>
</rich:toolBar>
Modified: trunk/seam-gen/view/layout/menu.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/layout/menu.xhtml.ftl 2008-10-11 21:14:55 UTC (rev 9261)
+++ trunk/seam-gen/view/layout/menu.xhtml.ftl 2008-10-11 21:21:16 UTC (rev 9262)
@@ -7,7 +7,7 @@
xmlns:rich="http://richfaces.org/rich">
<rich:toolBarGroup>
<h:outputText value="${'#'}{projectName}:"/>
- <s:link view="/home.xhtml" value="Home"/>
+ <s:link view="/home.xhtml" value="Home" propagation="none"/>
</rich:toolBarGroup>
<#foreach entity in c2j.getPOJOIterator(cfg.classMappings)>
<s:link view="/${entity.shortName}List.xhtml"
@@ -19,7 +19,7 @@
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
<h:outputText value="signed in as: ${'#'}{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}"/>
+ <s:link view="/login.xhtml" value="Login" rendered="${'#'}{not identity.loggedIn}" propagation="none"/>
+ <s:link view="/home.xhtml" action="${'#'}{identity.logout}" value="Logout" rendered="${'#'}{identity.loggedIn}" propagation="none"/>
</rich:toolBarGroup>
</rich:toolBar>
More information about the seam-commits
mailing list