jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改《邮件样式》 

Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
alan 2015-02-12 00:15:10 +08:00
parent aa8f58530c
commit c00deabf75
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/mailer.rb
View File

@ -134,7 +134,7 @@ class Mailer < ActionMailer::Base
@issue_author_url = url_for(user_activities_url(@author)) @issue_author_url = url_for(user_activities_url(@author))
recipients ||= [] recipients ||= []
if @forum.author.mail_notification != 'day' && @forum.author.mail_notification != 'week' if @forum.author.mail_notification != 'day' && @forum.author.mail_notification != 'week'
recipients << @forum.author.mail recipients << @forum.creator.mail
end end
if @author.mail_notification != 'day' && @author.mail_notification != 'week' if @author.mail_notification != 'day' && @author.mail_notification != 'week'
recipients << @author.mail recipients << @author.mail

4
app/views/mailer/send_for_user_activities.html.erb
View File

@ -319,7 +319,7 @@
<li style="clear: both; list-style: none;"> <li style="clear: both; list-style: none;">
<span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span> <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
<%= link_to forum.author, user_activities_url(forum.author,:token => @token.value), <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
:class => "wmail_name", :class => "wmail_name",
:style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_forum_new) %></span> <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_forum_new) %></span>
@ -349,7 +349,7 @@
<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value), <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value),
:class => "wmail_name", :class => "wmail_name",
:style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
<span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_memo_new_from_forum) %></span> <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %></span>
<%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id)), <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id)),
:class => 'wmail_info', :class => 'wmail_info',

4
app/views/mailer/send_for_user_activities.text.erb
View File

@ -259,7 +259,7 @@
<% @forums.each do |forum|%> <% @forums.each do |forum|%>
▪ ▪
<%= link_to forum.author, user_activities_url(forum.author,:token => @token.value) %> <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
<%= l(:label_forum_new) %> <%= l(:label_forum_new) %>
<%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value) <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value)
@ -279,7 +279,7 @@
▪ ▪
<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%> <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
<%= l(:label_memo_new_from_forum) %> <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
<%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id)) <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))
%> %>