From 27a3ff28d3d8680850714b1fa950c8e7048d8cfc Mon Sep 17 00:00:00 2001
From: taitus <sebastia.roig@gmail.com>
Date: Sat, 1 Jun 2019 18:55:18 +0200
Subject: [PATCH] Align admin legislation processes form fields with new
 translations interface

---
 .../legislation/processes/_form.html.erb      | 417 +++++++++---------
 1 file changed, 211 insertions(+), 206 deletions(-)

diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb
index 1e06c552c..d95f65598 100644
--- a/app/views/admin/legislation/processes/_form.html.erb
+++ b/app/views/admin/legislation/processes/_form.html.erb
@@ -4,253 +4,258 @@
 
   <% if @process.errors.any? %>
 
-  <div id="error_explanation" data-alert class="callout alert" data-closable>
-    <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <div id="error_explanation" data-alert class="callout alert" data-closable>
+      <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+        <span aria-hidden="true">&times;</span>
+      </button>
 
-    <strong>
-      <%= @process.errors.count %>
-      <%= t("admin.legislation.processes.errors.form.error", count: @process.errors.count) %>
-    </strong>
-  </div>
+      <strong>
+        <%= @process.errors.count %>
+        <%= t("admin.legislation.processes.errors.form.error", count: @process.errors.count) %>
+      </strong>
+    </div>
 
   <% end %>
+  <div class="row">
+    <div class="small-12 medium-4 column">
+      <label><%= t("admin.legislation.processes.form.draft_phase") %></label>
+      <p class="help-text"><%= t("admin.legislation.processes.form.draft_phase_description") %></p>
+    </div>
 
-  <div class="small-12 medium-4 column">
-    <label><%= t("admin.legislation.processes.form.draft_phase") %></label>
-    <p class="help-text"><%= t("admin.legislation.processes.form.draft_phase_description") %></p>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :draft_start_date,
+                        value: format_date_for_calendar_form(@process.draft_start_date),
+                        class: "js-calendar-full",
+                        id: "draft_start_date" %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :draft_start_date,
-                      value: format_date_for_calendar_form(@process.draft_start_date),
-                      class: "js-calendar-full",
-                      id: "draft_start_date" %>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :draft_end_date,
+                        value: format_date_for_calendar_form(@process.draft_end_date),
+                        class: "js-calendar-full",
+                        id: "draft_end_date" %>
+    </div>
+    <div class="small-12 medium-2 column margin-top">
+      <%= f.check_box :draft_phase_enabled, checked: @process.draft_phase.enabled?, label: t("admin.legislation.processes.form.enabled") %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :draft_end_date,
-                      value: format_date_for_calendar_form(@process.draft_end_date),
-                      class: "js-calendar-full",
-                      id: "draft_end_date" %>
-  </div>
-  <div class="small-12 medium-2 column margin-top">
-    <%= f.check_box :draft_phase_enabled, checked: @process.draft_phase.enabled?, label: t("admin.legislation.processes.form.enabled") %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="small-12 medium-4 column">
+      <label><%= t("admin.legislation.processes.form.process") %></label>
+    </div>
 
-  <div class="small-12 medium-4 column">
-    <label><%= t("admin.legislation.processes.form.process") %></label>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :start_date,
+                        value: format_date_for_calendar_form(@process.start_date),
+                        class: "js-calendar-full",
+                        id: "start_date" %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :start_date,
-                      value: format_date_for_calendar_form(@process.start_date),
-                      class: "js-calendar-full",
-                      id: "start_date" %>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :end_date,
+                        value: format_date_for_calendar_form(@process.end_date),
+                        class: "js-calendar-full",
+                        id: "end_date" %>
+    </div>
+    <div class="small-12 medium-2 column margin-top">
+      <%= f.check_box :published, checked: @process.published?, label: t("admin.legislation.processes.form.enabled") %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :end_date,
-                      value: format_date_for_calendar_form(@process.end_date),
-                      class: "js-calendar-full",
-                      id: "end_date" %>
-  </div>
-  <div class="small-12 medium-2 column margin-top">
-    <%= f.check_box :published, checked: @process.published?, label: t("admin.legislation.processes.form.enabled") %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="small-12 medium-4 column">
+      <label><%= t("admin.legislation.processes.form.debate_phase") %></label>
+    </div>
 
-  <div class="small-12 medium-4 column">
-    <label><%= t("admin.legislation.processes.form.debate_phase") %></label>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :debate_start_date,
+                        value: format_date_for_calendar_form(@process.debate_start_date),
+                        class: "js-calendar-full",
+                        id: "debate_start_date" %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :debate_start_date,
-                      value: format_date_for_calendar_form(@process.debate_start_date),
-                      class: "js-calendar-full",
-                      id: "debate_start_date" %>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :debate_end_date,
+                        value: format_date_for_calendar_form(@process.debate_end_date),
+                        class: "js-calendar-full",
+                        id: "debate_end_date" %>
+    </div>
+    <div class="small-12 medium-2 column margin-top">
+      <%= f.check_box :debate_phase_enabled, checked: @process.debate_phase.enabled?, label: t("admin.legislation.processes.form.enabled") %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :debate_end_date,
-                      value: format_date_for_calendar_form(@process.debate_end_date),
-                      class: "js-calendar-full",
-                      id: "debate_end_date" %>
-  </div>
-  <div class="small-12 medium-2 column margin-top">
-    <%= f.check_box :debate_phase_enabled, checked: @process.debate_phase.enabled?, label: t("admin.legislation.processes.form.enabled") %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="small-12 medium-4 column">
+      <label><%= t("admin.legislation.processes.form.proposals_phase") %></label>
+    </div>
 
-  <div class="small-12 medium-4 column">
-    <label><%= t("admin.legislation.processes.form.proposals_phase") %></label>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :proposals_phase_start_date,
+                        value: format_date_for_calendar_form(@process.proposals_phase_start_date),
+                        class: "js-calendar-full",
+                        id: "proposals_phase_start_date" %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :proposals_phase_start_date,
-                      value: format_date_for_calendar_form(@process.proposals_phase_start_date),
-                      class: "js-calendar-full",
-                      id: "proposals_phase_start_date" %>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :proposals_phase_end_date,
+                        value: format_date_for_calendar_form(@process.proposals_phase_end_date),
+                        class: "js-calendar-full",
+                        id: "proposals_phase_end_date" %>
+    </div>
+    <div class="small-12 medium-2 column margin-top">
+      <%= f.check_box :proposals_phase_enabled, checked: @process.proposals_phase.enabled?, label: t("admin.legislation.processes.form.enabled") %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :proposals_phase_end_date,
-                      value: format_date_for_calendar_form(@process.proposals_phase_end_date),
-                      class: "js-calendar-full",
-                      id: "proposals_phase_end_date" %>
-  </div>
-  <div class="small-12 medium-2 column margin-top">
-    <%= f.check_box :proposals_phase_enabled, checked: @process.proposals_phase.enabled?, label: t("admin.legislation.processes.form.enabled") %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="small-12 medium-4 column">
+      <label><%= t("admin.legislation.processes.form.allegations_phase") %></label>
+    </div>
 
-  <div class="small-12 medium-4 column">
-    <label><%= t("admin.legislation.processes.form.allegations_phase") %></label>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :allegations_start_date,
+                        value: format_date_for_calendar_form(@process.allegations_start_date),
+                        class: "js-calendar-full",
+                        id: "allegations_start_date" %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :allegations_start_date,
-                      value: format_date_for_calendar_form(@process.allegations_start_date),
-                      class: "js-calendar-full",
-                      id: "allegations_start_date" %>
-  </div>
+    <div class="small-12 medium-3 column">
+      <%= f.text_field :allegations_end_date,
+                        value: format_date_for_calendar_form(@process.allegations_end_date),
+                        class: "js-calendar-full",
+                        id: "allegations_end_date" %>
+    </div>
+    <div class="small-12 medium-2 column margin-top">
+      <%= f.check_box :allegations_phase_enabled, checked: @process.allegations_phase.enabled?, label: t("admin.legislation.processes.form.enabled") %>
+    </div>
 
-  <div class="small-12 medium-3 column">
-    <%= f.text_field :allegations_end_date,
-                      value: format_date_for_calendar_form(@process.allegations_end_date),
-                      class: "js-calendar-full",
-                      id: "allegations_end_date" %>
-  </div>
-  <div class="small-12 medium-2 column margin-top">
-    <%= f.check_box :allegations_phase_enabled, checked: @process.allegations_phase.enabled?, label: t("admin.legislation.processes.form.enabled") %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="small-12 medium-3 column end">
+      <%= f.text_field :draft_publication_date,
+                        value: format_date_for_calendar_form(@process.draft_publication_date),
+                        class: "js-calendar-full",
+                        id: "draft_publication_date" %>
+    </div>
+    <div class="small-12 medium-2 column margin-top">
+      <%= f.check_box :draft_publication_enabled, checked: @process.draft_publication.enabled?, label: t("admin.legislation.processes.form.enabled") %>
+    </div>
 
-  <div class="small-12 medium-3 column end">
-    <%= f.text_field :draft_publication_date,
-                      value: format_date_for_calendar_form(@process.draft_publication_date),
-                      class: "js-calendar-full",
-                      id: "draft_publication_date" %>
-  </div>
-  <div class="small-12 medium-2 column margin-top">
-    <%= f.check_box :draft_publication_enabled, checked: @process.draft_publication.enabled?, label: t("admin.legislation.processes.form.enabled") %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="small-12 medium-3 column end">
+      <%= f.text_field :result_publication_date,
+                        value: format_date_for_calendar_form(@process.result_publication_date),
+                        class: "js-calendar-full",
+                        id: "result_publication_date" %>
+    </div>
+    <div class="small-12 medium-2 column margin-top">
+      <%= f.check_box :result_publication_enabled, checked: @process.result_publication.enabled?, label: t("admin.legislation.processes.form.enabled") %>
+    </div>
 
-  <div class="small-12 medium-3 column end">
-    <%= f.text_field :result_publication_date,
-                      value: format_date_for_calendar_form(@process.result_publication_date),
-                      class: "js-calendar-full",
-                      id: "result_publication_date" %>
-  </div>
-  <div class="small-12 medium-2 column margin-top">
-    <%= f.check_box :result_publication_enabled, checked: @process.result_publication.enabled?, label: t("admin.legislation.processes.form.enabled") %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="documents small-12 column">
+      <%= render "documents/nested_documents", documentable: @process, f: f %>
+    </div>
 
-  <div class="documents small-12 column">
-    <%= render "documents/nested_documents", documentable: @process, f: f %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="images small-12 column">
+      <%= render "images/nested_image", imageable: @process, f: f %>
+    </div>
 
-  <div class="images small-12 column">
-    <%= render "images/nested_image", imageable: @process, f: f %>
-  </div>
+    <div class="small-12 column">
+      <hr>
+    </div>
 
-  <div class="small-12 column">
-    <hr>
-  </div>
+    <div class="small-12 column">
+      <h3><%= t("admin.legislation.processes.form.banner_title") %></h3>
+    </div>
 
-  <div class="small-12 column">
-    <h3><%= t("admin.legislation.processes.form.banner_title") %></h3>
-  </div>
-
-  <div class="small-6 large-3 column">
-    <%= f.label :background_color, nil, for: "background_color_input" %>
-    <p class="help-text"><%= t("admin.shared.color_help") %></p>
-    <div class="row collapse">
-      <div class="small-12 medium-6 column">
-        <%= f.text_field :background_color, label: false, type: :color,
-                                            value: bg_color_or_default %>
-      </div>
-      <div class="small-12 medium-6 column">
-        <%= f.text_field :background_color, label: false, id: "background_color_input" %>
+    <div class="small-6 large-3 column">
+      <%= f.label :background_color, nil, for: "background_color_input" %>
+      <p class="help-text"><%= t("admin.shared.color_help") %></p>
+      <div class="row collapse">
+        <div class="small-12 medium-6 column">
+          <%= f.text_field :background_color, label: false, type: :color,
+                                              value: bg_color_or_default %>
+        </div>
+        <div class="small-12 medium-6 column">
+          <%= f.text_field :background_color, label: false, id: "background_color_input" %>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="small-6 large-3 column end">
-    <%= f.label :font_color, nil, for: "font_color_input" %>
-    <p class="help-text"><%= t("admin.shared.color_help") %></p>
-    <div class="row collapse">
-      <div class="small-12 medium-6 column">
-        <%= f.text_field :font_color, label: false, type: :color, value: font_color_or_default %>
-      </div>
-      <div class="small-12 medium-6 column">
-        <%= f.text_field :font_color, label: false, id: "font_color_input" %>
+    <div class="small-6 large-3 column end">
+      <%= f.label :font_color, nil, for: "font_color_input" %>
+      <p class="help-text"><%= t("admin.shared.color_help") %></p>
+      <div class="row collapse">
+        <div class="small-12 medium-6 column">
+          <%= f.text_field :font_color, label: false, type: :color, value: font_color_or_default %>
+        </div>
+        <div class="small-12 medium-6 column">
+          <%= f.text_field :font_color, label: false, id: "font_color_input" %>
+        </div>
       </div>
     </div>
+
+    <div class="small-12 column">
+      <hr>
+    </div>
   </div>
 
-  <div class="small-12 column">
-    <hr>
+  <div class="row">
+    <%= f.translatable_fields do |translations_form| %>
+      <div class="small-12 medium-9 column">
+        <%= translations_form.text_field :title,
+                                         placeholder: t("admin.legislation.processes.form.title_placeholder") %>
+      </div>
+
+      <div class="small-12 medium-9 column">
+        <%= translations_form.text_area :summary,
+                                        rows: 2,
+                                        placeholder: t("admin.legislation.processes.form.summary_placeholder"),
+                                        hint: t("admin.legislation.processes.form.use_markdown") %>
+      </div>
+
+      <div class="small-12 medium-9 column">
+        <%= translations_form.text_area :description,
+                                        rows: 5,
+                                        placeholder: t("admin.legislation.processes.form.description_placeholder"),
+                                        hint: t("admin.legislation.processes.form.use_markdown") %>
+      </div>
+
+      <div class="small-12 medium-9 column end">
+        <%= translations_form.text_area :additional_info,
+                                        rows: 10,
+                                        placeholder: t("admin.legislation.processes.form.additional_info_placeholder"),
+                                        hint: t("admin.legislation.processes.form.use_markdown") %>
+      </div>
+    <% end %>
   </div>
 
-  <%= f.translatable_fields do |translations_form| %>
-    <div class="small-12 medium-9 column">
-      <%= translations_form.text_field :title,
-                                       placeholder: t("admin.legislation.processes.form.title_placeholder") %>
+  <div class="row">
+    <div class="small-12 medium-3 column clear end">
+      <%= f.submit(class: "button success expanded", value: t("admin.legislation.processes.#{admin_submit_action(@process)}.submit_button")) %>
     </div>
-
-    <div class="small-12 medium-9 column">
-      <%= translations_form.text_area :summary,
-                                      rows: 2,
-                                      placeholder: t("admin.legislation.processes.form.summary_placeholder"),
-                                      hint: t("admin.legislation.processes.form.use_markdown") %>
-    </div>
-
-    <div class="small-12 medium-9 column">
-      <%= translations_form.text_area :description,
-                                      rows: 5,
-                                      placeholder: t("admin.legislation.processes.form.description_placeholder"),
-                                      hint: t("admin.legislation.processes.form.use_markdown") %>
-    </div>
-
-    <div class="small-12 medium-9 column end">
-      <%= translations_form.text_area :additional_info,
-                                      rows: 10,
-                                      placeholder: t("admin.legislation.processes.form.additional_info_placeholder"),
-                                      hint: t("admin.legislation.processes.form.use_markdown") %>
-    </div>
-  <% end %>
-
-  <div class="small-12 medium-3 column clear end">
-    <%= f.submit(class: "button success expanded", value: t("admin.legislation.processes.#{admin_submit_action(@process)}.submit_button")) %>
   </div>
 <% end %>