UX: Consolidate "Admins" and "Moderators" into "Staff" on admin users

list

app/assets/javascripts/admin/templates/users_list.hbs

@@ -6,8 +6,7 @@
       {{#if siteSettings.must_approve_users}}
         <li>{{#link-to 'adminUsersList.show' 'pending'}}{{i18n admin.users.nav.pending}}{{/link-to}}</li>
       {{/if}}
-      <li>{{#link-to 'adminUsersList.show' 'admins'}}{{i18n admin.users.nav.admins}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'moderators'}}{{i18n admin.users.nav.moderators}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'staff'}}{{i18n admin.users.nav.staff}}{{/link-to}}</li>
       <li>{{#link-to 'adminUsersList.show' 'suspended'}}{{i18n admin.users.nav.suspended}}{{/link-to}}</li>
       <li>{{#link-to 'adminUsersList.show' 'blocked'}}{{i18n admin.users.nav.blocked}}{{/link-to}}</li>
     </ul>

config/locales/client.en.yml

@@ -1892,8 +1892,7 @@ en:
           new: "New"
           active: "Active"
           pending: "Pending"
-          admins: 'Admins'
-          moderators: 'Mods'
+          staff: 'Staff'
           suspended: 'Suspended'
           blocked: 'Blocked'
         approved: "Approved?"
@@ -1912,6 +1911,7 @@ en:
           regular: 'Users at Trust Level 2 (Member)'
           leader: 'Users at Trust Level 3 (Regular)'
           elder: 'Users at Trust Level 4 (Leader)'
+          staff: "Staff"
           admins: 'Admin Users'
           moderators: 'Moderators'
           blocked: 'Blocked Users'

lib/admin_user_index_query.rb

@@ -49,6 +49,7 @@ class AdminUserIndexQuery
 
   def filter_by_query_classification
     case params[:query]
+      when 'staff'      then @query.where("admin or moderator")
       when 'admins'     then @query.where(admin: true)
       when 'moderators' then @query.where(moderator: true)
       when 'blocked'    then @query.blocked