From 38b6ab7a1b3ab4f3ca6bd07959e8d5663299578b Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Thu, 17 Jul 2014 00:11:27 -0400
Subject: [PATCH] changed user button on top bar to drop down, tweaked login
 page, closes #635

---
 .../src/main/webapp/WEB-INF/tags/topbar.tag   | 14 ++++----
 .../src/main/webapp/WEB-INF/views/login.jsp   |  2 +-
 .../webapp/resources/css/mitreid-connect.css  | 34 +++++++++++++++++++
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
index 62d62bc82..36dfe686d 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
@@ -80,21 +80,23 @@
 	
 						</security:authorize>
 	
-					<div class="nav pull-right">
+					<ul class="nav pull-right">
 	                    <security:authorize access="hasRole('ROLE_USER')">
-						<div class="btn-group">
-							<a class="btn btn-primary btn-small dropdown-toggle" data-toggle="dropdown" href=""><i class="icon-user icon-white"></i> ${ shortName } <span class="caret"></span></a>
+						<li class="dropdown">
+							<a id="userButton" class="dropdown-toggle" data-toggle="dropdown" href=""><i class="icon-user icon-white"></i> ${ shortName } <span class="caret"></span></a>
 							<ul class="dropdown-menu pull-right">
 								<li><a href="manage/#user/profile" data-toggle="collapse" data-target=".nav-collapse">${ longName }</a></li>
 								<li class="divider"></li>
 								<li><a href="logout" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-remove"></i> Log out</a></li>
 							</ul>
-						</div>
+						</li>
 	                    </security:authorize>
 	                    <security:authorize access="!hasRole('ROLE_USER')">
-	                    	<a class="btn btn-primary btn-small" href="login" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-user icon-white"></i> Log in</a>
+	                    <li>
+	                    	<a id="userButton" href="login" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-lock icon-white"></i> Log in</a>
+	                    </li>
 	                    </security:authorize>
-	                </div>
+	                </ul>
 	                    
 	            </div><!--/.nav-collapse -->
 			</c:if>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
index 6588affb7..5a15629e9 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
@@ -38,7 +38,7 @@ $(document).ready(function() {
 						<input type="password" placeholder="Password" autocorrect="off" autocapitalize="off" autocomplete="off" spellcheck="false" id="j_password" name="j_password">
 					</div>
 				</div>
-				<div class="form-actions">
+				<div>
 					<input type="submit" class="btn" value="Login" name="submit">
 				</div>
 			</form>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css b/openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css
index dce867df6..d36df88b6 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css
+++ b/openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css
@@ -25,6 +25,40 @@ h1,label {
 	left: -6px;
 }
 
+/* login button */
+
+.navbar #userButton {
+    background-color: #006dcc;
+    background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+    background-repeat: repeat-x;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    color: #ffffff;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    box-shadow: 0 3px 8px rgba(255, 255, 255, 0.125) inset;
+    font-size: 0.9em;
+}
+
+.navbar #userButton:focus, .navbar #userButton:hover {
+	background-color: #0044cc;
+    color: #ffffff;
+    background-position: 0 -15px;
+    text-decoration: none;
+    transition: background-position 0.1s linear 0s;
+}
+
+.navbar #userButton:active {
+	background-color: #0044cc;
+    color: #ffffff;
+	background-image: none;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
+    outline: 0 none;
+}
+
+.navbar #userButton .caret {
+    border-bottom-color: #ffffff;
+    border-top-color: #ffffff;
+}
+
 /* Wrapper for page content to push down footer */
 #wrap {
 	min-height: 100%;