diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-11 09:36:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 09:36:14 -0500 |
| commit | 771b950febf2e5ee41ccfcd088f0757d80483332 (patch) | |
| tree | 64419082b5ec535699fb116d933328548beeec92 /app/views | |
| parent | 0cd5f2a61f60dcad51b2c8461fc705facd725075 (diff) | |
| parent | ed7231947c618b7c7c471699a05da85c59afa824 (diff) | |
Merge pull request #254 from glitch-soc/new-theme-ux
New flavour/skin UX
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/settings/flavours/show.html.haml | 19 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 4 |
2 files changed, 19 insertions, 4 deletions
diff --git a/app/views/settings/flavours/show.html.haml b/app/views/settings/flavours/show.html.haml new file mode 100644 index 000000000..43c037737 --- /dev/null +++ b/app/views/settings/flavours/show.html.haml @@ -0,0 +1,19 @@ +- content_for :page_title do + = t "flavours.#{@selected}.name", default: @selected + += simple_form_for current_user, url: settings_flavour_path(@selected), html: { method: :put } do |f| + = render 'shared/error_messages', object: current_user + + - Themes.instance.flavour(@selected)['screenshot'].each do |screen| + %img.flavour-screen{ src: asset_pack_path(screen) } + + .flavour-description + = t "flavours.#{@selected}.description", default: '' + + %hr/ + + .fields-group + = f.input :setting_skin, collection: Themes.instance.skins_for(@selected), label_method: lambda { |skin| I18n.t("skins.#{@selected}.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false + + .actions + = f.button :button, t('generic.use_this'), type: :submit diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 45a3b2eb0..d1459d93c 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -26,10 +26,6 @@ %h4= t 'preferences.web' .fields-group - - if Themes.instance.flavours.size > 1 - = f.input :setting_flavour, collection: Themes.instance.flavours, label_method: lambda { |flavour| I18n.t("flavours.#{flavour}", default: flavour) }, wrapper: :with_label, include_blank: false - = f.input :setting_skin, collection: Themes.instance.skins_for(current_flavour), label_method: lambda { |skin| I18n.t("skins.#{current_flavour}.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false - = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label = f.input :setting_favourite_modal, as: :boolean, wrapper: :with_label |