diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 15:00:27 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2018-10-12 19:06:35 +0200 |
| commit | 3d5d899094ecf389ce6cf31a6f33dcf1894e662d (patch) | |
| tree | 14b450da3a3c60646fa771496fea6e94f8b68181 /app/views/admin/settings | |
| parent | fac529975b2b97e4c57393560d3359a98f7b1953 (diff) | |
Allow selecting both default flavour and theme
Fixes #672
Diffstat (limited to 'app/views/admin/settings')
| -rw-r--r-- | app/views/admin/settings/edit.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index 361e249e0..b82555534 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -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 |