From d90e51eb1e6fbf57e2bcc2618eadfac315eea532 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 22 Apr 2016 12:02:06 -0400 Subject: [PATCH] better email --- app/mailers/map_mailer.rb | 1 - .../map_mailer/invite_to_edit_email.html.erb | 17 +++++++++++++---- .../map_mailer/invite_to_edit_email.text.erb | 2 +- .../previews/.map_mailer_preview.rb.swp | Bin 0 -> 12288 bytes spec/mailers/previews/map_mailer_preview.rb | 4 +++- 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 spec/mailers/previews/.map_mailer_preview.rb.swp diff --git a/app/mailers/map_mailer.rb b/app/mailers/map_mailer.rb index a31f6fe0..dd164cf3 100644 --- a/app/mailers/map_mailer.rb +++ b/app/mailers/map_mailer.rb @@ -4,7 +4,6 @@ class MapMailer < ApplicationMailer def invite_to_edit_email(map, inviter, invitee) @inviter = inviter @map = map - @url = map_url(@map) subject = @map.name + ' - Invitation to edit' mail(to: invitee.email, subject: subject) end diff --git a/app/views/map_mailer/invite_to_edit_email.html.erb b/app/views/map_mailer/invite_to_edit_email.html.erb index 728c6214..dd39cad5 100644 --- a/app/views/map_mailer/invite_to_edit_email.html.erb +++ b/app/views/map_mailer/invite_to_edit_email.html.erb @@ -3,11 +3,20 @@ - + -

<%= @inviter.name %> has invited you to collaboratively edit the following map on Metamaps:

-

<%= link_to @map.name, @url %>

+
+ <% button_style = "background-color:#a354cd;border:1px solid #673AB7;border-radius:2px;color:white;display:inline-block;font-family:Roboto,Arial,Helvetica,sans-serif;font-size:12px;font-weight:bold;min-height:29px;line-height:29px;min-width:54px;outline:0px;padding:0 8px;text-align:center;text-decoration:none" %> -

Make sense with Metamaps

+

<%= @inviter.name %> has invited you to collaboratively edit the following map on Metamaps:

+

<%= link_to @map.name, map_url(@map), target: "_blank", style: "font-size: 18px; text-decoration: none; color: #a354cd;" %>

+ <% if @map.desc %> +

<%= @map.desc %>

+ <% end %> + + <%= link_to 'Open in Metamaps', map_url(@map), target: "_blank", style: button_style %> + +

Make sense with Metamaps

+
diff --git a/app/views/map_mailer/invite_to_edit_email.text.erb b/app/views/map_mailer/invite_to_edit_email.text.erb index 0913d89c..f1dfa74d 100644 --- a/app/views/map_mailer/invite_to_edit_email.text.erb +++ b/app/views/map_mailer/invite_to_edit_email.text.erb @@ -1,6 +1,6 @@ <%= @inviter.name %> has invited you to collaboratively edit the following map on Metamaps: -<%= @map.name + ' [' + @url + ']' %> +<%= @map.name %> [<%= map_url(@map) %>] Make sense with Metamaps diff --git a/spec/mailers/previews/.map_mailer_preview.rb.swp b/spec/mailers/previews/.map_mailer_preview.rb.swp new file mode 100644 index 0000000000000000000000000000000000000000..93f14ac3c426c0d4b5b64afb448f25d7abb3bb6b GIT binary patch literal 12288 zcmeI&y-ve05C`xp0~;TL4GCo0rARambO2Q>6$4_3#8Q}0@ zO^!0>kOK_@5P$##AOHafKmY;|fB*y_uwDW>jY){=Dny|2U{<5BeCq~6eY^q#U6K66}-3-{m7Xtt#UnC3 qd4@_7F*|`3%89Xac~8nDi&Qestm}1s-#rD(n}9_4ES;7J&`` literal 0 HcmV?d00001 diff --git a/spec/mailers/previews/map_mailer_preview.rb b/spec/mailers/previews/map_mailer_preview.rb index 568129ae..60310bf4 100644 --- a/spec/mailers/previews/map_mailer_preview.rb +++ b/spec/mailers/previews/map_mailer_preview.rb @@ -1,4 +1,6 @@ # Preview all emails at http://localhost:3000/rails/mailers/map_mailer class MapMailerPreview < ActionMailer::Preview - + def invite_to_edit_email + MapMailer.invite_to_edit_email(Map.first, User.first, User.second) + end end