Rearranged button order to properly set default (issue 60)

Also indicate password change aborted if it is canceled.

diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.html b/src/com/gitblit/wicket/pages/ChangePasswordPage.html
index 938e0eca3a360118cc51a211f68aaf911ff4e1a6..e72ef1ed0bf611641b7269661ab322cb6d245fb6 100644 (file)
--- 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>\r
                                        </tr>\r
                                        </table>\r
-                                       <input class="btn" type="submit" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="3" />\r
-                                       <input class="btn primary" type="submit" wicket:message="value:gb.save" wicket:id="save" tabindex="4" />\r
+                                       <input class="btn primary" type="submit" wicket:message="value:gb.save" wicket:id="save" tabindex="3" />\r
+                                       <input class="btn" type="submit" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="4" />\r
                                </center>\r
                        </form>                 \r
                </div>\r

diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
index 2738a5fc8c03830726c8ea1ee9ae339a5127b97d..d7c774d90784a6e3c6937bf0f816eb933676dbbd 100644 (file)
--- 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 {
 \r
                        @Override\r
                        public void onSubmit() {\r
+                               setRedirect(false);\r
+                               error("Password change aborted.");\r
                                setResponsePage(RepositoriesPage.class);\r
                        }\r
                };\r