From f45e6993755fbf820021fe1dbb88f519459be44d Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 6 May 2010 11:46:33 +0000 Subject: [PATCH] SWF-219 Synch up with changes made to travel sample in spring-samples repo - add blueprint css, improve markup and layout. --- .../webapp/WEB-INF/config/webmvc-config.xml | 1 - .../WEB-INF/hotels/booking/bookingForm.jsp | 183 ------------ .../hotels/booking/enterBookingDetails.jsp | 199 ++++++++++++- .../WEB-INF/hotels/booking/reviewBooking.jsp | 109 ++++--- .../webapp/WEB-INF/hotels/booking/views.xml | 7 +- .../webapp/WEB-INF/hotels/hotelSearchForm.jsp | 43 --- .../src/main/webapp/WEB-INF/hotels/list.jsp | 68 +++-- .../src/main/webapp/WEB-INF/hotels/search.jsp | 2 +- .../main/webapp/WEB-INF/hotels/searchForm.jsp | 36 +++ .../src/main/webapp/WEB-INF/hotels/show.jsp | 62 ++-- .../src/main/webapp/WEB-INF/hotels/views.xml | 2 +- .../src/main/webapp/WEB-INF/intro.jsp | 24 +- .../main/webapp/WEB-INF/layouts/standard.jsp | 60 ++-- .../layouts/{layouts.xml => views.xml} | 0 .../src/main/webapp/WEB-INF/login.jsp | 85 +++--- .../src/main/webapp/images/header.jpg | Bin 24347 -> 29843 bytes .../src/main/webapp/images/springone2gx.jpeg | Bin 0 -> 1643 bytes .../webapp/styles/blueprint/icons/cross.png | Bin 0 -> 655 bytes .../webapp/styles/blueprint/icons/key.png | Bin 0 -> 455 bytes .../webapp/styles/blueprint/icons/tick.png | Bin 0 -> 537 bytes .../src/main/webapp/styles/blueprint/ie.css | 36 +++ .../blueprint/plugins/buttons/icons/cross.png | Bin 0 -> 655 bytes .../blueprint/plugins/buttons/icons/key.png | Bin 0 -> 455 bytes .../blueprint/plugins/buttons/icons/tick.png | Bin 0 -> 537 bytes .../blueprint/plugins/buttons/readme.txt | 32 ++ .../blueprint/plugins/buttons/screen.css | 97 ++++++ .../blueprint/plugins/fancy-type/readme.txt | 14 + .../blueprint/plugins/fancy-type/screen.css | 71 +++++ .../plugins/link-icons/icons/doc.png | Bin 0 -> 777 bytes .../plugins/link-icons/icons/email.png | Bin 0 -> 641 bytes .../plugins/link-icons/icons/external.png | Bin 0 -> 46848 bytes .../plugins/link-icons/icons/feed.png | Bin 0 -> 691 bytes .../blueprint/plugins/link-icons/icons/im.png | Bin 0 -> 741 bytes .../plugins/link-icons/icons/pdf.png | Bin 0 -> 591 bytes .../plugins/link-icons/icons/visited.png | Bin 0 -> 46990 bytes .../plugins/link-icons/icons/xls.png | Bin 0 -> 663 bytes .../blueprint/plugins/link-icons/readme.txt | 18 ++ .../blueprint/plugins/link-icons/screen.css | 40 +++ .../styles/blueprint/plugins/rtl/readme.txt | 10 + .../styles/blueprint/plugins/rtl/screen.css | 110 +++++++ .../main/webapp/styles/blueprint/print.css | 29 ++ .../main/webapp/styles/blueprint/screen.css | 280 +++++++++++++++++ .../webapp/styles/blueprint/src/forms.css | 65 ++++ .../main/webapp/styles/blueprint/src/grid.css | 281 ++++++++++++++++++ .../main/webapp/styles/blueprint/src/grid.png | Bin 0 -> 161 bytes .../main/webapp/styles/blueprint/src/ie.css | 76 +++++ .../webapp/styles/blueprint/src/print.css | 85 ++++++ .../webapp/styles/blueprint/src/reset.css | 38 +++ .../styles/blueprint/src/typography.css | 106 +++++++ .../src/main/webapp/styles/booking.css | 195 +++--------- 50 files changed, 1858 insertions(+), 606 deletions(-) delete mode 100644 spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp delete mode 100644 spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/hotelSearchForm.jsp create mode 100644 spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp rename spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/{layouts.xml => views.xml} (100%) create mode 100644 spring-webflow-samples/booking-mvc/src/main/webapp/images/springone2gx.jpeg create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/cross.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/key.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/tick.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/ie.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/cross.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/key.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/tick.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/readme.txt create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/screen.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/fancy-type/readme.txt create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/doc.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/email.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/external.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/feed.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/im.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/pdf.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/visited.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/xls.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/readme.txt create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/screen.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/rtl/readme.txt create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/rtl/screen.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/print.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/screen.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/forms.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/grid.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/grid.png create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/ie.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/print.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/reset.css create mode 100755 spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/typography.css diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml index b7bbdeec..30d94771 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml @@ -28,7 +28,6 @@ - /WEB-INF/layouts/layouts.xml /WEB-INF/**/views.xml diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp deleted file mode 100644 index 3b8b3ff6..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp +++ /dev/null @@ -1,183 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - -
-
-
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} -
-
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
-
- - - - - -
-
-
-
- Smoking Preference: -
-
- - - -
-
-
-
- Amenities: -
-
-
    -
    • -
    • -
    • -
- -
-
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - -
-
-
-   - -   -
-
- \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp index 2e9eae23..a8abff97 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp @@ -1,13 +1,196 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> -
-

Book Hotel

-
- -
- - +
+
+

${booking.hotel.name}

+ +
+ ${booking.hotel.address} +
+ ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} +
+ ${booking.hotel.country} +
+

+ Nightly rate: ${status.value} +

+
+
+ +
+ + +
+ + +
+ + +
+ Book Hotel +
+
+ +
+
+

+ + +
+
+
+
+ +
+
+

+ +
+
+
+
+ +
+
+

+ + + + + +

+
+
+
+
+ Smoking Preference: +
+
+

+ + +

+ +
+
+
+
+ Amenities: +
+
+

+ +
+ +
+ +

+ +
+
+
+
+ +
+
+

+ +
+
+
+
+ +
+
+

+ +
+
+
+
+ +
+
+

+ + + + + + + + + + + + + + + + + + + + + +

+
+
+
+

+ + +

+ +
+
+ +
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp index ace908a9..f7ecf680 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp @@ -2,60 +2,59 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -
-

Confirm Hotel Booking

-
+
+
+

${booking.hotel.name}

+ +
+ ${booking.hotel.address} +
+ ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} +
+ ${booking.hotel.country} +
+
+
+ +
+ Confirm Booking Details +
+
Check In:
+
+

${status.value}

+
+
+
+
Checkout:
+
+

${status.value}

+
+
+
+
Number of Nights:
+
+

${status.value}

+
+
+
+
Total Payment:
+
+

${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-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml index 41acc432..3e1ee8b1 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml @@ -6,12 +6,7 @@ - - - - - - + diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/hotelSearchForm.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/hotelSearchForm.jsp deleted file mode 100644 index ea4a9ff8..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/hotelSearchForm.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - - - -
- - - -

Search Hotels

-
-
-
- -
-
- - -
-
-
-
- -
-
- - - - - -
-
-
- -
-
-
- \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp index 76c6c9a3..fdd08803 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp @@ -2,21 +2,19 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -
-

Hotel Results

-
+

Hotel Results

-Change Search - + Change Search +

-
+
@@ -46,26 +44,30 @@
- - Previous Results - - - - More Results - - +
+ + Previous Results + + +
+
+ + More Results + + +
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp index 6c11411f..50d79b91 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp @@ -1,5 +1,5 @@ <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> - + diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp new file mode 100644 index 00000000..255bea20 --- /dev/null +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp @@ -0,0 +1,36 @@ +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> + +

Search Hotels

+ + + + + + +
+
+ + + +
+
+
+ + + + + + +
+
+
+ +
+
+ \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp index 3e33ab0d..f11287c1 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp @@ -2,47 +2,21 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -
-

View Hotel

-
- -
- -
-
-
Name:
-
${hotel.name}
-
-
-
Address:
-
${hotel.address}
-
-
-
City:
-
${hotel.city}
-
-
-
State:
-
${hotel.state}
-
-
-
Zip:
-
${hotel.zip}
-
-
-
Country:
-
${hotel.country}
-
-
-
Nightly rate:
-
- ${status.value} -
-
- -
-   -
-
- -
+

${hotel.name}

+
+ ${hotel.address} +
+ ${hotel.city}, ${hotel.state}, ${hotel.zip} +
+ ${hotel.country} +
+
+

+ Nightly Rate: + ${status.value} +

+ +
+ +
+
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml index b015d388..42e7bc09 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml @@ -8,7 +8,7 @@ - + diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp index 666e4860..3b812dcd 100755 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp @@ -1,10 +1,10 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -
+

Welcome to Spring Travel

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

+

The key features illustrated in this sample include:

@@ -12,17 +12,19 @@
  • 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 Expression Language (SpEL) integration
    • +
  • Spring 3 formatting annotations @DateTimeFormat, @NumberFormat
    • +
  • Spring MVC custom namespace
  • Spring Security integration
    • -
  • Annotated POJO @Controllers for implementing RESTful user interactions. +
  • Annotated POJO @Controllers for implementing RESTful user interactions.
  • Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library
    • -
  • Page layout and composition with Tiles
    • -
  • A Javascript API for decorating HTML elements with behaviors such as Ajax, validation, and effects. +
  • Page layout and composition with Apache Tiles
    • +
  • A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.
    • +
  • A grid layout with Blueprint CSS
  • Exception handling support across all layers of the application
    • -
  • Spring IDE tooling integration, with support for graphical flow modeling and visualization
    • +
  • SpringSource Tool Suite integration, with support for graphical flow modeling and visualization
    • -

    +

    Start your Spring Travel experience

    diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp index 0187a9c1..f816617c 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp @@ -7,24 +7,21 @@ Spring Travel: Spring MVC and Web Flow Reference Application " /> - + " type="text/css" media="screen, projection" /> + " type="text/css" media="print" /> + + " type="text/css" media="screen" /> - -
    -