From 16379201704ea1a43ce14859633ffb1b9fae6710 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Tue, 8 Jun 2021 16:38:21 +0300
Subject: [PATCH] Admin Panel Organizations/Teams: Show confirm text above
 delete button.

Thanks to xet7 !

Related #802
---
 client/components/settings/peopleBody.jade | 22 +++++++---------------
 client/components/settings/peopleBody.js   |  4 ++--
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index d3dfeb73d..cfac9cdc2 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -477,15 +477,13 @@ template(name="newUserPopup")
 
 template(name="settingsOrgPopup")
   ul.pop-over-list
-    li
-      br
-      br
-      br
-      br
-    hr
     li
       form
+        label
+          | {{_ 'delete-org-confirm-popup'}}
+        br
         label.hide.orgId(type="text" value=org._id)
+        labeldelete-org-confirm-popup
         div.buttonsContainer
           input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
   // It's not yet possible to impersonate organization. Only impersonate user,
@@ -500,14 +498,11 @@ template(name="settingsOrgPopup")
 
 template(name="settingsTeamPopup")
   ul.pop-over-list
-    li
-      br
-      br
-      br
-      br
-    hr
     li
       form
+        label
+          | {{_ 'delete-team-confirm-popup'}}
+        br
         label.hide.teamId(type="text" value=team._id)
         div.buttonsContainer
           input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
@@ -518,9 +513,6 @@ template(name="settingsUserPopup")
       a.impersonate-user
         i.fa.fa-user
         | {{_ 'impersonate-user'}}
-    li
-      br
-      br
     //hr
     //li
     //  form
diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js
index 3544ecdee..d953d3a81 100644
--- a/client/components/settings/peopleBody.js
+++ b/client/components/settings/peopleBody.js
@@ -706,7 +706,7 @@ Template.settingsOrgPopup.events({
     event.preventDefault();
     Org.remove(this.orgId);
     Popup.close();
-  },
+  }
 });
 
 Template.settingsTeamPopup.events({
@@ -714,7 +714,7 @@ Template.settingsTeamPopup.events({
     event.preventDefault();
     Team.remove(this.teamId);
     Popup.close();
-  },
+  }
 });
 
 Template.settingsUserPopup.events({