Author: dan.j.allen Date: 2010-06-16 13:21:08 -0400 (Wed, 16 Jun 2010) New Revision: 13186 Modified: examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml examples/trunk/booking-simplified/src/main/webapp/hotel.xhtml Log: navigation Modified: examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml =================================================================== --- examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml 2010-06-16 16:53:35 UTC (rev 13185) +++ examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml 2010-06-16 17:21:08 UTC (rev 13186) @@ -20,12 +20,16 @@ <div id="status"> <h:outputText value="(#{currentUser.name})" rendered="#{identity.loggedIn}" styleClass="user"/> #{' '} - <h:link id="about" outcome="/home.xhtml" value="About"/> + <h:link id="home" outcome="/home.xhtml" value="Home"/> #{' | '} - <h:link id="search" outcome="/search.xhtml" value="Search"/> + <h:link id="search" outcome="/search.xhtml" value="Find a Hotel"/> + <h:panelGroup rendered="#{not identity.loggedIn}"> + #{' | '} + <h:link id="login" outcome="home" value="Login"/> + </h:panelGroup> <h:panelGroup rendered="#{identity.loggedIn}"> #{' | '} - <h:link id="settings" outcome="/password.xhtml" value="Settings"/> + <h:link id="settings" outcome="/password.xhtml" value="Account"/> #{' | '} <h:commandLink id="logout" action="#{identity.logout}" value="Logout"/> </h:panelGroup> Modified: examples/trunk/booking-simplified/src/main/webapp/hotel.xhtml =================================================================== --- examples/trunk/booking-simplified/src/main/webapp/hotel.xhtml 2010-06-16 16:53:35 UTC (rev 13185) +++ examples/trunk/booking-simplified/src/main/webapp/hotel.xhtml 2010-06-16 17:21:08 UTC (rev 13186) @@ -22,6 +22,9 @@ <ui:include src="/WEB-INF/fragments/hotel.xhtml"/> <div class="buttonBox"> + <h:panelGroup rendered="#{not identity.loggedIn}"> + <p style="text-align: center;">You must login to book a hotel.</p> + </h:panelGroup> <h:form id="actions"> <h:commandButton id="bookHotel" action="#{bookingAgent.bookHotel}" value="Book Hotel" rendered="#{identity.loggedIn}"/> #{' '}