cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dressed up a few more messages.

Browse source 
email_confirm, message_notification and signup_confirm now use the new templates. This fixes some, but not all, of the currently broken tests.
This commit is contained in:
Herve Saint-Amand 2017-01-09 23:42:43 +00:00
parent 417176f868
commit 3aa69ffbdd
4 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/notifier.rb
View file

@ -77,6 +77,9 @@ class Notifier < ActionMailer::Base
@replyurl = url_for(:host => SERVER_URL,
:controller => "message", :action => "reply",
:message_id => message.id)
@user_message_author = @from_user
attach_user_avatar(message.sender)
mail :from => from_address(message.sender.display_name, "m", message.id, message.digest),
:to => message.recipient.email,

10
app/views/notifier/email_confirm.html.erb
View file

@ -1,7 +1,9 @@
<p><%= t 'notifier.email_confirm_html.greeting' %></p>
<% content_for :body do %>
<p style="margin: 0"><%= t 'notifier.email_confirm_html.greeting' %></p>
<p><%= t 'notifier.email_confirm_html.hopefully_you', :server_url => SERVER_URL, :new_address => @address %></p>
<p><%= t 'notifier.email_confirm_html.hopefully_you', :server_url => SERVER_URL, :new_address => @address %></p>
<p><%= t 'notifier.email_confirm_html.click_the_link' %></p>
<p><%= t 'notifier.email_confirm_html.click_the_link' %></p>
<p><a href="<%= @url %>"><%= @url %></a></p>
<p><a href="<%= @url %>" style="white-space: nowrap"><%= @url %></a></p>
<% end %>

29
app/views/notifier/message_notification.html.erb
View file

@ -1,9 +1,24 @@
<p><%= t'notifier.message_notification.hi', :to_user => @to_user %></p>
<% content_for :body do %>
<p style="margin: 0">
<%= t'notifier.message_notification.hi', :to_user => @to_user %>
</p>
<p>
<%= raw t'notifier.message_notification.header',
:from_user => link_to_user(@from_user),
:subject => content_tag("em", @title)
%>
</p>
<p><%= raw t'notifier.message_notification.header', :from_user => link_to(@from_user, :host => SERVER_URL, :controller => :user, :action => :view, :display_name => @from_user), :subject => @title %></p>
<%= render "notifier/user_message_table", :captured => capture { %>
<%= @text.to_html %>
<% } %>
<% end %>
==
<%= @text.to_html %>
==
<p><%= t'notifier.message_notification.footer_html', :readurl => link_to(@readurl, @readurl), :replyurl => link_to(@replyurl, @replyurl) %></p>
<% content_for :footer do %>
<p>
<%= t'notifier.message_notification.footer_html',
:readurl => link_to(@readurl, @readurl) + tag(:br),
:replyurl => link_to(@replyurl, @replyurl)
%>
</p>
<% end %>

12
app/views/notifier/signup_confirm.html.erb
View file

@ -1,9 +1,11 @@
<p><%= t("notifier.signup_confirm.greeting") %></p>
<% content_for :body do %>
<p style="margin: 0"><%= t("notifier.signup_confirm.greeting") %></p>
<p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>
<p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>
<p><%= t("notifier.signup_confirm.confirm") %></p>
<p><%= t("notifier.signup_confirm.confirm") %></p>
<p><%= link_to @url, @url %></p>
<p><%= link_to @url, @url, :style => "white-space: nowrap" %></nobr></p>
<p><%= t("notifier.signup_confirm.welcome") %></p>
<p><%= t("notifier.signup_confirm.welcome") %></p>
<% end %>