From 79571e8651cf329077fe4f222c0468525798c979 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Mon, 23 Dec 2013 22:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E5=8F=91=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                               | 2 +-
 app/views/mailer/journals_for_message_add.html.erb | 5 +++--
 app/views/mailer/journals_for_message_add.text.erb | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 1d7ea24b..cf8e0f36 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -38,7 +38,7 @@ class Mailer < ActionMailer::Base
      @message = journals_for_message.notes
      @url = url_for(:controller => 'users', :action => 'user_newfeedback', :id => @mail)
      mail :to => @mail.mail,
-       :subject => "You have a new message"
+       :subject => "#@user leave your a message"
      end
   end
 
diff --git a/app/views/mailer/journals_for_message_add.html.erb b/app/views/mailer/journals_for_message_add.html.erb
index cef20b5c..d6c0bc48 100644
--- a/app/views/mailer/journals_for_message_add.html.erb
+++ b/app/views/mailer/journals_for_message_add.html.erb
@@ -1,3 +1,4 @@
-<h1><%= link_to("hello", @url) %></h1>
-<em><%=h @user %></em>
+<em>尊敬的用户，<%= @user %>(<%= @user.mail%>)给你留言了:</em>
 <div><%= @message %></div>
+<h1>点击链接查看最新回复<%= link_to(@url, @url) %></h1>
+
diff --git a/app/views/mailer/journals_for_message_add.text.erb b/app/views/mailer/journals_for_message_add.text.erb
index 0ac80dfe..ae405d06 100644
--- a/app/views/mailer/journals_for_message_add.text.erb
+++ b/app/views/mailer/journals_for_message_add.text.erb
@@ -1,3 +1,3 @@
-<%= link_to("hello", @url) %>
-<%=h @user %>
-<%= @message %>
\ No newline at end of file
+尊敬的用户，<%= @user %>(<%= @user.mail%>)给你留言了:
+<%= @message %>
+点击链接查看最新回复<%= link_to(@url, @url) %>