User moderator tools user interface redesign

app/assets/stylesheets/_variables.scss

@@ -6,6 +6,8 @@ $screen-md: 780px;
 $screen-lg: 992px;
 $screen-xl: 1200px;
 
+$mod-tools-medium-to-large-breakpoint: 768px !default;
+
 // Colors
 $key: #335;
 $muted-text: #666;

app/assets/stylesheets/tabs.scss

@@ -2,4 +2,8 @@
 
 .tabs {
   margin-bottom: 1em;
-}
+
+  .tabs--push {
+    flex-grow: 1;
+  }
+}

app/assets/stylesheets/users.scss

@@ -241,3 +241,56 @@ $sizes: (16, 32, 40, 48, 64, 128, 256);
     }
   }
 }
+
+.modtools--usercard {
+  padding: 0.5rem;
+}
+
+.modtools-tbl-noborder {
+  th {
+    border-bottom-width: 1px !important;
+    width: 150px;
+  }
+}
+
+.mod-warnings-clear-form { display: inline; }
+
+.modtools--sidebar {
+  margin-right: 1rem;
+}
+
+.modtools--sidebar {
+  > .widget--header {
+    display: none;
+  }
+
+  label {
+    display: block;
+  }
+
+  #mobile-mod-tools-toggle {
+    + .widget--body {
+      display: none;
+    }
+
+    &:checked + .widget--body {
+      display: block;
+    }
+  }
+}
+
+@media screen and (min-width: $mod-tools-medium-to-large-breakpoint) {
+  .modtools--sidebar {
+    > .widget--header {
+      display: block;
+    }
+
+    label {
+      display: none;
+    }
+
+    #mobile-mod-tools-toggle + .widget--body {
+      display: block;
+    }
+  }
+}

app/controllers/admin_controller.rb

@@ -2,9 +2,9 @@
 class AdminController < ApplicationController
   before_action :verify_admin, except: [:change_back, :verify_elevation]
   before_action :verify_global_admin, only: [:admin_email, :send_admin_email, :new_site, :create_site, :setup,
-                                             :setup_save, :hellban, :all_email, :send_all_email]
+                                             :setup_save, :failban, :all_email, :send_all_email]
   before_action :verify_developer, only: [:change_users, :impersonate]
-  before_action :set_user, only: [:change_users, :hellban, :impersonate]
+  before_action :set_user, only: [:change_users, :failban, :impersonate]
 
   skip_before_action :check_if_warning_or_suspension_pending, only: [:change_back, :verify_elevation]
 
@@ -109,7 +109,7 @@ def audit_logs
     @log_types = AuditLog.unscoped.select(:log_type).distinct.map(&:log_type) - ['user_annotation', 'user_history']
     @event_types = AuditLog.unscoped.select(:event_type).distinct.map(&:event_type)
 
-    @logs = if current_user.is_global_admin
+    @logs = if current_user.global_admin?
               AuditLog.unscoped.where.not(log_type: ['user_annotation', 'user_history'])
             else
               AuditLog.where.not(log_type: ['block_log', 'user_annotation', 'user_history'])
@@ -204,7 +204,7 @@ def setup_save
     render
   end
 
-  def hellban
+  def failban
     @user.block("user manually blocked by admin ##{current_user.id}")
     flash[:success] = t 'admin.user_fed_stat'
     redirect_back fallback_location: admin_path
@@ -213,6 +213,8 @@ def hellban
   def impersonate
     if Rails.env.development?
       change_users
+    else
+      render layout: 'without_sidebar'
     end
   end
 

app/controllers/application_controller.rb

@@ -85,7 +85,7 @@ def verify_admin
   end
 
   def verify_global_admin
-    if !user_signed_in? || !current_user.is_global_admin
+    if !user_signed_in? || !current_user.global_admin?
       render 'errors/not_found', layout: 'without_sidebar', status: :not_found
       return false
     end
@@ -307,8 +307,7 @@ def enforce_2fa
        SiteSetting['EnableMandatoryGlobalAdminMod2FA'] &&
        # Enable users to log out even if 2fa is enforced
        !request.fullpath.end_with?('/users/sign_out') &&
-       (current_user.is_global_admin ||
-         current_user.is_global_moderator) &&
+       current_user.at_least_global_moderator? &&
        (current_user.sso_profile.blank? || SiteSetting['Enable2FAForSsoUsers'])
       redirect_path = '/users/two-factor'
       unless request.fullpath.end_with?(redirect_path)

app/controllers/moderator_controller.rb

@@ -69,6 +69,7 @@ def user_vote_summary
         total: Vote.for(@user).count
       )
     )
+    render layout: 'without_sidebar'
   end
 
   def spammy_users

app/controllers/site_settings_controller.rb

@@ -9,7 +9,7 @@ class SiteSettingsController < ApplicationController
   # @param community_id [String, nil] id of the community to check access on
   # @return [Boolean] Check result
   def access?(user, community_id)
-    community_id.present? || user.is_global_admin
+    community_id.present? || user.global_admin?
   end
 
   def index

app/controllers/tag_sets_controller.rb

@@ -37,6 +37,6 @@ def update
   private
 
   def set_tag_set
-    @tag_set = (current_user&.is_global_admin ? TagSet.unscoped : TagSet).find(params[:id])
+    @tag_set = (current_user&.global_admin? ? TagSet.unscoped : TagSet).find(params[:id])
   end
 end

app/controllers/users_controller.rb

@@ -2,6 +2,8 @@
 
 # rubocop:disable Metrics/ClassLength
 class UsersController < ApplicationController
+  layout 'without_sidebar'
+
   include Devise::Controllers::Rememberable
 
   before_action :authenticate_user!, only: [:edit_profile, :update_profile, :stack_redirect,
@@ -12,11 +14,12 @@ class UsersController < ApplicationController
 
   before_action :redirect_to_sign_in, only: [:filters], unless: [:user_signed_in?, :json_request?]
 
-  before_action :verify_moderator, only: [:mod, :destroy, :soft_delete, :role_toggle, :full_log,
-                                          :annotate, :annotations, :mod_privileges, :mod_privilege_action]
-  before_action :set_user, only: [:show, :mod, :destroy, :soft_delete, :posts, :role_toggle, :full_log, :activity,
-                                  :annotate, :annotations, :mod_privileges, :mod_privilege_action,
-                                  :vote_summary, :network, :avatar]
+  before_action :verify_moderator, only: [:annotate, :annotations, :full_log, :mod, :mod_delete, :mod_privilege_action,
+                                          :mod_privileges, :role_toggle, :soft_delete]
+  before_action :verify_global_moderator, only: [:mod_delete_network_account, :mod_failban]
+  before_action :set_user, only: [:activity, :annotate, :annotations, :avatar, :full_log, :mod, :mod_delete,
+                                  :mod_delete_network_account, :mod_failban, :mod_privilege_action, :mod_privileges,
+                                  :network, :posts, :role_toggle, :show, :soft_delete, :vote_summary]
   before_action :check_deleted, only: [:show, :posts, :activity]
 
   def index
@@ -36,7 +39,9 @@ def index
     @post_counts = Post.where(user_id: @users.pluck(:id).uniq).group(:user_id).count
 
     respond_to do |format|
-      format.html
+      format.html do
+        render layout: 'application'
+      end
       format.json do
         render json: @users
       end
@@ -60,7 +65,6 @@ def show
                               .count
                         end
     @posts = @posts.first(@limit)
-    render layout: 'without_sidebar'
   end
 
   def me
@@ -92,7 +96,6 @@ def preferences
         prefs = current_user.preferences
         @preferences = prefs[:global]
         @community_prefs = prefs[:community]
-        render layout: 'without_sidebar'
       end
       format.json do
         render json: current_user.preferences
@@ -135,9 +138,7 @@ def filters_json
 
   def filters
     respond_to do |format|
-      format.html do
-        render layout: 'without_sidebar'
-      end
+      format.html
       format.json do
         render json: filters_json
       end
@@ -171,7 +172,7 @@ def delete_filter
     as_user = current_user
 
     if params[:system] == true
-      if current_user&.is_global_admin
+      if current_user&.global_admin?
         as_user = User.find(-1)
       else
         return render json: { status: 'failed', success: false, errors: ['You do not have permission to delete'] },
@@ -225,7 +226,7 @@ def posts
 
     respond_to do |format|
       format.html do
-        render :posts
+        render :posts, layout: 'application'
       end
       format.json do
         render json: @posts
@@ -239,7 +240,6 @@ def my_network
 
   def network
     @communities = Community.all
-    render layout: 'without_sidebar'
   end
 
   def my_activity
@@ -272,11 +272,8 @@ def activity
             end
 
     @items = items.sort_by(&:created_at).reverse.paginate(page: params[:page], per_page: 50)
-    render layout: 'without_sidebar'
   end
 
-  def mod; end
-
   def full_log
     @posts = Post.by(@user).count
     @comments = Comment.by(@user).count
@@ -315,8 +312,6 @@ def full_log
                   SuggestedEdit.by(@user).all + PostHistory.by(@user).all +
                   ModWarning.to(@user).all
               end).sort_by(&:created_at).reverse.paginate(page: params[:page], per_page: 50)
-
-    render layout: 'without_sidebar'
   end
 
   def mod_privileges
@@ -349,10 +344,6 @@ def soft_delete
     render json: { status: 'success', user: @user.id }
   end
 
-  def edit_profile
-    render layout: 'without_sidebar'
-  end
-
   def cleaned_profile_websites(profile_params)
     sites = profile_params[:user_websites_attributes]
 
@@ -575,7 +566,6 @@ def annotations
     @logs = AuditLog.where(log_type: 'user_annotation', related: @user)
                     .newest_first
                     .paginate(page: params[:page], per_page: 20)
-    render layout: 'without_sidebar'
   end
 
   def annotate
@@ -605,8 +595,6 @@ def vote_summary
                      [k, vl.group_by(&:post), vl.sum { |v| v.vote_type * v.vote_count }]
                    end
                    .paginate(page: params[:page], per_page: 15)
-
-    render layout: 'without_sidebar'
   end
 
   def avatar
@@ -628,10 +616,6 @@ def specific_avatar
     end
   end
 
-  def disconnect_sso
-    render layout: 'without_sidebar'
-  end
-
   def confirm_disconnect_sso
     if current_user.sso_profile.blank? || !helpers.devise_sign_in_enabled? || !SiteSetting['AllowSsoDisconnect']
       flash[:danger] = 'You cannot disable Single Sign-On.'

app/helpers/application_helper.rb

@@ -391,4 +391,22 @@ def safe_page(params)
   def safe_per_page(params, min = 20)
     params[:per_page].nil? || params[:per_page].to_i < min ? min : params[:per_page].to_i
   end
+
+  ##
+  # Is the Moderator Tools tab of the user page the active tab?
+  # @param user [User] user whose page is being viewed
+  # @return [Boolean]
+  def user_mod_tools_tab_active?(user)
+    current_page?(mod_user_url(user)) ||
+      current_page?(full_user_log_url(user)) ||
+      current_page?(user_annotations_url(user)) ||
+      current_page?(mod_vote_summary_url(user)) ||
+      current_page?(user_privileges_url(user)) ||
+      current_page?(mod_warning_log_url(user)) ||
+      current_page?(new_mod_warning_url(user)) ||
+      current_page?(mod_delete_url(user)) ||
+      current_page?(mod_delete_network_account_url(user)) ||
+      current_page?(mod_failban_url(user)) ||
+      current_page?(start_impersonating_url(user))
+  end
 end

app/views/admin/create_site.html.erb

@@ -16,4 +16,4 @@
 
 <p>Once you are ready, click on the following button:</p>
 
-<a href="//<%= @new_community.host %>/admin/setup" class="button is-filled is-very-large">To new site</a>
+<a href="//<%= @new_community.host %>/admin/setup" class="button is-filled is-very-large">To new site</a>