From e7c13ecf865e4e279a7b459fd33012831eecb699 Mon Sep 17 00:00:00 2001
From: Scott Andrews <sandrews@vmware.com>
Date: Fri, 7 Mar 2008 21:28:48 +0000
Subject: [PATCH] applied keith's polish from booking-faces

---
 .../main/webapp/WEB-INF/layouts/standard.jsp  |  4 +-
 .../src/main/webapp/WEB-INF/login.jsp         | 13 +++--
 .../src/main/webapp/css/booking.css           | 54 +++++++++++++------
 3 files changed, 45 insertions(+), 26 deletions(-)
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 85a7d8c8..6ac5d32c 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
@@ -5,7 +5,7 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Spring Faces: Hotel Booking Sample Application</title>
+	<title>Spring Web Flow: Hotel Booking Sample Application</title>
 	<style type="text/css" media="screen">
         @import url("<c:url value="/resources/css-framework/css/tools.css" />");
         @import url("<c:url value="/resources/css-framework/css/typo.css" />");
@@ -33,7 +33,7 @@
 			</div>
 		</div>
 		<div id="branding" class="spring">
-			<img src="<c:url value="/images/header.jpg"/>"/>
+			<a href="<c:url value="/" />"><img src="<c:url value="/images/header.jpg"/>"/></a>
 		</div>
 	</div>
 	<div id="content" class="clearfix spring">
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
index 5376e9c8..893c0b89 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
@@ -12,14 +12,13 @@
 
 <h1>Login Required</h1>
 
-<c:if test="${not empty param.login_error}">
-	<div class="errors">
-		Your login attempt was not successful, try again.<br /><br />
-		Reason: <%= ((AuthenticationException) session.getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
-	</div>
-</c:if>
-
 <div class="section">
+	<c:if test="${not empty param.login_error}">
+		<div class="errors">
+			Your login attempt was not successful, try again.<br /><br />
+			Reason: <%= ((AuthenticationException) session.getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
+		</div>
+	</c:if>
 	<p>Valid username/passwords are:</p>
 	<ul>
 		<li>keith/melbourne</li>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/css/booking.css b/spring-webflow-samples/booking-mvc/src/main/webapp/css/booking.css
index 1319ecf6..88df724d 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/css/booking.css
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/css/booking.css
@@ -1,18 +1,15 @@
-	a, a:link a:active {		
-		color: black;		
-		background-color: white;
-		text-decoration: underline;
-	}
-		
-	a:visited {
-		color: black;		
+	a, a:visited, a:link, a:active  {		
+		color: #59924B;
 		background-color: transparent;
+		text-decoration: none;
+		font-weight: bold;
 	}
-		
+	
 	a:hover {		
 		color: white;		
 		background-color: #65a242;		
 		text-decoration: none;		
+		font-weight: bold;
 	}
 	
 	body.spring {
@@ -28,10 +25,8 @@
 	#branding.spring {
 		float: none;
         width: 100%;
-            
         margin: 10px 0 0 0;
         padding: 0 0 0 0;
-            
         text-align: none;
     }
     
@@ -47,6 +42,12 @@
     	float: right;
     }
     
+    #content.spring form div, 
+    #content.spring form p {
+    	padding: 0px;
+		margin: 0 0 .5em 0;
+    }
+    
     #content.spring {
     	width: 740px;
     	background: #fff url(../images/bg.gif) 0 0 repeat;
@@ -56,9 +57,10 @@
     #content .section {
     	width: 505px;
     	float: left;
+    	margin-bottom: 5px;
     }
     
-    #content.spring input[type="submit"], input[type="button"] {
+    #content.spring input[type="submit"], input[type="button"], button {
 		font-weight: bold;
 		color: #fff;
 		height: 20px;
@@ -67,9 +69,28 @@
 		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: center;
+		text-align: left;
 		color: #600;
 	}
 	
@@ -109,16 +130,15 @@
 	}
 	
 	#content .buttonGroup {
-		width: 90%;
-		float: left;
-		text-align: center;
+		clear: both;
+		text-align: right;
 	}
 	
 	#content .buttonGroup input[type="submit"], .buttonGroup input[type="button"] {
 		margin-right: 5px;
 	}
 	
-	#content .prev {
+	#content .previous {
 		float: right;
 	}
 	
