Clean up.

This commit is contained in:
Jeremy Grelle
2008-03-27 15:27:14 +00:00
parent b7d674ff11
commit 18b0fde44a
3 changed files with 35 additions and 20 deletions

View File

@@ -55,45 +55,61 @@
</managed-bean>
<navigation-rule>
<from-view-id>/main/reviewHotels.xhtml</from-view-id>
<navigation-case>
<from-outcome>changeSearch</from-outcome>
<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>select</from-outcome>
<to-view-id>/main/reviewHotel.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/main/enterSearchCriteria.xhtml</from-view-id>
<navigation-case>
<from-outcome>reviewHotels</from-outcome>
<to-view-id>/main/reviewHotels.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>select</from-outcome>
<to-view-id>/main/reviewHotel.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/main/reviewHotel.xhtml</from-view-id>
<navigation-case>
<from-outcome>book</from-outcome>
<to-view-id>/booking/enterBookingDetails.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/booking/enterBookingDetails.xhtml</from-view-id>
<navigation-case>
<from-outcome>reviewBooking</from-outcome>
<to-view-id>/booking/reviewBooking.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/booking/reviewBooking.xhtml</from-view-id>
<navigation-case>
<from-outcome>revise</from-outcome>
<to-view-id>/booking/enterBookingDetails.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>confirm</from-outcome>
<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>reviewBooking</from-outcome>
<to-view-id>/booking/reviewBooking.xhtml</to-view-id>
<from-outcome>cancel</from-outcome>
<to-view-id>/main/enterSearchCriteria.xhtml</to-view-id>
</navigation-case>
</navigation-rule>

View File

@@ -2,8 +2,7 @@
<ui:composition 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:sf="http://www.springframework.org/tags/faces"
xmlns:f="http://java.sun.com/jsf/core"
template="/WEB-INF/layouts/standard.xhtml">
<ui:define name="content">
@@ -47,8 +46,8 @@
<div class="section">
<h:form id="hotel">
<fieldset class="buttonGroup">
<h:commandButton id="book" ajaxEnabled="false" action="book" value="Book Hotel"/>&#160;
<h:commandButton id="cancel" ajaxEnabled="false" action="cancel" value="Back to Search"/>
<h:commandButton id="book" action="book" value="Book Hotel"/>&#160;
<h:commandButton id="cancel" action="cancel" value="Back to Search"/>
</fieldset>
<h:inputText id="hotelId" value="#{hotelController.hotelId}" style="visibility:hidden"/>
</h:form>