diff --git a/gazelle-proxy-war/src/main/webapp/layout/menu.xhtml b/gazelle-proxy-war/src/main/webapp/layout/menu.xhtml index de4146cba8e7ed47bc5ce7d3a8b62d0d9855c15c..34cd59fbcfda9d9dbb5c5258df215617951eb645 100644 --- a/gazelle-proxy-war/src/main/webapp/layout/menu.xhtml +++ b/gazelle-proxy-war/src/main/webapp/layout/menu.xhtml @@ -5,14 +5,15 @@ xmlns:s="http://jboss.com/products/seam/taglib" xmlns:rich="http://richfaces.org/rich"> <rich:toolBarGroup> - <s:link id="menuChannels" view="/channels.xhtml" value="#{messages['net.ihe.gazelle.proxy.ChannelList']}" + <s:link id="menuChannels" view="/channels.xhtml" + value="#{messages['net.ihe.gazelle.proxy.ChannelList']}" propagation="none" /> <s:link id="menuNewChannel" view="/newchannel.xhtml" - value="#{messages['net.ihe.gazelle.proxy.NewChannel']}" propagation="none" - rendered="#{s:hasRole('admin_role')}" /> - <s:link id="menuMessagesList" view="/messages.xhtml" - value="#{messages['net.ihe.gazelle.proxy.MessagesList']}" propagation="none" /> - + value="#{messages['net.ihe.gazelle.proxy.NewChannel']}" + propagation="none" rendered="#{s:hasRole('admin_role')}" /> + <s:link id="menuMessagesList" view="/messages.seam?messageType=HTTP" + value="#{messages['net.ihe.gazelle.proxy.MessagesList']}" + propagation="none" /> <a href="http://gazelle.ihe.net/content/proxy">#{messages['net.ihe.gazelle.proxy.Help']}</a> </rich:toolBarGroup> @@ -20,10 +21,12 @@ <h:outputText id="menuWelcomeId" value="#{messages['net.ihe.gazelle.proxy.SignedInAs_2']}: #{credentials.username}" rendered="#{identity.loggedIn}" /> - <s:link id="menuLoginCasId" view="/cas/home.xhtml" value="#{messages['net.ihe.gazelle.proxy.Login']}" + <s:link id="menuLoginCasId" view="/cas/home.xhtml" + value="#{messages['net.ihe.gazelle.proxy.Login']}" rendered="#{not identity.loggedIn}" propagation="none" /> <s:link id="menuLogoutId" view="/channels.xhtml" - action="#{identity.logout}" value="#{messages['net.ihe.gazelle.proxy.Logout']}" + action="#{identity.logout}" + value="#{messages['net.ihe.gazelle.proxy.Logout']}" rendered="#{identity.loggedIn}" propagation="none" /> </rich:toolBarGroup>