From 60581276a7d340c8b57d31809a776a260ae00d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Mon, 24 Dec 2012 03:08:04 +0100
Subject: [PATCH] Added bookingsTable.html, reconfigured JSP layout for old
 pages.

---
 .../webapp/WEB-INF/hotels/booking/views.xml   |  4 +-
 .../webapp/WEB-INF/hotels/bookingsTable.html  | 38 +++++++++++++++++++
 .../src/main/webapp/WEB-INF/hotels/views.xml  |  4 +-
 .../src/main/webapp/WEB-INF/layouts/views.xml |  3 +-
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html

diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
index dd3cb6d..6350717 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
@@ -5,11 +5,11 @@
 	
 <tiles-definitions>
 	
-	<definition name="enterBookingDetails" extends="standardLayout" templateType="jsp">
+	<definition name="enterBookingDetails" extends="standardLayoutJSP" templateType="jsp">
 		<put-attribute name="body" value="/WEB-INF/hotels/booking/enterBookingDetails.jsp" type="jsp"/>
 	</definition>
 	
-	<definition name="reviewBooking" extends="standardLayout" templateType="jsp">
+	<definition name="reviewBooking" extends="standardLayoutJSP" templateType="jsp">
 		<put-attribute name="body" value="/WEB-INF/hotels/booking/reviewBooking.jsp" type="jsp"/>
 	</definition>
 	
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
new file mode 100644
index 0000000..a2e80ca
--- /dev/null
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
@@ -0,0 +1,38 @@
+<div id="bookings" sec:authorize="hasRole('ROLE_USER')">
+
+	<h2>Current Hotel Bookings</h2>
+
+	<p th:unless="${bookingList}">
+		No bookings found
+	</p>
+
+	<table class="summary" th:if="${bookingList}">
+		<thead>
+			<tr>
+				<th>Name</th>
+				<th>Address</th>
+				<th>City, State</th>
+				<th>Check in Date</th>
+				<th>Check out Date</th>
+				<th>Confirmation Number</th>
+				<th>Action</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr th:each="booking : ${bookingList}" th:object="${booking}">
+				<td th:text="*{hotel.name}">The Herb Plaza</td>
+				<td th:text="*{hotel.address}">Thyme Square, 13</td>
+				<td th:text="*{hotel.city} + ', ' + *{hotel.state}">Icetown, North Pole</td>
+				<td th:text="*{checkinDate}">2012-12-21</td>
+				<td th:text="*{checkoutDate}">2012-12-21</td>
+				<td th:text="*{id}">1</td>
+				<td>
+                    <form action="#" th:action="@{'/bookings/' + *{id}}" th:method="'delete'">
+                        <button type="submit">Cancel</button>
+                    </form>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+    
+</div>
\ No newline at end of file
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
index 0520de3..9f8de24 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
@@ -9,12 +9,12 @@
 		<put-attribute name="body">
 			<definition template="hotels/search.html" templateType="thymeleaf">
 				<put-attribute name="searchForm" value="hotels/searchForm.html" type="thymeleaf"/>
-				<put-attribute name="bookingsTable" value="/WEB-INF/hotels/bookingsTable.jsp" type="jsp"/>
+				<put-attribute name="bookingsTable" value="hotels/bookingsTable.html" type="thymeleaf"/>
 			</definition>
 		</put-attribute>
 	</definition>
 
-	<definition name="hotels/*" extends="standardLayout">
+	<definition name="hotels/*" extends="standardLayoutJSP" templateType="jsp">
 		<put-attribute name="body" value="/WEB-INF/hotels/{1}.jsp" type="jsp"/>
 	</definition>
 
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
index c09aca8..5ebccd9 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
@@ -6,5 +6,6 @@
 <tiles-definitions>
 	
     <definition name="standardLayout" template="layouts/standard.html" templateType="thymeleaf"/>
-	
+    <definition name="standardLayoutJSP" template="/WEB-INF/layouts/standard.jsp" templateType="jsp"/>
+    	
 </tiles-definitions>