From a669bd86a877f98cd7bb0ed226cc598127a559b9 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 10 May 2018 18:10:46 +0200
Subject: [PATCH] Improves layout and i18n for admin newsletters

---
 app/views/admin/newsletters/_form.html.erb | 3 ++-
 app/views/admin/newsletters/show.html.erb  | 6 +++---
 config/locales/en/admin.yml                | 3 ++-
 config/locales/es/admin.yml                | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/views/admin/newsletters/_form.html.erb b/app/views/admin/newsletters/_form.html.erb
index bf6b71d5b..994635718 100644
--- a/app/views/admin/newsletters/_form.html.erb
+++ b/app/views/admin/newsletters/_form.html.erb
@@ -4,7 +4,8 @@
   <%= f.select :segment_recipient, options_for_select(user_segments_options,
                                                       @newsletter[:segment_recipient]) %>
   <%= f.text_field :subject %>
-  <%= f.text_field :from %>
+  <%= f.label :from, t("admin.newsletters.new.from") %>
+  <%= f.text_field :from, label: false %>
   <%= f.cktext_area :body, ckeditor: { language: I18n.locale } %>
 
   <div class="margin-top">
diff --git a/app/views/admin/newsletters/show.html.erb b/app/views/admin/newsletters/show.html.erb
index 1a3e3c96b..64b1d7725 100644
--- a/app/views/admin/newsletters/show.html.erb
+++ b/app/views/admin/newsletters/show.html.erb
@@ -7,7 +7,7 @@
 <div class="small-12 column">
   <div class="callout highlight">
     <div class="row">
-      <div class="small-12 medium-4 column">
+      <div class="small-12 medium-2 column">
         <strong><%= t("admin.newsletters.show.sent_at") %></strong><br>
         <% if @newsletter.draft? %>
           <%= t("admin.newsletters.index.draft") %>
@@ -15,7 +15,7 @@
           <%= l @newsletter.sent_at.to_date %>
         <% end %>
       </div>
-      <div class="small-12 medium-4 column">
+      <div class="small-12 medium-6 column">
         <strong><%= t("admin.newsletters.show.from") %></strong><br>
         <%= @newsletter.from %>
       </div>
@@ -24,7 +24,7 @@
         <%= @newsletter.subject %>
       </div>
     </div>
-    <div class="row">
+    <div class="row margin-top">
       <div class="small-12 column">
         <strong><%= t("admin.newsletters.show.segment_recipient") %></strong><br>
         <%= segment_name(@newsletter.segment_recipient) %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 3137a23e1..980a894a3 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -565,6 +565,7 @@ en:
         empty_newsletters: There are no newsletters to show
       new:
         title: New newsletter
+        from: E-mail address that will appear as sending the newsletter
       edit:
         title: Edit newsletter
       show:
@@ -574,7 +575,7 @@ en:
         sent_at: Sent at
         subject: Subject
         segment_recipient: Recipients
-        from: From
+        from: E-mail address that will appear as sending the newsletter
         body: Email content
         body_help_text: This is how the users will see the email
         send_alert: Are you sure you want to send this newsletter to %{n} users?
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 3422f4c9c..dafc71f8d 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -565,6 +565,7 @@ es:
         empty_newsletters: No hay newsletters para mostrar
       new:
         title: Nueva newsletter
+        from: Dirección de correo electrónico que aparecerá como remitente de la newsletter
       edit:
         title: Editar newsletter
       show:
@@ -574,7 +575,7 @@ es:
         sent_at: Enviado
         subject: Asunto
         segment_recipient: Destinatarios
-        from: Enviado por
+        from: Dirección de correo electrónico que aparecerá como remitente de la newsletter
         body: Contenido del email
         body_help_text: Así es como verán el email los usuarios
         send_alert: ¿Estás seguro/a de que quieres enviar esta newsletter a %{n} usuarios?