From fd39215c26f703e72620cf712b030c8dfb1c50e6 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 24 Apr 2008 05:07:52 +0000
Subject: [PATCH] polish l&f

---
 .../src/main/webapp/styles/booking.css        |   1 +
 .../hotels/booking/enterBookingDetails.jsp    |   2 +-
 .../WEB-INF/hotels/booking/reviewBooking.jsp  |   2 +-
 .../webapp/WEB-INF/hotels/hotelResults.jsp    |  24 +-
 .../src/main/webapp/WEB-INF/hotels/index.jsp  |  82 +++----
 .../src/main/webapp/WEB-INF/hotels/search.jsp |   2 +-
 .../src/main/webapp/WEB-INF/hotels/show.jsp   |   2 +-
 .../src/main/webapp/styles/booking.css        | 214 +++++++-----------
 8 files changed, 143 insertions(+), 186 deletions(-)

diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css
index 0d8714ec..8cb0bf14 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css
@@ -80,6 +80,7 @@
 	}
 
   	.section {
+  		text-align: left;
     	width: 505px;
     	float: left;
     	margin-bottom: 5px;
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 2225a220..a319b472 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
@@ -3,7 +3,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
 <div class="section">
-	<h1>Book Hotel</h1>
+	<h2>Book Hotel</h2>
 </div>
 
 <div class="section">
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 9251b74d..ace908a9 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
@@ -3,7 +3,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
 <div class="section">
-	<h1>Confirm Hotel Booking</h1>
+	<h2>Confirm Hotel Booking</h2>
 </div>
 
 <div class="section">
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/hotelResults.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/hotelResults.jsp
index 7ba71a83..fbca4f52 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/hotelResults.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/hotelResults.jsp
@@ -28,19 +28,7 @@
 			</c:if>
 		</tbody>
 	</table>
-	<div class="next">
-		<c:if test="${not empty hotels}">
-			<a id="moreResultsLink" href="search?searchString=${searchCriteria.searchString}&pageSize=${searchCriteria.pageSize}&page=${searchCriteria.page + 1}">More Results</a>
-			<script>
-				Spring.addDecoration(new Spring.AjaxEventDecoration({
-					elementId: "moreResultsLink",
-					event: "onclick",
-					params: {fragments: "hotelResults"}		
-				}));
-			</script>
-		</c:if>
-	</div>
-	<div class="prev">
+	<div class="buttonGroup">
 		<c:if test="${searchCriteria.page > 0}">
 			<a id="prevResultsLink" href="search?searchString=${searchCriteria.searchString}&pageSize=${searchCriteria.pageSize}&page=${searchCriteria.page - 1}">Previous Results</a>
 			<script>
@@ -51,6 +39,16 @@
 				}));
 			</script>
 		</c:if>
+		<c:if test="${not empty hotels}">
+			<a id="moreResultsLink" href="search?searchString=${searchCriteria.searchString}&pageSize=${searchCriteria.pageSize}&page=${searchCriteria.page + 1}">More Results</a>
+			<script>
+				Spring.addDecoration(new Spring.AjaxEventDecoration({
+					elementId: "moreResultsLink",
+					event: "onclick",
+					params: {fragments: "hotelResults"}		
+				}));
+			</script>
+		</c:if>		
 	</div>
 </c:if>
 </div>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
index 7733edcb..5b974f14 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
@@ -7,7 +7,7 @@
     <span class="errors">
     	<form:errors path="*"/>
     </span>
-	<h1>Search Hotels</h1>
+	<h2>Search Hotels</h2>
 	<fieldset>
 		<div class="field">
 			<div class="label">
@@ -43,41 +43,45 @@
 </form:form>
 
 <security:authorize ifAllGranted="ROLE_USER">
-	<div class="section">
-		<h1>Current Hotel Bookings</h1>
-		
-		<table class="summary">
-			<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>
-				<c:forEach var="booking" items="${bookings}">
-				<tr>
-					<td>${booking.hotel.name}</td>
-					<td>${booking.hotel.address}</td>
-					<td>${booking.hotel.city}, ${booking.hotel.state}</td>
-					<td>${booking.checkinDate}</td>
-					<td>${booking.checkoutDate}</td>
-					<td>${booking.id}</td>
-					<td>
-						<a href="deleteBooking?id=${booking.id}">Cancel</a>
-					</td>
-				</tr>
-				</c:forEach>
-				<c:if test="${empty bookings}">
-				<tr>
-					<td colspan="7">No booking history</td>
-				</tr>
-				</c:if>
-			</tbody>
-		</table>
-	</div>
-</security:authorize>
+<div class="section">
+	<h2>Current Hotel Bookings</h2>
+
+	<c:if test="${empty bookings}">
+	<tr>
+		<td colspan="7">No bookings found</td>
+	</tr>
+	</c:if>
+
+	<c:if test="${!empty bookings}">
+	<table class="summary">
+		<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>
+			<c:forEach var="booking" items="${bookings}">
+			<tr>
+				<td>${booking.hotel.name}</td>
+				<td>${booking.hotel.address}</td>
+				<td>${booking.hotel.city}, ${booking.hotel.state}</td>
+				<td>${booking.checkinDate}</td>
+				<td>${booking.checkoutDate}</td>
+				<td>${booking.id}</td>
+				<td>
+					<a href="deleteBooking?id=${booking.id}">Cancel</a>
+				</td>
+			</tr>
+			</c:forEach>
+		</tbody>
+	</table>
+	</c:if>
+
+</div>
+</security:authorize>
\ No newline at end of file
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 08628f59..f1f2eb99 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,7 +1,7 @@
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 
 <div id="heading" class="section">
-	<h1>Hotel Results</h1>
+	<h2>Hotel Results</h2>
 </div>
 
 <tiles:insertAttribute name="hotelResults" />	
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 6dc285cd..3e33ab0d 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
@@ -3,7 +3,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
 <div class="section">
-	<h1>View Hotel</h1>
+	<h2>View Hotel</h2>
 </div>
 
 <div class="section">
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css
index 01c22a43..8cb0bf14 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css
@@ -11,11 +11,17 @@
 		text-decoration: none;		
 		font-weight: bold;
 	}
-	
+
 	body.spring {
 		background-color: #9cac7c;
 	}
-	
+
+    form div, 
+    form p {
+    	padding: 0px;
+		margin: 0 0 .5em 0;
+    }
+    
 	#header.spring { 
 		margin: 0 0 1em 0;
         padding: 0px 0px;
@@ -27,6 +33,7 @@
         width: 100%;
         margin: 10px 0 0 0;
         padding: 0 0 0 0;
+        text-align: none;
     }
     
     #welcome {
@@ -40,135 +47,13 @@
     #welcome div.right {
     	float: right;
     }
-    
-    form div, 
-    form p {
-    	padding: 0px;
-		margin: 0 0 .5em 0;
-    }
-    
+        
     #content.spring {
     	width: 740px;
     	background: #fff url(../images/bg.gif) 0 0 repeat;
     	margin-bottom: 0px;
     }
-    
-    #content .section {
-    	width: 505px;
-    	float: left;
-    	margin-bottom: 5px;
-    }
-    
-    #content.spring input[type="submit"],
-    #content.spring input[type="button"], 
-    #content.spring button {
-		font-weight: bold;
-		color: #fff;
-		height: 20px;
-		background: #fff url(../images/btn.bg.gif) 0 0 repeat-x;
-		border-style: none;
-		vertical-align: middle;
-	}
-	
-	#content.spring button
-	{
-		font-size: 1em;
-		font-family: arial,helvetica,verdana,sans-serif;
-		margin-top: 0pt;
-		margin-right: 0pt;
-		margin-bottom: 0pt;
-		margin-left: 0pt;
-		padding-top: 2px;
-		padding-right: 2px;
-		padding-bottom: 2px;
-		padding-left: 2px;
-	}
-	
-	#content.spring button
-	{
-		vertical-align: middle;
-	}
-	
-	.errors {
-		font-weight: bold;
-		text-align: left;
-		color: #600;
-	}
-	
-	.errors ul {
-		list-style: none;
-	}
-	
-	#content .field {
-		float:left;
-	}
-	
-	#content .field .label {
-		float: left;
-		padding-top: 5px;
-		padding-right: 5px;
-		font-weight: bold;
-		width: 150px;
-		text-align: right;
-	}
-	
-	#content .field .output {
-		float: left;
-		width: 250px;
-		padding-top: 5px;
-		text-align: left;
-	}
-	
-	#content .field .input {
-		float: left;
-		width: 250px;
-		text-align: left;
-	}
-	
-	#content .searchGroup {
-		width: 35%;
-	}
-	
-	#content .buttonGroup {
-		clear: both;
-		margin-top: 5px;
-		text-align: right;
-	}
-	
-	#content .previous {
-		float: right;
-	}
-	
-	#content .next {
-		float: right;	
-	}
-	
-	#content .next a {
-		margin-left: 20px;
-	}
-	
-	#content .summary {
-		width: 100%;
-		border: 1px solid #414f23;
-		border-collapse: collapse;
-	}
-	
-	#content .summary thead th {
-		border-left: 1px solid #414f23;
-		background: #fff url(../images/th.bg.gif) 0 100% repeat-x;
-		border-bottom: 1px solid #414f23;
-		padding: 6px;
-		text-align: left;
-		font-size: small;
-	}
-    
-    #content .summary tbody td {
-		border-left: 1px solid #9cac7c;
-		padding: 4px;
-		border-bottom: 1px solid #9cac7c;
-		font-size: 8pt;
-	}
-    
+
     #local.spring{
         width: 215px;
     }
@@ -184,7 +69,76 @@
     	padding-right: 20px;
     }
     
-    div#header a {
-    	color: inherit;
-    	background-color: inherit;
-    }
\ No newline at end of file
+	.errors {
+		font-weight: bold;
+		text-align: left;
+		color: #600;
+	}
+	
+	.errors ul {
+		list-style: none;
+	}
+
+  	.section {
+  		text-align: left;
+    	width: 505px;
+    	float: left;
+    	margin-bottom: 5px;
+    }
+    
+	.field {
+		float:left;
+	}
+	
+	.field .label {
+		float: left;
+		padding-top: 5px;
+		padding-right: 5px;
+		font-weight: bold;
+		width: 150px;
+		text-align: right;
+	}
+	
+	.field .input {
+		float: left;
+		width: 250px;
+		text-align: left;
+	}
+
+	.field .output {
+		float: left;
+		width: 250px;
+		padding-top: 5px;
+		text-align: left;
+	}
+	
+	.buttonGroup {
+		clear: both;
+		text-align: right;
+	}
+	
+	.buttonGroup input[type="submit"], .buttonGroup input[type="button"], .buttonGroup a {
+		margin-right: 5px;
+	}
+	
+	.summary {
+		width: 100%;
+		border: 1px solid #414f23;
+		border-collapse: collapse;
+	}
+	
+	.summary thead th {
+		border-left: 1px solid #414f23;
+		background: #fff url(../images/th.bg.gif) 0 100% repeat-x;
+		border-bottom: 1px solid #414f23;
+		padding: 6px;
+		text-align: left;
+		font-size: small;
+	}
+    
+    .summary tbody td {
+		border-left: 1px solid #9cac7c;
+		padding: 4px;
+		border-bottom: 1px solid #9cac7c;
+		font-size: 8pt;
+	}
\ No newline at end of file