Rearranged button order to properly set default (issue 60)

Also indicate password change aborted if it is canceled.
darklee · Feb 9, 2012 · 5cc40c8 · 5cc40c8
1 parent 4b9d645
commit 5cc40c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -120,6 +120,8 @@ public void onSubmit() {
 
 			@Override
 			public void onSubmit() {
+				setRedirect(false);
+				error("Password change aborted.");
 				setResponsePage(RepositoriesPage.class);
 			}
 		};