From b89648435156815981e967e79353da27b224f4aa Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 30 Jun 2021 17:43:16 -0400 Subject: [PATCH] fix: #9634, re-jig top bar of Admin > Manage > Users --- public/language/en-GB/admin/manage/users.json | 2 +- public/src/admin/manage/users.js | 14 ++++++ src/views/admin/manage/users.tpl | 47 ++++++++++--------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/public/language/en-GB/admin/manage/users.json b/public/language/en-GB/admin/manage/users.json index 15624056c9..38a065b954 100644 --- a/public/language/en-GB/admin/manage/users.json +++ b/public/language/en-GB/admin/manage/users.json @@ -1,6 +1,6 @@ { "users": "Users", - "edit": "Edit", + "edit": "Actions", "make-admin": "Make Admin", "remove-admin": "Remove Admin", "validate-email": "Validate Email", diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index 4270d4c23e..5675f5b0aa 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -299,6 +299,20 @@ define('admin/manage/users', [ handleDelete('[[admin/manage/users:alerts.confirm-purge]]', ''); }); + const tableEl = document.querySelector('.users-table'); + const actionBtn = document.getElementById('action-dropdown'); + tableEl.addEventListener('change', (e) => { + const subselector = e.target.closest('[component="user/select/single"]') || e.target.closest('[component="user/select/all"]'); + if (subselector) { + var uids = getSelectedUids(); + if (uids.length) { + actionBtn.removeAttribute('disabled'); + } else { + actionBtn.setAttribute('disabled', 'disabled'); + } + } + }); + function handleDelete(confirmMsg, path) { var uids = getSelectedUids(); if (!uids.length) { diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 85de84ea56..011f8fdd20 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -2,13 +2,9 @@
-
- - - - [[admin/manage/users:download-csv]] +
- +
- - -
+
@@ -62,6 +48,23 @@ + +