From 3315116832c5f966eac694af27d4756ffec6455f Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 19 Jan 2015 14:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E8=AF=BE=E7=A8=8B--?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=EF=BC=9A=E7=BB=99=E8=AF=BE=E7=A8=8B=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E5=8D=B4=E8=BF=94=E5=9B=9E404=E3=80=8Bbug=20Signed-of?=
 =?UTF-8?q?f-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/contest.rb                | 3 ++-
 app/views/layouts/mailer.html.erb    | 2 +-
 app/views/mailer/issue_add.html.erb  | 1 +
 app/views/mailer/issue_add.text.erb  | 1 +
 app/views/mailer/issue_edit.html.erb | 2 ++
 app/views/mailer/issue_edit.text.erb | 2 ++
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/contest.rb b/app/models/contest.rb
index ad54e8fb4..650e363a8 100644
--- a/app/models/contest.rb
+++ b/app/models/contest.rb
@@ -15,7 +15,8 @@ class Contest < ActiveRecord::Base
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
   has_many :contestnotifications, :dependent => :destroy, :include => :author
 
-  
+
+
 
   acts_as_attachable
 
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index aa43b9194..b80206728 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -39,7 +39,7 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
         </div><!--mail_head end-->
         <%= yield %>
         <hr />
-        <div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div><!--mail_foot end-->
+      <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span><!--mail_foot end-->
     </div>
   </div>
 </body>
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index f51dad121..4db0113b9 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -5,4 +5,5 @@
 
 
 </div>
+<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
 
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index b50a39260..31d9632db 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,2 +1,3 @@
 
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index 3cbd1b02a..0c46b5e60 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -11,3 +11,5 @@
 <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
 <hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index 5b93b6fe0..70e4186c4 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -12,3 +12,5 @@
 <% end -%>
 ----------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+
+<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file