From f6a74731ba7ed01e639e4cab883743b7777a9283 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Mon, 20 Sep 2021 17:25:58 +0200
Subject: [PATCH] Create a separate section in the user edit dialog to reset
 2fa

---
 src/views/users.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/users.html b/src/views/users.html
index 924b6f3f7..7a1b44f69 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -213,9 +213,14 @@
           </div>
           <input class="hide" type="submit" ng-disabled="useredit_form.$invalid || useredit.busy"/>
         </form>
+        <hr/>
+        <div>
+          <p ng-hide="useredit.userInfo.twoFactorAuthenticationEnabled">{{ 'users.passwordResetDialog.no2FASetup' | tr }}</p>
+          <p ng-show="useredit.userInfo.twoFactorAuthenticationEnabled">{{ 'users.passwordResetDialog.2FAIsSetup' | tr }}</p>
+          <button type="button" class="btn btn-danger" ng-click="useredit.reset2FA()" ng-disabled="!useredit.userInfo.twoFactorAuthenticationEnabled || useredit.reset2FABusy"><i class="fa fa-circle-notch fa-spin" ng-show="useredit.reset2FABusy"></i> {{ 'users.passwordResetDialog.reset2FAAction' | tr }}</button>
+        </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-danger pull-left" ng-click="useredit.reset2FA()" uib-tooltip="{{ (useredit.userInfo.twoFactorAuthenticationEnabled ? 'users.passwordResetDialog.2FAIsSetup' : 'users.passwordResetDialog.no2FASetup') | tr }}" ng-disabled="!useredit.userInfo.twoFactorAuthenticationEnabled || useredit.reset2FABusy"><i class="fa fa-circle-notch fa-spin" ng-show="useredit.reset2FABusy"></i> {{ 'users.passwordResetDialog.reset2FAAction' | tr }}</button>
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
         <button type="button" class="btn btn-success" ng-click="useredit.submit()" ng-disabled="useredit_form.$invalid || useredit.busy"><i class="fa fa-circle-notch fa-spin" ng-show="useredit.busy"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>