From 7f0bfd44b705b4ebdd1c34d68f7f6b749f128968 Mon Sep 17 00:00:00 2001 From: Adan Amarillas Date: Wed, 23 May 2018 16:38:00 -0700 Subject: [PATCH] Split configuration settings into tabs --- .../admin/settings/_banner_images.html.erb | 24 ++++ .../admin/settings/_banner_styles.html.erb | 24 ++++ .../admin/settings/_configuration.html.erb | 23 ++++ .../admin/settings/_feature_flags.html.erb | 28 +++++ .../admin/settings/_filter_subnav.html.erb | 31 +++++ .../settings/_map_configuration.html.erb | 8 ++ app/views/admin/settings/index.html.erb | 119 +++--------------- 7 files changed, 157 insertions(+), 100 deletions(-) create mode 100644 app/views/admin/settings/_banner_images.html.erb create mode 100644 app/views/admin/settings/_banner_styles.html.erb create mode 100644 app/views/admin/settings/_configuration.html.erb create mode 100644 app/views/admin/settings/_feature_flags.html.erb create mode 100644 app/views/admin/settings/_filter_subnav.html.erb create mode 100644 app/views/admin/settings/_map_configuration.html.erb diff --git a/app/views/admin/settings/_banner_images.html.erb b/app/views/admin/settings/_banner_images.html.erb new file mode 100644 index 000000000..dad208e0d --- /dev/null +++ b/app/views/admin/settings/_banner_images.html.erb @@ -0,0 +1,24 @@ +<% if @banner_imgs.present?%> +

<%= t("admin.settings.index.banner_imgs") %>

+ + + + <% @banner_imgs.each do |setting| %> + + + + + + <% end %> + +
+ <%= t("settings.#{setting.key}") %> + + <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %> + <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %> + <%= f.submit(t('admin.settings.index.update_setting'), class: "button small success") %> + <% end %> +
+<% else %> +

No banner images to show.

+<% end %> diff --git a/app/views/admin/settings/_banner_styles.html.erb b/app/views/admin/settings/_banner_styles.html.erb new file mode 100644 index 000000000..90d303e45 --- /dev/null +++ b/app/views/admin/settings/_banner_styles.html.erb @@ -0,0 +1,24 @@ +<% if @banner_styles.present? %> +

<%= t("admin.settings.index.banners") %>

+ + + + <% @banner_styles.each do |setting| %> + + + + + + <% end %> + +
+ <%= t("settings.#{setting.key}") %> + + <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %> + <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %> + <%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow") %> + <% end %> +
+<% else %> +

No banner styles to show.

+<% end %> diff --git a/app/views/admin/settings/_configuration.html.erb b/app/views/admin/settings/_configuration.html.erb new file mode 100644 index 000000000..edadbb604 --- /dev/null +++ b/app/views/admin/settings/_configuration.html.erb @@ -0,0 +1,23 @@ +

<%= t("admin.settings.index.title") %>

+ + + + <% @settings.each do |setting| %> + + + + + <% end %> + +
+ <%= t("settings.#{setting.key}") %> + + <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %> +
+ <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %> +
+
+ <%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow expanded") %> +
+ <% end %> +
diff --git a/app/views/admin/settings/_feature_flags.html.erb b/app/views/admin/settings/_feature_flags.html.erb new file mode 100644 index 000000000..89f57e1f7 --- /dev/null +++ b/app/views/admin/settings/_feature_flags.html.erb @@ -0,0 +1,28 @@ + +

<%= t("admin.settings.index.feature_flags") %>

+ + + + <% @feature_flags.each do |feature_flag| %> + + + + + + + + <% end %> + +
+ <%= t("settings.#{feature_flag.key}") %> + + <%= feature_flag.enabled? ? t("admin.settings.index.features.enabled") : t("admin.settings.index.features.disabled") %> + + <%= form_for(feature_flag, url: admin_setting_path(feature_flag), html: { id: "edit_#{dom_id(feature_flag)}"}) do |f| %> + + <%= f.hidden_field :value, id: dom_id(feature_flag), value: (feature_flag.enabled? ? "" : "active") %> + <%= f.submit(t("admin.settings.index.features.#{feature_flag.enabled? ? 'disable' : 'enable'}"), + class: "button expanded #{feature_flag.enabled? ? 'hollow alert' : 'success'}", + data: {confirm: t("admin.actions.confirm")}) %> + <% end %> +
diff --git a/app/views/admin/settings/_filter_subnav.html.erb b/app/views/admin/settings/_filter_subnav.html.erb new file mode 100644 index 000000000..a7f2ae48f --- /dev/null +++ b/app/views/admin/settings/_filter_subnav.html.erb @@ -0,0 +1,31 @@ + diff --git a/app/views/admin/settings/_map_configuration.html.erb b/app/views/admin/settings/_map_configuration.html.erb new file mode 100644 index 000000000..342e05f32 --- /dev/null +++ b/app/views/admin/settings/_map_configuration.html.erb @@ -0,0 +1,8 @@ +<% if feature?(:map) %> +

<%= t("admin.settings.index.map.title") %>

+

<%= t("admin.settings.index.map.help") %>

+ + <%= render "map_form" %> +<% else %> +

No map to show.

+<% end %> diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb index e49174fca..7c03d77a5 100644 --- a/app/views/admin/settings/index.html.erb +++ b/app/views/admin/settings/index.html.erb @@ -1,105 +1,24 @@ -

<%= t("admin.settings.index.title") %>

+

Settings

+
+ <%= render "filter_subnav" %> - - - <% @settings.each do |setting| %> - - - - - <% end %> - -
- <%= t("settings.#{setting.key}") %> - - <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %> -
- <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %> -
-
- <%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow expanded") %> -
- <% end %> -
+
+ <%= render "configuration" %> +
-

<%= t("admin.settings.index.feature_flags") %>

+
+ <%= render "feature_flags" %> +
- - - <% @feature_flags.each do |feature_flag| %> - - +
+ <%= render "banner_styles" %> +
- +
+ <%= render "banner_images" %> +
- - - <% end %> - -
- <%= t("settings.#{feature_flag.key}") %> - - <%= feature_flag.enabled? ? t("admin.settings.index.features.enabled") : t("admin.settings.index.features.disabled") %> - - <%= form_for(feature_flag, url: admin_setting_path(feature_flag), html: { id: "edit_#{dom_id(feature_flag)}"}) do |f| %> - - <%= f.hidden_field :value, id: dom_id(feature_flag), value: (feature_flag.enabled? ? "" : "active") %> - <%= f.submit(t("admin.settings.index.features.#{feature_flag.enabled? ? 'disable' : 'enable'}"), - class: "button expanded #{feature_flag.enabled? ? 'hollow alert' : 'success'}", - data: {confirm: t("admin.actions.confirm")}) %> - <% end %> -
- -<% if @banner_styles.present? %> -

<%= t("admin.settings.index.banners") %>

- - - - <% @banner_styles.each do |setting| %> - - - - - - <% end %> - -
- <%= t("settings.#{setting.key}") %> - - <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %> - <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %> - <%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow") %> - <% end %> -
-<% end %> - -<% if @banner_imgs.present?%> -

<%= t("admin.settings.index.banner_imgs") %>

- - - - <% @banner_imgs.each do |setting| %> - - - - - - <% end %> - -
- <%= t("settings.#{setting.key}") %> - - <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %> - <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %> - <%= f.submit(t('admin.settings.index.update_setting'), class: "button small success") %> - <% end %> -
-<% end %> - -<% if feature?(:map) %> -

<%= t("admin.settings.index.map.title") %>

-

<%= t("admin.settings.index.map.help") %>

- - <%= render "map_form" %> - -<% end %> +
+ <%= render "map_configuration" %> +
+