From a700ea2fceb8016f851ee5e3262055aaaae7faf2 Mon Sep 17 00:00:00 2001 From: taitus Date: Sat, 1 Jun 2019 19:22:19 +0200 Subject: [PATCH] Align admin milestones form fields with new translations interface --- app/views/tracking/milestones/_form.html.erb | 63 +++++++++++--------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/app/views/tracking/milestones/_form.html.erb b/app/views/tracking/milestones/_form.html.erb index bd948b661..a6fd6687a 100644 --- a/app/views/tracking/milestones/_form.html.erb +++ b/app/views/tracking/milestones/_form.html.erb @@ -2,35 +2,44 @@ <%= translatable_form_for [:tracking, *resource_hierarchy_for(@milestone)] do |f| %> -
- <%= f.select :status_id, - @statuses.collect { |s| [s.name, s.id] }, - { include_blank: @statuses.any? ? "" : t("tracking.milestones.form.no_statuses_defined") }, - { disabled: @statuses.blank? } %> - <%= link_to t("tracking.milestones.form.admin_statuses"), - admin_milestone_statuses_path %> +
+
+ <%= f.select :status_id, + @statuses.collect { |s| [s.name, s.id] }, + { include_blank: @statuses.any? ? "" : t("tracking.milestones.form.no_statuses_defined") }, + { disabled: @statuses.blank? } %> + <%= link_to t("tracking.milestones.form.admin_statuses"), + admin_milestone_statuses_path %> +
- <%= f.translatable_fields do |translations_form| %> - <%= translations_form.hidden_field :title, value: l(Time.current, format: :datetime), - maxlength: Milestone.title_max_length %> - - <%= translations_form.text_area :description, - rows: 5, - label: t("tracking.milestones.new.description") %> - <% end %> - - <%= f.label :publication_date, t("tracking.milestones.new.date") %> - <%= f.text_field :publication_date, - value: @milestone.publication_date.present? ? l(@milestone.publication_date.to_date) : nil, - label: false, - class: "js-calendar-full" %> - - <%= render "images/admin_image", imageable: @milestone, f: f %> - -
- <%= render "documents/nested_documents", documentable: @milestone, f: f %> +
+ <%= f.translatable_fields do |translations_form| %> +
+ <%= translations_form.hidden_field :title, value: l(Time.current, format: :datetime), + maxlength: Milestone.title_max_length %> + <%= translations_form.text_area :description, + rows: 5, + label: t("tracking.milestones.new.description") %> +
+ <% end %>
- <%= f.submit nil, class: "button success" %> +
+
+ <%= f.label :publication_date, t("tracking.milestones.new.date") %> + <%= f.text_field :publication_date, + value: @milestone.publication_date.present? ? l(@milestone.publication_date.to_date) : nil, + label: false, + class: "js-calendar-full" %> + + <%= render "images/admin_image", imageable: @milestone, f: f %> + +
+ <%= render "documents/nested_documents", documentable: @milestone, f: f %> +
+ + <%= f.submit nil, class: "button success" %> +
+
<% end %>