From 9f98435789ba23a9df62aeec1e1d7bb47e19f37b Mon Sep 17 00:00:00 2001 From: taitus Date: Sat, 1 Jun 2019 19:36:53 +0200 Subject: [PATCH] Align admin polls questions form fields with new translations interface --- app/views/admin/poll/questions/_form.html.erb | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb index ccaa0de00..350f25d75 100644 --- a/app/views/admin/poll/questions/_form.html.erb +++ b/app/views/admin/poll/questions/_form.html.erb @@ -6,25 +6,33 @@ <%= f.hidden_field :proposal_id %> -
- <% if @poll.present? %> - <%= f.hidden_field :poll_id, value: @poll.id %> - <% elsif @question.poll.present? %> - <%= f.hidden_field :poll_id, value: @question.poll.id %> - <% else %> -
- <% select_options = Poll.all.map { |p| [p.name, p.id] } %> - <%= f.select :poll_id, - options_for_select(select_options), - prompt: t("admin.questions.index.select_poll"), - label: t("admin.questions.new.poll_label") %> +
+
+ <% if @poll.present? %> + <%= f.hidden_field :poll_id, value: @poll.id %> + <% elsif @question.poll.present? %> + <%= f.hidden_field :poll_id, value: @question.poll.id %> + <% else %> +
+ <% select_options = Poll.all.map { |p| [p.name, p.id] } %> + <%= f.select :poll_id, + options_for_select(select_options), + prompt: t("admin.questions.index.select_poll"), + label: t("admin.questions.new.poll_label") %> +
+ <% end %> +
+
+ +
+ <%= f.translatable_fields do |translations_form| %> +
+ <%= translations_form.text_field :title %>
<% end %> +
- <%= f.translatable_fields do |translations_form| %> - <%= translations_form.text_field :title %> - <% end %> - +
<% if !@question.persisted? %> <%= fields_for :votation_type do |votation_f| %>
@@ -56,8 +64,10 @@
<% end %> <% end %> +
-
+
+
<%= f.submit(class: "button success expanded", value: t("shared.save")) %>