diff --git a/app/assets/images/logo_email_gobierno_abierto.png b/app/assets/images/logo_email_gobierno_abierto.png new file mode 100644 index 000000000..8fe100fce Binary files /dev/null and b/app/assets/images/logo_email_gobierno_abierto.png differ diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 991cf0ffa..91f31ab18 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -1,5 +1,42 @@ - - - <%= yield %> - + + + + Gobierno abierto + + + + + + + + + + + <%= yield %> + +
+ + + + +
+ + <%= image_tag('logo_email_gobierno_abierto.png', style: "border: 0; display: block; width: 100%;max-width: 370px") %> + +
+
+ + + + + + + +
+

+ Preguntas frecuentes • tec.gobiernoabierto@madrid.es

+

+ © 2015 Ayuntamiento de Madrid

+
+ diff --git a/app/views/mailer/comment.html.erb b/app/views/mailer/comment.html.erb index eb95c8031..959b8e0a0 100644 --- a/app/views/mailer/comment.html.erb +++ b/app/views/mailer/comment.html.erb @@ -1,6 +1,18 @@ -<%= t('mailers.comment.hi', recipient: @debate.author.name) %> + -
<%= link_to @debate.title, debate_url(@debate) %>
-
<%= t('mailers.comment.new_comment_by', commenter: @comment.author.name) %>
+

+ <%= t("mailers.comment.title") %> +

-
<%= @comment.body %>
+

+ <%= t("mailers.comment.hi") %> <%= @debate.author.name %>, +

+ +

+ <%= t("mailers.comment.new_comment_by_html", commenter: @comment.author.name) %> <%= link_to @debate.title, debate_url(@debate), style: "color: #2895F1; text-decoration:none;" %> +

+ +

+ <%= @comment.body %> +

+ diff --git a/app/views/mailer/reply.html.erb b/app/views/mailer/reply.html.erb index 21cfeba1e..924234f02 100644 --- a/app/views/mailer/reply.html.erb +++ b/app/views/mailer/reply.html.erb @@ -1,6 +1,18 @@ -<%= t('mailers.reply.hi', recipient: @recipient.name) %> + -
<%= link_to @debate.title, debate_url(@debate) %>
-
<%= t('mailers.reply.new_reply_by', commenter: @reply.author.name) %>
+

+ <%= t("mailers.reply.title") %> +

-
<%= @reply.body %>
+

+ <%= t("mailers.reply.hi") %> <%= @recipient.name %>, +

+ +

+ <%= t("mailers.reply.new_reply_by_html", commenter: @reply.author.name) %> <%= link_to @debate.title, debate_url(@debate), style: "color: #2895F1; text-decoration:none;" %> +

+ +

+ <%= @reply.body %> +

+ diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml index f0e1eb33a..9c9fbec5a 100644 --- a/config/locales/devise_views.en.yml +++ b/config/locales/devise_views.en.yml @@ -11,12 +11,14 @@ en: confirm_link: "Confirm my account" reset_password_instructions: hello: "Hello" + title: Change your password text: "Someone has requested a link to change your password. You can do this through the link below." change_link: "Change my password" ignore_text: "If you didn't request this, please ignore this email." info_text: "Your password won't change until you access the link above and create a new one." unlock_instructions: hello: "Hello" + title: Your account has been locked info_text: "Your account has been locked due to an excessive number of unsuccessful sign in attempts." instructions_text: "Click the link below to unlock your account:" unlock_link: "Unlock my account" diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml index 49d304748..5a9fa4e01 100644 --- a/config/locales/devise_views.es.yml +++ b/config/locales/devise_views.es.yml @@ -11,12 +11,14 @@ es: confirm_link: "Confirmar mi cuenta" reset_password_instructions: hello: "Hola" + title: "Cambiar tu contraseña" text: "Se ha solicitado un enlace para cambiar tu contraseña, puedes hacerlo en el siguiente enlace:" change_link: "cambiar mi contraseña" ignore_text: "Si tu no lo has solicitado, puedes ignorar este email" info_text: "Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques." unlock_instructions: hello: "Hola" + title: Tu cuenta ha sido bloqueada info_text: "Tu cuenta ha sido bloqueada debido a un excesivo número de intentos fallidos de alta." instructions_text: "Sigue el siguiente enlace para desbloquear tu cuenta:" unlock_link: "Desbloquear mi cuenta" diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml index cbc6c5bd6..d0550aca9 100644 --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -1,8 +1,10 @@ en: mailers: comment: - hi: "Hello, %{recipient}" - new_comment_by: "There'is a new comment by %{commenter}" + hi: Hello + title: New comment on your debate + new_comment_by_html: "There'is a new comment by on" reply: - hi: "Hello, %{recipient}" - new_reply_by: "There'is a new reply by %{commenter} to your comment" \ No newline at end of file + hi: Hello + title: New reply on your comment + new_reply_by_html: "There'is a new reply by %{commenter} to your comment on" diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml index e595967c4..8efa1dc22 100644 --- a/config/locales/mailers.es.yml +++ b/config/locales/mailers.es.yml @@ -1,8 +1,10 @@ es: mailers: comment: - hi: "Hola, %{recipient}" - new_comment_by: "Hay un nuevo comentario de %{commenter}" + hi: Hola + title: Nuevo comentario en tu debate + new_comment_by_html: "Hay un nuevo comentario de %{commenter} en" reply: - hi: "Hola, %{recipient}" - new_reply_by: "Hay una nueva respuesta de %{commenter} a tu comentario" \ No newline at end of file + hi: Hola + title: Nueva respuesta a tu comentario + new_reply_by_html: "Hay una nueva respuesta de %{commenter} a tu comentario en"