diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp index dffcb5af..7d4df312 100644 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp +++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp @@ -3,105 +3,103 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -
-

Book Hotel

-
+

Book Hotel

-
- - - - - -
-
-
Name:
-
${booking.hotel.name}
-
-
-
Address:
-
${booking.hotel.address}
-
-
-
City, State:
-
${booking.hotel.city}, ${booking.hotel.state}
-
-
-
Zip:
-
${booking.hotel.zip}
-
-
-
Country:
-
${booking.hotel.country}
-
-
-
Nightly rate:
-
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name:${booking.hotel.name}
Address:${booking.hotel.address}
City, State:${booking.hotel.city}, ${booking.hotel.state}
Zip:${booking.hotel.zip}
Country:${booking.hotel.country}
Nightly rate: ${status.value} - - -
-
+
- -
+
- - -
-
+
- -
+
- - -
-
+
- -
+
- - -
-
+
- -
+
- - -
-
+
- -
+
- - -
-
+
- -
+
- - -
-
+
- -
+
@@ -123,12 +121,14 @@ - - -
-   -   -
- - - +
  +   +
+
+ diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp index 1709d2d9..614a51cf 100644 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp +++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp @@ -3,63 +3,63 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -
-

Confirm Hotel Booking

-
+

Confirm Hotel Booking

-
- - - - + + + +
-
-
Name:
-
${booking.hotel.name}
-
-
-
Address:
-
${booking.hotel.address}
-
-
-
City, State:
-
${booking.hotel.city}, ${booking.hotel.state}
-
-
-
Zip:
-
${booking.hotel.zip}
-
-
-
Country:
-
${booking.hotel.country}
-
-
-
Total payment:
-
- ${status.value} -
-
-
-
Check In Date:
-
- ${status.value} -
-
-
-
Check Out Date:
-
- ${status.value} -
-
-
-
Credit Card #:
-
${booking.creditCard}
-
-
-   -   -   -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name:${booking.hotel.name}
Address:${booking.hotel.address}
City, State:${booking.hotel.city}, ${booking.hotel.state}
Zip:${booking.hotel.zip}
Country:${booking.hotel.country}
Total payment: + ${status.value} +
Check In Date: + ${status.value} +
Check Out Date: + + ${status.value} +
Credit Card #:${booking.creditCard}
+   +   +   +
- -
+ diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp index 9472b102..d8be01ee 100644 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp +++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp @@ -5,42 +5,38 @@ - -
- - - -

Search Hotels

-
- - - - - - - - -
-
+ +

Search Hotels

+ + + +
+ + + + + + + + +
-
-

Current Hotel Bookings

- - - - - - - - - - - - - - - +

Current Hotel Bookings

+
NameAddressCity, StateCheck in DateCheck out DateConfirmation NumberAction
+ + + + + + + + + + + + + @@ -57,12 +53,11 @@ Cancel - - - - - - - -
NameAddressCity, StateCheck in DateCheck out DateConfirmation NumberAction
${booking.hotel.name} ${booking.hotel.address}
No booking history
-
+ + + + No booking history + + + + diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp index fc9e219e..6a237fbb 100644 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp +++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp @@ -3,51 +3,51 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -
-

View Hotel

-
+

View Hotel

-
- - - - - -
-
-
Name:
-
${hotel.name}
-
-
-
Address:
-
${hotel.address}
-
-
-
City:
-
${hotel.city}
-
-
-
State:
-
${hotel.state}
-
-
-
Zip:
-
${hotel.zip}
-
-
-
Country:
-
${hotel.country}
-
-
-
Nightly rate:
-
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name:${hotel.name}
Address:${hotel.address}
City:${hotel.city}
State:${hotel.state}
Zip:${hotel.zip}
Country:${hotel.country}
Nightly rate: ${status.value} - - -
-   -   -
- - - +
+   +   +
+
+ diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp index 4d0abfea..ad86c5ed 100644 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp +++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp @@ -2,24 +2,20 @@ <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -
-

Hotel Results

-
+

Hotel Results

- -
- - - - - - - - - - - - +
NameAddressCity, StateZipAction
+ + + + + + + + + + + @@ -34,13 +30,11 @@ View Hotel - - - - - - - -
NameAddressCity, StateZipAction
${hotel.name} ${hotel.address}
No hotels found
-
- + + + + No hotels found + + + + diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp index 28d33eaa..7e345b28 100644 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp +++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp @@ -1,33 +1,28 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %> -
-

Welcome to Spring Travel

-

- This reference application shows how to use Spring MVC and Web Flow together with JavaServerPages (JSP) and Tiles to power web applications. -

-

- The key features illustrated in this sample include: -

-
    -
  • A declarative navigation model enabling full browser button support and dynamic navigation rules
    • -
  • A fine-grained state management model, including support for ConversationScope and ViewScope
    • -
  • Modularization of web application functionality by domain use case, illustrating project structure best-practices
    • -
  • Managed persistence contexts with the Java Persistence API (JPA)
    • -
  • Unified Expression Language (EL) integration
    • -
  • Spring Security integration
    • -
  • Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library -
  • Applying reusable page layouts with Tiles
    • -
  • Exception handling support across all layers of the application
    • -
  • Spring IDE tooling integration, with support for graphical flow modeling and visualization
    • -
-

- - - - - - Start your Spring Travel experience - -

-
+

Welcome to Spring Travel

+

+ This reference application shows how to use Spring MVC and Web Flow together with JavaServerPages (JSP) in a portlet. +

+

+ The key features illustrated in this sample include: +

+
    +
  • A declarative navigation model enabling full browser button support and dynamic navigation rules
    • +
  • A fine-grained state management model, including support for ConversationScope and ViewScope
    • +
  • Managed persistence contexts with the Java Persistence API (JPA)
    • +
  • Unified Expression Language (EL) integration
    • +
  • Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library +
  • Exception handling support across all layers of the application
    • +
  • Spring IDE tooling integration, with support for graphical flow modeling and visualization
    • +
+

+ + + + + + Start your Spring Travel experience + +

diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web-application-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web-application-config.xml index 464302d1..da63cc6f 100644 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web-application-config.xml +++ b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web-application-config.xml @@ -25,18 +25,7 @@ - - - - - - - - - - - - +