From 8b11b55de9144608de7621251c1289cbba793d51 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 9 Jan 2015 16:48:44 -0300 Subject: [PATCH] Small improvements on layout of person notifier email --- app/views/person_notifier/mailer/_create_article.html.erb | 6 ++---- app/views/person_notifier/mailer/_default_activity.html.erb | 6 ++---- app/views/person_notifier/mailer/_upload_image.html.erb | 6 ++---- app/views/person_notifier/mailer/content_summary.html.erb | 40 ++++++++++++++++++++++++---------------- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/app/views/person_notifier/mailer/_create_article.html.erb b/app/views/person_notifier/mailer/_create_article.html.erb index caf2e19..75acaaf 100644 --- a/app/views/person_notifier/mailer/_create_article.html.erb +++ b/app/views/person_notifier/mailer/_create_article.html.erb @@ -1,10 +1,9 @@ - - -
+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %> -

+

<%= link_to activity.user.short_name(20), activity.user.url %> <%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %> <%= time_ago_as_sentence(activity.created_at) %> @@ -24,4 +23,3 @@ <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>

diff --git a/app/views/person_notifier/mailer/_default_activity.html.erb b/app/views/person_notifier/mailer/_default_activity.html.erb index 5e28fe4..04a6ff7 100644 --- a/app/views/person_notifier/mailer/_default_activity.html.erb +++ b/app/views/person_notifier/mailer/_default_activity.html.erb @@ -1,10 +1,9 @@ - - -
+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %> -

+

<%= link_to activity.user.name, activity.user.url %> <%= describe activity %> <%= time_ago_as_sentence(activity.created_at) %>

@@ -16,4 +15,3 @@ <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
diff --git a/app/views/person_notifier/mailer/_upload_image.html.erb b/app/views/person_notifier/mailer/_upload_image.html.erb index 058a163..bdae2bf 100644 --- a/app/views/person_notifier/mailer/_upload_image.html.erb +++ b/app/views/person_notifier/mailer/_upload_image.html.erb @@ -1,15 +1,13 @@ - - -
+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %> -

+

<%= link_to activity.user.name, activity.user.url %> <%= describe activity %> <%= time_ago_as_sentence(activity.created_at) %>


diff --git a/app/views/person_notifier/mailer/content_summary.html.erb b/app/views/person_notifier/mailer/content_summary.html.erb index d56c2f6..6e587dc 100644 --- a/app/views/person_notifier/mailer/content_summary.html.erb +++ b/app/views/person_notifier/mailer/content_summary.html.erb @@ -1,18 +1,26 @@ -

<%= _("%s's network activity") % @profile.name %>

-
-
-<% @notifications.each do |activity| %> -
- <%= render :partial => activity.verb, :locals => { :activity => activity } rescue "cannot render notification for #{activity.verb}" %> +
+
+
+
+ <%= link_to @url, :style => "text-decoration: none;" do %> + <%= @environment %> + <% end %> + <%= _("%s's network activity") % @profile.name %> +
+
+ <% @notifications.each do |activity| %> +
+ + <%= render :partial => activity.verb, :locals => { :activity => activity } rescue "cannot render notification for #{activity.verb}" %> +
+
+ <% end %> +
+
+

<%= _("Greetings,") %>

+

<%= _('%s team.') % @environment %>

+

<%= link_to @url, url_for(@url) %>

+
-<% end %> +
- -
-

<%= _("Greetings,") %>

-
-

--

-

<%= _('%s team.') % @environment %>

-

<%= url_for @url %>

-
-
-- libgit2 0.21.2