From 3158b8b6448a40438334a77fe363481f2b2534c3 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 10 Oct 2019 12:26:09 +0100
Subject: [PATCH 1/4] Clean up of change password section in member details

---
 .../src/views/components/users/change-password.html    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index ef364264ab..2a33c945bd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -6,7 +6,7 @@
     </div>
     <div ng-switch="vm.changing">
         <div ng-switch-when="false">
-            <a href="" ng-click="vm.doChange()" class="btn btn-small">
+            <a href="" ng-click="vm.doChange()" class="btn umb-button__button btn-action umb-button--">
                 <localize key="general_changePassword">Change password</localize>
             </a>
         </div>
@@ -14,11 +14,7 @@
 
             <ng-form name="changePasswordForm">
                 <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
-                    <input type="checkbox" ng-model="vm.passwordValues.reset"
-                           name="resetPassword"
-                           val-server-field="resetPassword"
-                           no-dirty-check
-                           ng-change="vm.showReset = !vm.showReset" />
+                    <umb-checkbox  model="vm.passwordValues.reset" />
                     <span ng-messages="changePasswordForm.resetPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valServerField">{{changePasswordForm.resetPassword.errorMsg}}</span>
                     </span>
@@ -62,7 +58,7 @@
                     </span>
                 </umb-control-group>
 
-                <a href="" ng-click="vm.cancelChange()" ng-show="vm.showCancelBtn()" class="btn btn-small">
+                <a href="" ng-click="vm.cancelChange()" ng-show="vm.showCancelBtn()" class="btn umb-button__button btn-cancel umb-button--">
                     <localize key="general_cancel">Cancel</localize>
                 </a>
 

From fdbef5b87d8b6af7b5509d93847625bddf97dae1 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Fri, 25 Oct 2019 14:09:29 +0100
Subject: [PATCH 2/4] Added missing attributes to umb-checkbox

---
 .../src/views/components/users/change-password.html            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index 2a33c945bd..001939cc2f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -14,7 +14,8 @@
 
             <ng-form name="changePasswordForm">
                 <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
-                    <umb-checkbox  model="vm.passwordValues.reset" />
+                    <umb-checkbox  model="vm.passwordValues.reset" name="resetPassword" server-validation-field="resetPassword"
+                                  on-change="vm.showReset = !vm.showReset" />
                     <span ng-messages="changePasswordForm.resetPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valServerField">{{changePasswordForm.resetPassword.errorMsg}}</span>
                     </span>

From 68687080ab8586e2259b72038ed3d726f32d3752 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Sun, 27 Oct 2019 09:48:24 +0000
Subject: [PATCH 3/4] More tweaks based on comments

---
 .../src/views/components/users/change-password.html  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index 001939cc2f..bed26e06f4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -6,21 +6,21 @@
     </div>
     <div ng-switch="vm.changing">
         <div ng-switch-when="false">
-            <a href="" ng-click="vm.doChange()" class="btn umb-button__button btn-action umb-button--">
+            <button type="button" ng-click="vm.doChange()" class="btn umb-button__button btn-action">
                 <localize key="general_changePassword">Change password</localize>
-            </a>
+            </button>
         </div>
         <div ng-switch-when="true">
 
             <ng-form name="changePasswordForm">
                 <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
-                    <umb-checkbox  model="vm.passwordValues.reset" name="resetPassword" server-validation-field="resetPassword"
+                    <umb-checkbox model="vm.passwordValues.reset" server-validation-field="resetPassword"
                                   on-change="vm.showReset = !vm.showReset" />
                     <span ng-messages="changePasswordForm.resetPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valServerField">{{changePasswordForm.resetPassword.errorMsg}}</span>
                     </span>
 
-                </umb-control-group> 
+                </umb-control-group>
 
                 <!-- we need to show the old pass field when the provider cannot retrieve the password -->
                 <umb-control-group alias="oldPassword" label="@user_oldPassword" ng-if="vm.showOldPass()" required="true">
@@ -59,9 +59,9 @@
                     </span>
                 </umb-control-group>
 
-                <a href="" ng-click="vm.cancelChange()" ng-show="vm.showCancelBtn()" class="btn umb-button__button btn-cancel umb-button--">
+                <button href="" ng-click="vm.cancelChange()" ng-show="vm.showCancelBtn()" class="btn umb-button__button btn-cancel umb-button--">
                     <localize key="general_cancel">Cancel</localize>
-                </a>
+                </button>
 
             </ng-form>
         </div>

From 43692c81e4fca69c19ecce4c2cc1dec13a035fbd Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Sun, 27 Oct 2019 10:06:06 +0000
Subject: [PATCH 4/4] Removed href from the button

---
 .../src/views/components/users/change-password.html             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index bed26e06f4..b7b8ec12c7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -59,7 +59,7 @@
                     </span>
                 </umb-control-group>
 
-                <button href="" ng-click="vm.cancelChange()" ng-show="vm.showCancelBtn()" class="btn umb-button__button btn-cancel umb-button--">
+                <button ng-click="vm.cancelChange()" ng-show="vm.showCancelBtn()" class="btn umb-button__button btn-cancel umb-button--">
                     <localize key="general_cancel">Cancel</localize>
                 </button>