Update settings to re-use admin layout, one big navigation tree, improve settings forms

2017-01-28 03:56:10 +01:00 · 2017-01-28 03:56:10 +01:00 · f4bc9620a9
commit f4bc9620a9
parent 04bce0cdf2
22 changed files with 169 additions and 82 deletions
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@ -2,6 +2,7 @@

 class Auth::RegistrationsController < Devise::RegistrationsController
  layout 'auth'
+  layout 'admin', only: [:edit]

  before_action :check_single_user_mode
  before_action :configure_sign_up_params, only: [:create]
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class Settings::PreferencesController < ApplicationController
-  layout 'auth'
+  layout 'admin'

  before_action :authenticate_user!

--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@ -3,7 +3,7 @@
 class Settings::ProfilesController < ApplicationController
  include ObfuscateFilename

-  layout 'auth'
+  layout 'admin'

  before_action :authenticate_user!
  before_action :set_account
--- a/app/controllers/settings/two_factor_auths_controller.rb
+++ b/app/controllers/settings/two_factor_auths_controller.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class Settings::TwoFactorAuthsController < ApplicationController
-  layout 'auth'
+  layout 'admin'

  before_action :authenticate_user!