about summary refs log tree commit diff
path: root/app/views/settings
diff options
context:
space:
mode:
authorAndrew <andrewLchronister@gmail.com>2017-09-19 07:36:23 -0700
committerEugen Rochko <eugen@zeonfederated.com>2017-09-19 16:36:23 +0200
commit0401a24558294b6941c30c922af3f2063dfd305e (patch)
treef40ee4baffd7f567cb11f9a3c162c2e1c4907534 /app/views/settings
parent4aea3f88a6d30f102a79c2da7fcfac96465ba1a8 (diff)
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
Diffstat (limited to 'app/views/settings')
-rw-r--r--app/views/settings/preferences/show.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index f42f92508..5efd538e4 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -5,6 +5,8 @@
   = render 'shared/error_messages', object: current_user
 
   .fields-group
+    = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| safe_join([I18n.t("themes.#{theme}", default: theme)])}, wrapper: :with_label, include_blank: false
+
     = f.input :locale,
       collection: I18n.available_locales,
       wrapper: :with_label,