diff --git a/app/mailers/notification/bundle_mailer.rb b/app/mailers/notification/bundle_mailer.rb index 4947981d5..683c83ec8 100644 --- a/app/mailers/notification/bundle_mailer.rb +++ b/app/mailers/notification/bundle_mailer.rb @@ -7,6 +7,6 @@ class Notification::BundleMailer < ApplicationMailer mail \ to: bundle.user.email_address, - subject: "Recent activity in Fizzy" + subject: "Latest Activity in Fizzy" end end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 3aac9002e..19ad2c252 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -3,11 +3,119 @@ - <%= yield %> + + <%= yield %> +
diff --git a/app/views/notification/bundle_mailer/_notification.html.erb b/app/views/notification/bundle_mailer/_notification.html.erb index 308cf172f..6310379a2 100644 --- a/app/views/notification/bundle_mailer/_notification.html.erb +++ b/app/views/notification/bundle_mailer/_notification.html.erb @@ -1,2 +1,10 @@ -<%= render "notification/bundle_mailer/notification/#{notification.source_type.underscore}/header", notification: notification %> -<%= render "notification/bundle_mailer/notification/#{notification.source_type.underscore}/body", notification: notification %> + + + + + +
<%= image_tag user_avatar_url(notification.creator), alt: notification.creator.name, class: "avatar", size: 48 %> + <%= render "notification/bundle_mailer/notification/header", notification: notification %> + <%= render "notification/bundle_mailer/notification/#{notification.source_type.underscore}/body", notification: notification %> + <%= render "notification/bundle_mailer/notification/footer", notification: notification %> +
diff --git a/app/views/notification/bundle_mailer/notification.html.erb b/app/views/notification/bundle_mailer/notification.html.erb index e638a0724..e3a06d567 100644 --- a/app/views/notification/bundle_mailer/notification.html.erb +++ b/app/views/notification/bundle_mailer/notification.html.erb @@ -1,5 +1,7 @@ -

Your Notifications since <%= @bundle.starts_at.strftime("%-l%P on %A, %B %-d") %>

- -

You have <%= @notifications.count %> notifications:

- -<%= render partial: "notification/bundle_mailer/notification", collection: @notifications, as: :notification %> + + +

Everything since <%= @bundle.starts_at.strftime("%-l%P on %A, %B %-d") %>

+

You have <%= pluralize @notifications.count, "new notification" %>.

+ <%= render partial: "notification/bundle_mailer/notification", collection: @notifications, as: :notification %> + + diff --git a/app/views/notification/bundle_mailer/notification/_footer.html.erb b/app/views/notification/bundle_mailer/notification/_footer.html.erb new file mode 100644 index 000000000..aa1b4a282 --- /dev/null +++ b/app/views/notification/bundle_mailer/notification/_footer.html.erb @@ -0,0 +1,3 @@ +

+ <%= notification.creator.name %> +

diff --git a/app/views/notification/bundle_mailer/notification/_header.html.erb b/app/views/notification/bundle_mailer/notification/_header.html.erb new file mode 100644 index 000000000..2cf916c5d --- /dev/null +++ b/app/views/notification/bundle_mailer/notification/_header.html.erb @@ -0,0 +1 @@ +

#<%= notification.card.id %> | <%= notification.card.collection.name %>

diff --git a/app/views/notification/bundle_mailer/notification/event/_body.html.erb b/app/views/notification/bundle_mailer/notification/event/_body.html.erb index 314a1a6dc..4ad6f204a 100644 --- a/app/views/notification/bundle_mailer/notification/event/_body.html.erb +++ b/app/views/notification/bundle_mailer/notification/event/_body.html.erb @@ -1,9 +1,9 @@ <% event = notification.source %> -

- <%= event_notification_title(event) %> +

+ <%= link_to event_notification_title(event), collection_card_url(notification.card.collection, notification.card) %>

-

+

<%= event_notification_body(event) %>

diff --git a/app/views/notification/bundle_mailer/notification/event/_header.html.erb b/app/views/notification/bundle_mailer/notification/event/_header.html.erb deleted file mode 100644 index 9c1cc48fd..000000000 --- a/app/views/notification/bundle_mailer/notification/event/_header.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

#<%= notification.card.id %> <%= notification.card.collection.name %>

-

- <%= notification.creator.familiar_name %> - <%= image_tag user_avatar_url(notification.creator), alt: notification.creator.name, size: 48 %> -

- diff --git a/app/views/notification/bundle_mailer/notification/mention/_body.html.erb b/app/views/notification/bundle_mailer/notification/mention/_body.html.erb index dae1488bb..a53a996bf 100644 --- a/app/views/notification/bundle_mailer/notification/mention/_body.html.erb +++ b/app/views/notification/bundle_mailer/notification/mention/_body.html.erb @@ -1,9 +1,9 @@ <% mention = notification.source %> -

-<%= mention.mentioner.first_name %> mentioned you +

+ <%= link_to "#{mention.mentioner.first_name} mentioned you", collection_card_url(notification.card.collection, notification.card) %>

-

-<%= mention.source.mentionable_content.truncate(200) %> +

+ <%= mention.source.mentionable_content.truncate(200) %>

diff --git a/app/views/notification/bundle_mailer/notification/mention/_header.html.erb b/app/views/notification/bundle_mailer/notification/mention/_header.html.erb deleted file mode 100644 index 9c1cc48fd..000000000 --- a/app/views/notification/bundle_mailer/notification/mention/_header.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

#<%= notification.card.id %> <%= notification.card.collection.name %>

-

- <%= notification.creator.familiar_name %> - <%= image_tag user_avatar_url(notification.creator), alt: notification.creator.name, size: 48 %> -

-