Author: dan.j.allen Date: 2008-09-23 15:05:42 -0400 (Tue, 23 Sep 2008) New Revision: 9125 Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml branches/community/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl branches/community/Seam_2_0/seam-gen/view/layout/menu.xhtml branches/community/Seam_2_0/seam-gen/view/layout/menu.xhtml.ftl Log: having "Welcome, username!" in the upper-right hand corner is annoying changing it to "signed in as: username" Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml =================================================================== --- branches/community/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml 2008-09-23 17:11:01 UTC (rev 9124) +++ branches/community/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml 2008-09-23 19:05:42 UTC (rev 9125) @@ -17,7 +17,7 @@ </ice:panelGroup> <ice:panelGroup id="menuPanelGroupRight" > - <h:outputText id="menuWelcomeId" value="Welcome, #{identity.username}" rendered="#{identity.loggedIn}"/> + <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}"/> </ice:panelGroup> Modified: branches/community/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl =================================================================== --- branches/community/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2008-09-23 17:11:01 UTC (rev 9124) +++ branches/community/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2008-09-23 19:05:42 UTC (rev 9125) @@ -22,7 +22,7 @@ <!-- @newMenuItem@ --> </ice:panelGroup> <ice:panelGroup id="rightMenuId"> - <h:outputText id="menuWelcomeId" value="Welcome,${'#'}{identity.username}" rendered="${'#'}{identity.loggedIn}"/> + <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}"/> </ice:panelGroup> Modified: branches/community/Seam_2_0/seam-gen/view/layout/menu.xhtml =================================================================== --- branches/community/Seam_2_0/seam-gen/view/layout/menu.xhtml 2008-09-23 17:11:01 UTC (rev 9124) +++ branches/community/Seam_2_0/seam-gen/view/layout/menu.xhtml 2008-09-23 19:05:42 UTC (rev 9125) @@ -11,7 +11,7 @@ </rich:toolBarGroup> <!-- @newMenuItem@ --> <rich:toolBarGroup location="right"> - <h:outputText value="Welcome, #{identity.username}!" rendered="#{identity.loggedIn}"/> + <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}"/> </rich:toolBarGroup> Modified: branches/community/Seam_2_0/seam-gen/view/layout/menu.xhtml.ftl =================================================================== --- branches/community/Seam_2_0/seam-gen/view/layout/menu.xhtml.ftl 2008-09-23 17:11:01 UTC (rev 9124) +++ branches/community/Seam_2_0/seam-gen/view/layout/menu.xhtml.ftl 2008-09-23 19:05:42 UTC (rev 9125) @@ -16,7 +16,7 @@ </#foreach> <!-- @newMenuItem@ --> <rich:toolBarGroup location="right"> - <h:outputText value="Welcome, ${'#'}{identity.username}!" rendered="${'#'}{identity.loggedIn}"/> + <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}"/> </rich:toolBarGroup>