From f762b160efd5cafd919a6fd7f9587f578eceb454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Oct 2011 16:59:44 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 src/com/gitblit/wicket/pages/ChangePasswordPage.html |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.html b/src/com/gitblit/wicket/pages/ChangePasswordPage.html
index 031352e..938e0ec 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.html
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.html
@@ -4,20 +4,9 @@
       xml:lang="en"  
       lang="en"> 
       
-	<!-- Head with Wicket-controlled resources in this package -->
-	<wicket:head>
-   		<title wicket:id="title">[page title]</title>
-		<link rel="stylesheet" type="text/css" href="gitblit.css"/>
-		<link rel="shortcut icon" href="gitblt-favicon.png" type="image/png" />
-	</wicket:head>
-	
+	<wicket:extend>
 	<body onload="document.getElementById('password').focus();">
 		<div>
-			<div style="padding-top: 10px;text-align:center;">
-				<img src="gitblt_25.png" alt="Gitblit"/><br/>
-				<div style="padding-top:30px;font-weight:bold;" wicket:id="name"></div>
-			</div>
-			<p/>
 			<form style="text-align:center;" wicket:id="passwordForm">
 				<center>
 					<table class="plain">
@@ -30,11 +19,11 @@
 						<td class="edit"><input type="password" wicket:id="confirmPassword" size="30" tabindex="2" /></td>
 					</tr>
 					</table>
-					<input type="submit" wicket:message="value:gb.save" wicket:id="save" tabindex="3" />
-					<input type="submit" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="4" />
-					<div style="padding-top:10px;" wicket:id="feedback"></div>
+					<input class="btn" type="submit" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="3" />
+					<input class="btn primary" type="submit" wicket:message="value:gb.save" wicket:id="save" tabindex="4" />
 				</center>
 			</form>			
 		</div>
 	</body>
+	</wicket:extend>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1