0
0
Fork 0

Add support for multiple themes (#4959)

* Add support for selecting a theme

* Fix codeclimate issues

* Look up site default style if current user is not available due to e.g. not being logged in

* Remove outdated comment in common.js

* Address requested changes in themes PR

* Fix codeclimate issues

* Explicitly check current_account in application controller and only check theme availability if non-nil

* codeclimate

* explicit precedence with &&

* Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml

* codeclimate: indentation + return
This commit is contained in:
Andrew 2017-09-19 07:36:23 -07:00 committed by Eugen Rochko
parent 4aea3f88a6
commit 0401a24558
15 changed files with 64 additions and 21 deletions

16
app/lib/themes.rb Normal file
View file

@ -0,0 +1,16 @@
# frozen_string_literal: true
require 'singleton'
require 'yaml'
class Themes
include Singleton
def initialize
@conf = YAML.load_file(Rails.root.join('config', 'themes.yml'))
end
def names
@conf.keys
end
end

View file

@ -25,6 +25,7 @@ class UserSettingsDecorator
user.settings['auto_play_gif'] = auto_play_gif_preference
user.settings['system_font_ui'] = system_font_ui_preference
user.settings['noindex'] = noindex_preference
user.settings['theme'] = theme_preference
end
def merged_notification_emails
@ -67,6 +68,10 @@ class UserSettingsDecorator
boolean_cast_setting 'setting_noindex'
end
def theme_preference
settings['setting_theme']
end
def boolean_cast_setting(key)
settings[key] == '1'
end