fix: #9634, re-jig top bar of Admin > Manage > Users

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",

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) {

src/views/admin/manage/users.tpl

@@ -2,13 +2,9 @@
 	<div class="col-lg-12">
 		<div class="clearfix">
 
-			<div class="pull-left">
+			<div class="pull-right">
-				<!-- IF showInviteButton -->
-				<button component="user/invite" class="btn btn-success"><i class="fa fa-users"></i> [[admin/manage/users:invite]]</button>
-				<!-- ENDIF showInviteButton -->
-				<a target="_blank" href="#" class="btn btn-primary export-csv">[[admin/manage/users:download-csv]]</a>
 				<div class="btn-group">
-					<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[admin/manage/users:edit]] <span class="caret"></span></button>
+					<button class="btn btn-primary dropdown-toggle" id="action-dropdown" data-toggle="dropdown" type="button" disabled="disabled">[[admin/manage/users:edit]] <span class="caret"></span></button>
 					<ul class="dropdown-menu">
 						<li><a href="#" class="validate-email"><i class="fa fa-fw fa-check"></i> [[admin/manage/users:validate-email]]</a></li>
 						<li><a href="#" class="send-validation-email"><i class="fa fa-fw fa-mail-forward"></i> [[admin/manage/users:send-validation-email]]</a></li>
@@ -26,26 +22,16 @@
 						<li><a href="#" class="delete-user-and-content"><i class="fa fa-fw fa-trash-o"></i> [[admin/manage/users:purge]]</a></li>
 					</ul>
 				</div>
-
+				<div class="btn-group">
-				<div class="btn-group" id="filter-by">
+					<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-ellipsis-v"></i></button>
-					<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+					<ul class="dropdown-menu">
-						[[admin/manage/users:filter-by]] <span class="caret"></span>
+						{{{ if showInviteButton }}}<li><a href="#" component="user/invite">[[admin/manage/users:invite]]</a></li>{{{ end }}}
-					</button>
+						<li><a target="_blank" href="#" class="export-csv">[[admin/manage/users:download-csv]]</a></li>
-					<ul class="dropdown-menu" role="menu">
-						<li data-filter-by="unverified" role="presentation">
-							<a role="menu-item" href="#"><i class="fa fa-fw {{{ if filterBy_unverified }}}fa-check{{{end}}}"></i>[[admin/manage/users:pills.unvalidated]]</a>
-						</li>
-						<li data-filter-by="verified" role="presentation">
-							<a role="menu-item" href="#"><i class="fa fa-fw {{{ if filterBy_verified }}}fa-check{{{end}}}"></i>[[admin/manage/users:pills.validated]]</a>
-						</li>
-						<li data-filter-by="banned" role="presentation">
-							<a role="menu-item" href="#"><i class="fa fa-fw {{{ if filterBy_banned }}}fa-check{{{end}}}"></i>[[admin/manage/users:pills.banned]]</a>
-						</li>
 					</ul>
 				</div>
 			</div>
 
-			<form class="form-inline pull-right">
+			<form class="form-inline pull-left">
 				<div class="input-group">
 					<input type="text" class="form-control" placeholder="[[global:search]]" id="user-search" value="{query}">
 					<span class="input-group-addon search-button"><i class="fa fa-search"></i></span>
@@ -62,6 +48,23 @@
 					<option value="250">[[admin/manage/users:250-per-page]]</option>
 					<option value="500">[[admin/manage/users:500-per-page]]</option>
 				</select>
+
+				<div class="btn-group" id="filter-by">
+					<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown">
+						[[admin/manage/users:filter-by]] <span class="caret"></span>
+					</button>
+					<ul class="dropdown-menu" role="menu">
+						<li data-filter-by="unverified" role="presentation">
+							<a role="menu-item" href="#"><i class="fa fa-fw {{{ if filterBy_unverified }}}fa-check{{{end}}}"></i>[[admin/manage/users:pills.unvalidated]]</a>
+						</li>
+						<li data-filter-by="verified" role="presentation">
+							<a role="menu-item" href="#"><i class="fa fa-fw {{{ if filterBy_verified }}}fa-check{{{end}}}"></i>[[admin/manage/users:pills.validated]]</a>
+						</li>
+						<li data-filter-by="banned" role="presentation">
+							<a role="menu-item" href="#"><i class="fa fa-fw {{{ if filterBy_banned }}}fa-check{{{end}}}"></i>[[admin/manage/users:pills.banned]]</a>
+						</li>
+					</ul>
+				</div>
 			</form>
 		</div>