Set @body_classes to admin layout (#9081)

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 7fb69d5789ec855b487d08284f2a2e6122d98371..8593b582a68e73c70d09d1562190898303a23ce1 100644 (file)
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -5,8 +5,15 @@ module Admin
     include Authorization
     include AccountableConcern
 
+    layout 'admin'
+
     before_action :require_staff!
+    before_action :set_body_classes
 
-    layout 'admin'
+    private
+
+    def set_body_classes
+      @body_classes = 'admin'
+    end
   end
 end

diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index 175dbab072a728d7f0937cdf0b7f91fe4525b785..d2e0fb73907f243bbae10be4b3bd6e2ce20c74ec 100644 (file)
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -7,6 +7,7 @@ class FiltersController < ApplicationController
 
   before_action :set_filters, only: :index
   before_action :set_filter, only: [:edit, :update, :destroy]
+  before_action :set_body_classes
 
   def index
     @filters = current_account.custom_filters
@@ -54,4 +55,8 @@ class FiltersController < ApplicationController
   def resource_params
     params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 3aaa2776ff6dba46f248755a281a33b90d020237..fdb3a0962a2ac4f53f7ec443be4ea60c3e33c771 100644 (file)
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -6,6 +6,7 @@ class InvitesController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def index
     authorize :invite, :create?
@@ -44,4 +45,8 @@ class InvitesController < ApplicationController
   def resource_params
     params.require(:invite).permit(:max_uses, :expires_in, :autofollow)
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index 2a4962311573c55e379c0d2e0aa8b3b28bce8303..a1a2c57fa05bfa9a5b859d24dcb900e8e1c3de1e 100644 (file)
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -6,6 +6,7 @@ class Settings::ApplicationsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_application, only: [:show, :update, :destroy, :regenerate]
   before_action :prepare_scopes, only: [:create, :update]
+  before_action :set_body_classes
 
   def index
     @applications = current_user.applications.order(id: :desc).page(params[:page])
@@ -69,4 +70,8 @@ class Settings::ApplicationsController < ApplicationController
     scopes = params.fetch(:doorkeeper_application, {}).fetch(:scopes, nil)
     params[:doorkeeper_application][:scopes] = scopes.join(' ') if scopes.is_a? Array
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/deletes_controller.rb b/app/controllers/settings/deletes_controller.rb
index 80002b995e58a20eff26ee9257b3fc32957aa406..97f3946c87afd60e53c22ec54894270b7b8b168c 100644 (file)
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@@ -5,6 +5,7 @@ class Settings::DeletesController < ApplicationController
 
   before_action :check_enabled_deletion
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def show
     @confirmation = Form::DeleteConfirmation.new
@@ -29,4 +30,8 @@ class Settings::DeletesController < ApplicationController
   def delete_params
     params.require(:form_delete_confirmation).permit(:password)
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/exports_controller.rb b/app/controllers/settings/exports_controller.rb
index 869e11d3bf601782e24bc534d312a95486abb574..3a2334ef0031941db7f30c7b7c95d28dec97bab4 100644 (file)
--- a/app/controllers/settings/exports_controller.rb
+++ b/app/controllers/settings/exports_controller.rb
@@ -6,6 +6,7 @@ class Settings::ExportsController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def show
     @export  = Export.new(current_account)
@@ -20,4 +21,10 @@ class Settings::ExportsController < ApplicationController
 
     redirect_to settings_export_path
   end
+
+  private
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/follower_domains_controller.rb b/app/controllers/settings/follower_domains_controller.rb
index a128bd1361f7f89785660805b500657d14a8b9f0..9c39e66bbb1c04e175eb356cce67b73fd0284325 100644 (file)
--- a/app/controllers/settings/follower_domains_controller.rb
+++ b/app/controllers/settings/follower_domains_controller.rb
@@ -4,6 +4,7 @@ class Settings::FollowerDomainsController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def show
     @account = current_account
@@ -25,4 +26,8 @@ class Settings::FollowerDomainsController < ApplicationController
   def bulk_params
     params.permit(select: [])
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index 0db13d1ca640586d8970a476ad352b996c96d762..e9548ce62921a723d3d2171218721ace62904029 100644 (file)
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -5,6 +5,7 @@ class Settings::ImportsController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_account
+  before_action :set_body_classes
 
   def show
     @import = Import.new
@@ -31,4 +32,8 @@ class Settings::ImportsController < ApplicationController
   def import_params
     params.require(:import).permit(:data, :type)
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb
index bc6436b87aff6f6967350eb8013f7866be17d45e..bd4f9c87afa3abe78023b29e453755206001a8ab 100644 (file)
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@@ -4,6 +4,7 @@ class Settings::MigrationsController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def show
     @migration = Form::Migration.new(account: current_account.moved_to_account)
@@ -31,4 +32,8 @@ class Settings::MigrationsController < ApplicationController
     current_account.moved_to_account_id != @migration.account&.id &&
       current_account.id != @migration.account&.id
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/notifications_controller.rb b/app/controllers/settings/notifications_controller.rb
index fe45c17b2238f9857a4bde6649be6fb3edd6269a..d0754296ccc7dc62ef511a136606d2bee27e1a88 100644 (file)
--- a/app/controllers/settings/notifications_controller.rb
+++ b/app/controllers/settings/notifications_controller.rb
@@ -4,6 +4,7 @@ class Settings::NotificationsController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def show; end
 
@@ -29,4 +30,8 @@ class Settings::NotificationsController < ApplicationController
       interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index b83900f07d4110e6de5e76450a2e84ab52ee8696..7bb5fb112a1a11fe72033fe87a6ae90d7180d18a 100644 (file)
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -4,6 +4,7 @@ class Settings::PreferencesController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def show; end
 
@@ -51,4 +52,8 @@ class Settings::PreferencesController < ApplicationController
       interactions: %i(must_be_follower must_be_following)
     )
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index fe265c81d29250a9c9d404a52b69a2417f0e702a..5b3bfd71fe322d251ebaffd58104c0f34a833f1b 100644 (file)
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -7,6 +7,7 @@ class Settings::ProfilesController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_account
+  before_action :set_body_classes
 
   obfuscate_filename [:account, :avatar]
   obfuscate_filename [:account, :header]
@@ -34,4 +35,8 @@ class Settings::ProfilesController < ApplicationController
   def set_account
     @account = current_user.account
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/sessions_controller.rb b/app/controllers/settings/sessions_controller.rb
index 0da1b027b8e439395e7069aa0569526453d74dea..74cebc07b6a6b0b2c6d27729a953dd3804a484fa 100644 (file)
--- a/app/controllers/settings/sessions_controller.rb
+++ b/app/controllers/settings/sessions_controller.rb
@@ -2,6 +2,7 @@
 
 class Settings::SessionsController < ApplicationController
   before_action :set_session, only: :destroy
+  before_action :set_body_classes
 
   def destroy
     @session.destroy!
@@ -14,4 +15,8 @@ class Settings::SessionsController < ApplicationController
   def set_session
     @session = current_user.session_activations.find(params[:id])
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end

diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
index 8d534960d4bf0c86fc23dc062ee940514c72bae1..ee567c2a7ce9856fcdf6396015bffb5de19e61ad 100644 (file)
--- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
@@ -7,6 +7,7 @@ module Settings
 
       before_action :authenticate_user!
       before_action :ensure_otp_secret
+      before_action :set_body_classes
 
       def new
         prepare_two_factor_form
@@ -43,6 +44,10 @@ module Settings
       def ensure_otp_secret
         redirect_to settings_two_factor_authentication_path unless current_user.otp_secret
       end
+
+      def set_body_classes
+        @body_classes = 'admin'
+      end
     end
   end
 end

diff --git a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
index e591e9502d9025d2600d6f93f11e4f7b5ae57a47..bfb103620bb58babe6fe6117dd78bade754b7d91 100644 (file)
--- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
@@ -6,6 +6,7 @@ module Settings
       layout 'admin'
 
       before_action :authenticate_user!
+      before_action :set_body_classes
 
       def create
         @recovery_codes = current_user.generate_otp_backup_codes!
@@ -13,6 +14,12 @@ module Settings
         flash[:notice] = I18n.t('two_factor_authentication.recovery_codes_regenerated')
         render :index
       end
+
+      private
+
+      def set_body_classes
+        @body_classes = 'admin'
+      end
     end
   end
 end

diff --git a/app/controllers/settings/two_factor_authentications_controller.rb b/app/controllers/settings/two_factor_authentications_controller.rb
index 863cc7351b7e20fe3ba8568e0d344a9b0315dbe9..e4d8aed41314ca180f53fa28d5d40bba0c1c6737 100644 (file)
--- a/app/controllers/settings/two_factor_authentications_controller.rb
+++ b/app/controllers/settings/two_factor_authentications_controller.rb
@@ -6,6 +6,7 @@ module Settings
 
     before_action :authenticate_user!
     before_action :verify_otp_required, only: [:create]
+    before_action :set_body_classes
 
     def show
       @confirmation = Form::TwoFactorConfirmation.new
@@ -43,5 +44,9 @@ module Settings
       current_user.validate_and_consume_otp!(confirmation_params[:code]) ||
         current_user.invalidate_otp_backup_code!(confirmation_params[:code])
     end
+
+    def set_body_classes
+      @body_classes = 'admin'
+    end
   end
 end

diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index c98d85f7bfe7ec38d50b58cc4cb54be9d7c55c1c..6ce67d91e7059d4019f405ba93910a27e2a6904e 100644 (file)
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -17,4 +17,4 @@
 
         = yield
 
-= render template: 'layouts/application', locals: { body_classes: 'admin' }
+= render template: 'layouts/application'