From 1d7352d21c69bc2376baf5aa4c3de459541f0085 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 25 Jan 2018 14:40:04 +0100
Subject: [PATCH] fixes textarea and label order on admin budgets phases form

---
 app/views/admin/budget_phases/_form.html.erb | 30 ++++++++++----------
 config/locales/en/admin.yml                  |  4 +--
 config/locales/es/admin.yml                  |  4 +--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/views/admin/budget_phases/_form.html.erb b/app/views/admin/budget_phases/_form.html.erb
index 9595907ac..3119ba3f1 100644
--- a/app/views/admin/budget_phases/_form.html.erb
+++ b/app/views/admin/budget_phases/_form.html.erb
@@ -20,21 +20,6 @@
       </div>
     </div>
 
-    <div class="row margin-top">
-      <div class="small-12 medium-12 column">
-        <%= f.label :summary, t("admin.budget_phases.edit.summary") %>
-
-        <p class="help-text" id="phase-summary-help-text">
-          <%= t("admin.budget_phases.edit.summary_help_text") %>
-        </p>
-
-        <%= f.cktext_area :summary,
-                          maxlength: Budget::Phase::SUMMARY_MAX_LENGTH,
-                          ckeditor: { language: I18n.locale },
-                          label: false %>
-      </div>
-    </div>
-
     <div class="row margin-top">
       <div class="small-12 medium-12 column">
         <%= f.label :description, t("admin.budget_phases.edit.description") %>
@@ -50,6 +35,21 @@
       </div>
     </div>
 
+    <div class="row margin-top">
+      <div class="small-12 medium-12 column">
+        <%= f.label :summary, t("admin.budget_phases.edit.summary") %>
+
+        <p class="help-text" id="phase-summary-help-text">
+          <%= t("admin.budget_phases.edit.summary_help_text") %>
+        </p>
+
+        <%= f.cktext_area :summary,
+                          maxlength: Budget::Phase::SUMMARY_MAX_LENGTH,
+                          ckeditor: { language: I18n.locale },
+                          label: false %>
+      </div>
+    </div>
+
     <div class="row margin-top">
       <div class="small-12 medium-12 column">
         <%= f.check_box :enabled, label: t("admin.budget_phases.edit.enabled") %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 98a4b7fb6..5fdbb1f97 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -125,9 +125,9 @@ en:
         start_date: Start date
         end_date: End date
         summary: Summary
-        summary_help_text: This text will appear in the header when the phase is active
+        summary_help_text: This text will inform the user about the phase. To show it even if the phase is not active, select the checkbox below
         description: Description
-        description_help_text: This text will inform the user about the phase. To show it even if the phase is not active, select the checkbox below
+        description_help_text: This text will appear in the header when the phase is active
         enabled: Phase enabled
         enabled_help_text: This phase will be public in the budget's phases timeline, as well as active for any other purpose
         save_changes: Save changes
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 03b945d5a..2e8945165 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -125,9 +125,9 @@ es:
         start_date: Fecha de Inicio
         end_date: Fecha de fin
         summary: Resumen
-        summary_help_text: Este texto aparecerá en la cabecera cuando la fase esté activa
+        summary_help_text: Este texto informará al usuario sobre la fase. Para mostrarlo aunque la fase no esté activa, marca la opción de más abajo.
         description: Descripción
-        description_help_text: Este texto informará al usuario sobre la fase. Para mostrarlo aunque la fase no esté activa, marca la opción de más abajo.
+        description_help_text: Este texto aparecerá en la cabecera cuando la fase esté activa
         enabled: Fase habilitada
         enabled_help_text: Esta fase será pública en el calendario de fases del presupuesto y estará activa para otros propósitos
         save_changes: Guardar cambios