From b4e8395bd6bae5e62d3595bd19a5d7d92c36b5b6 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Tue, 14 May 2019 18:32:13 +0200 Subject: [PATCH] Extract settings forms to partials --- .../admin/settings/_featured_settings_form.html.erb | 6 ++++++ .../admin/settings/_featured_settings_table.html.erb | 8 +------- app/views/admin/settings/_settings_form.html.erb | 8 ++++++++ app/views/admin/settings/_settings_table.html.erb | 9 +-------- 4 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 app/views/admin/settings/_featured_settings_form.html.erb create mode 100644 app/views/admin/settings/_settings_form.html.erb diff --git a/app/views/admin/settings/_featured_settings_form.html.erb b/app/views/admin/settings/_featured_settings_form.html.erb new file mode 100644 index 000000000..b1ec7ca7a --- /dev/null +++ b/app/views/admin/settings/_featured_settings_form.html.erb @@ -0,0 +1,6 @@ +<%= form_for(feature, url: admin_setting_path(feature), html: { id: "edit_#{dom_id(feature)}"}) do |f| %> + <%= f.hidden_field :value, id: dom_id(feature), value: (feature.enabled? ? "" : "active") %> + <%= f.submit(t("admin.settings.index.features.#{feature.enabled? ? "disable" : "enable"}"), + class: "button expanded #{feature.enabled? ? "hollow alert" : "success"}", + data: {confirm: t("admin.actions.confirm")}) %> +<% end %> diff --git a/app/views/admin/settings/_featured_settings_table.html.erb b/app/views/admin/settings/_featured_settings_table.html.erb index 5de1dc9b1..f4ba75823 100644 --- a/app/views/admin/settings/_featured_settings_table.html.erb +++ b/app/views/admin/settings/_featured_settings_table.html.erb @@ -32,13 +32,7 @@ - <%= form_for(feature, url: admin_setting_path(feature), html: { id: "edit_#{dom_id(feature)}"}) do |f| %> - - <%= f.hidden_field :value, id: dom_id(feature), value: (feature.enabled? ? "" : "active") %> - <%= f.submit(t("admin.settings.index.features.#{feature.enabled? ? "disable" : "enable"}"), - class: "button expanded #{feature.enabled? ? "hollow alert" : "success"}", - data: {confirm: t("admin.actions.confirm")}) %> - <% end %> + <%= render "admin/settings/featured_settings_form", feature: feature %> <% end %> diff --git a/app/views/admin/settings/_settings_form.html.erb b/app/views/admin/settings/_settings_form.html.erb new file mode 100644 index 000000000..b6851669b --- /dev/null +++ b/app/views/admin/settings/_settings_form.html.erb @@ -0,0 +1,8 @@ +<%= 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/_settings_table.html.erb b/app/views/admin/settings/_settings_table.html.erb index b6c75b440..76f567afc 100644 --- a/app/views/admin/settings/_settings_table.html.erb +++ b/app/views/admin/settings/_settings_table.html.erb @@ -16,14 +16,7 @@ - <%= 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 "admin/settings/settings_form", setting: setting %> <% end %>