tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow selecting both default flavour and theme

Browse Source 
Fixes #672
This commit is contained in:
Thibaut Girka
2018-10-08 15:00:27 +02:00
committed by ThibG
parent fac529975b
commit 3d5d899094
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/settings/edit.html.haml
View File

@ -7,7 +7,7 @@
= f.input :site_title, wrapper: :with_label, label: t('admin.settings.site_title')
.fields-group
= f.input :flavour, collection: Themes.instance.flavours, label_method: lambda { |flavour| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, include_blank: false
= f.input :flavour_and_skin, collection: Themes.instance.flavours_and_skins, group_label_method: lambda { |(flavour, _)| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, include_blank: false, as: :grouped_select, label_method: :last, value_method: lambda { |value| value.join('/') }, group_method: :last
.fields-row
.fields-row__column.fields-row__column-6.fields-group