From 5cc40c89abafdcccbc8a5b2cf3890780ccff908e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 9 Feb 2012 17:41:23 -0500
Subject: [PATCH] Rearranged button order to properly set default (issue 60)

Also indicate password change aborted if it is canceled.
---
 src/com/gitblit/wicket/pages/ChangePasswordPage.html | 4 ++--
 src/com/gitblit/wicket/pages/ChangePasswordPage.java | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.html b/src/com/gitblit/wicket/pages/ChangePasswordPage.html
index 938e0eca..e72ef1ed 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.html
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.html
@@ -19,8 +19,8 @@
 						<td class="edit"><input type="password" wicket:id="confirmPassword" size="30" tabindex="2" /></td>
 					</tr>
 					</table>
-					<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" />
+					<input class="btn primary" type="submit" wicket:message="value:gb.save" wicket:id="save" tabindex="3" />
+					<input class="btn" type="submit" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="4" />
 				</center>
 			</form>			
 		</div>
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
index 2738a5fc..d7c774d9 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
@@ -120,6 +120,8 @@ public class ChangePasswordPage extends RootSubPage {
 
 			@Override
 			public void onSubmit() {
+				setRedirect(false);
+				error("Password change aborted.");
 				setResponsePage(RepositoriesPage.class);
 			}
 		};
-- 
2.39.5