From f01d164295ea186cf827a4e551baed20b9b0ed61 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 21 Jan 2015 12:01:02 +0800
Subject: [PATCH 1/6] Signed-off-by: alan <547533434@qq.com>

---
 app/helpers/courses_helper.rb | 2 +-
 app/models/mailer.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 95b049dc2..22eb9bfae 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -112,7 +112,7 @@ module CoursesHelper
  # end
 
   #获取课程所有成员
-  def course_member course
+  def course_all_member course
     course.members
   end
   # 学生人数计算
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a2e742ee3..2cd069175 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -62,7 +62,7 @@ class Mailer < ActionMailer::Base
       course =  journals_for_message.jour
       @author = journals_for_message.user
       #课程的教师
-      @members = course_member journals_for_message.jour
+      @members = course_all_member journals_for_message.jour
       #收件人邮箱
       @recipients ||= []
       @members.each do |teacher|

From 7ee17b6d7ceb038ee5d24f8045868237daefc275 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 15:43:15 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B7=A6=E8=BE=B9=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/polls.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 06802285d..e601d231d 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -19,7 +19,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 .polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
 
 /*问卷列表*/
-.polls_content{ width:615px;}
+.polls_content{ width:615px;padding-left: 6px;}
 .polls_head{ width:677px; height:48px; background:#eaeaea;}
 .polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;}
 .polls_head span{ font-weight:normal; color:#15bccf;}

From d68486669e5712e268769fde68fceac04392d985 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 16:07:44 +0800
Subject: [PATCH 3/6] =?UTF-8?q?#1830=E8=AF=BE=E7=A8=8B--=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=8E=8B=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/member.html.erb   | 2 +-
 public/stylesheets/course_group.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb
index 2599760ad..803be3731 100644
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@@ -56,7 +56,7 @@
 </script>
 <%= stylesheet_link_tag  'course_group', :media => 'all' %>
 <script type="text/javascript" src="javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js"></script>
-<div class="st_list">
+<div class="st_list" id="member_of_course">
   <div class="st_search" style="margin-left: 14px" >
     <span class="f_l"><%= @subPage_title %></span>
         <span id = "search_members">
diff --git a/public/stylesheets/course_group.css b/public/stylesheets/course_group.css
index b6c7f4f8c..c160e1730 100644
--- a/public/stylesheets/course_group.css
+++ b/public/stylesheets/course_group.css
@@ -1,4 +1,4 @@
-body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+#member_of_course{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
 div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea,form{ margin:0; padding:0;}
 div,img,tr,td,textarea,form{ border:0;}
 table,tr,td{border:0; cellspacing:0; cellpadding:0;}

From 3279928bef0cb9256d4d651f97841dce515f941a Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Wed, 21 Jan 2015 18:12:04 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=9B?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/mailer.html.erb            |  4 +--
 app/views/mailer/_issue.html.erb             | 14 +++++------
 app/views/mailer/_issue.text.erb             | 14 +++++------
 app/views/mailer/issue_add.html.erb          |  2 +-
 app/views/mailer/issue_add.text.erb          |  2 +-
 app/views/mailer/issue_edit.html.erb         | 22 ++++++++++-------
 app/views/mailer/issue_edit.text.erb         |  4 +--
 app/views/my/account.html.erb                | 26 ++++++++++----------
 app/views/users/_mail_notifications.html.erb |  2 +-
 config/locales/en.yml                        | 16 +++++++++++-
 config/locales/zh.yml                        | 15 +++++++++++
 11 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index b80206728..a05eacbd1 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -11,7 +11,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ ma
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
+.cl{ clear:both; overflow:hidden; margin-top: 30px;}
 a{ text-decoration:none; }
 a:hover{ text-decoration:underline; }
 .mail_box,ul,li{ list-style-type:none}
@@ -35,7 +35,7 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
  <div class="container">
 	<div class="mail">
     	<div class="mail_head">
-        	<p>亲爱的Trustie用户，您好！</p>
+        	<p><%= l(:mail_issue_greetings)%></p>
         </div><!--mail_head end-->
         <%= yield %>
         <hr />
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 5979877a3..c97c82426 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -2,19 +2,19 @@
 <p>
       <span class="c_blue">
         <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     </span>在
-  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span>中有了一个与您相关的最新活动，请您关注！</p>
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span></span><%= l(:mail_issue_title_active)%></p>
 <div class="mail_box">
 <ul>
-	<li style="list-style-type:none"><span style="float: left"><strong>标题：</strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong>来源：</strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b>项目<%= issue.tracker.name%></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong >内容：</strong></span><span style="float: left; width: 500px">
+	<li style="list-style-type:none"><span style="float: left"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong ><%= l(:mail_issue_content)%></strong></span><span style="float: left; width: 500px">
                     	<%= issue.description %></span>
     </li>
   <li style="list-style-type:none">
 
     <% unless @issue.attachments.nil? %>
-     <span style="float: left"> <strong>附件：</strong>
+     <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong>
             </span><span style="float: left; width: 500px">
           <% @issue.attachments.each do |attach| %>
           <p><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %></p>
@@ -25,7 +25,7 @@
   </li>
 </ul>
   <div class="cl"></div>
-  <label  class="mail_reply"><%= link_to( "我要回复", issue_url,  :class => "mail_reply") %></label>
+  <label  class="mail_reply"><%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply") %></label>
   <div class="cl"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb
index ae80a3fe0..89ee8337e 100644
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@@ -1,13 +1,13 @@
 
         <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     在
- <%= link_to(h("#{@issue.project.name}"),@project_url) %>中有了一个与您相关的最新活动，请您关注！
-标题：<%= link_to(issue.subject, issue_url) %>
-  来源：<%= issue.project.name %>|&nbsp;项目缺陷<
- 内容：
+     <%= l(:mail_issue_title_userin)%>
+ <%= link_to(h("#{@issue.project.name}"),@project_url) %><%= l(:mail_issue_title_active)%>
+<%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url) %>
+<%= l(:mail_issue_sent_from)%>|&nbsp;<%= l(:mail_issue_from_project)%>
+<%= l(:mail_issue_content)%>
      <%= issue.description %>
         <% unless @issue.attachments.nil? %>
- 附件：
+<%= l(:mail_issue_attachments)%>
 
 
             <% @issue.attachments.each do |attach| %>
@@ -16,4 +16,4 @@
         <% end %>
 
 
- <%= link_to( "我要回复", issue_url) %>
+ <%= link_to( l(:mail_issue_reply), issue_url) %>
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index 4db0113b9..e46a93381 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -5,5 +5,5 @@
 
 
 </div>
-<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
 
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index 31d9632db..c5b391685 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,3 +1,3 @@
 
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file
+<%= link_to( l(:mail_issue_footer), @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 0c46b5e60..6fcb0ddb5 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -1,15 +1,19 @@
-<%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
+<div>
+  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
 
-<ul>
-<% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
+  <ul>
+    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
       <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
         <li><%= string %></li>
-  <% end %>
-<% end %>
-</ul>
+      <% end %>
+    <% end %>
+  </ul>
+
+  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
+</div>
+<div class="cl"></div>
+<hr/>
 
-<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>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
 
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index 70e4186c4..aad21ad90 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -10,7 +10,7 @@
     <%= l(:field_content)%>：<%= @journal.notes %>
 
 <% end -%>
-----------------------------------------
+--------------------------------------------------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 
-<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
\ No newline at end of file
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 2621d4fa3..47cfb4221 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -123,10 +123,10 @@
       <br/>
     </p>
 
-    <p style="width:400px;padding-left: 50px;">
-      <label style="margin-right: 1px;">
-        <%= l(:label_identity) %><span style="color: #bb0000;"> *</span></label>
-      <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: 0px;">
+    <p style="width:400px;padding-left: 53px;">
+      <label for="userIdentity">
+        <%= l(:label_identity) %><span class="required"> *</span></label>
+      <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: -4px;">
         <option value="">
           <%= l(:label_account_identity_choose) %>
         </option>
@@ -187,19 +187,19 @@
       <!-- added by bai  增加账户里的性别-->
         <span id='gender' style='display:none'>
         <% if @user.user_extensions.nil? %>
-            <p style="width:400px;padding-left: 52px;">
-              <%= l(:label_gender) %>&nbsp;&nbsp;
+            <p style="width:400px;padding-left: 53px;">
+              <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
               <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
             </p>
         <% else %>
             <% if @user.user_extensions.gender == 0 %><!-- label_gender_male -->
-              <p style="width:400px;padding-left: 52px;">
-                <%= l(:label_gender) %>&nbsp;&nbsp;
+              <p style="width:400px;padding-left: 53px;">
+                <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
                 <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
               </p>
             <% else %>
                 <p style="width:400px;padding-left: 54px;">
-                  <%= l(:label_gender) %>&nbsp;&nbsp;
+                  <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
                   <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1' selected='selected'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
                 </p>
             <% end %>
@@ -212,9 +212,9 @@
 
 
       <!-- added by Wen -->
-      <p id="occupation_detail" style="padding-left: 24px; display: none">
+      <p id="occupation_detail" style="padding-left: 25px; display: none">
 
-            <%= l(:field_occupation) %>
+            <label for="occupation_name"><%= l(:field_occupation) %></label>
             <span class="required">&nbsp;</span>
         <% if User.current.user_extensions.nil? %>
             <input id="province" name="province" style="display: none" type="text" value="请单击选择省份及学校" readonly>
@@ -318,7 +318,7 @@
           });
       </script>
 
-      <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;"><%= l(:label_location) %></label>
+      <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;" for="userProvince"><%= l(:label_location) %></label>
         <select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="location">
           <option value="">--请选择省份--</option>
           <option value="北京">北京</option>
@@ -382,7 +382,7 @@
       <legend onclick="toggleFieldset(this);">
         <%= l(:field_mail_notification) %>
       </legend>
-      <div style="padding-left: 8px;"> <!-- modified by ming -->
+      <div style="padding-left: 3px;"> <!-- modified by ming -->
         <p style="width:380px;">
           <%= render :partial => 'users/mail_notifications' %>
         </p></div>
diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb
index a8d3edc55..7dd4ad77f 100644
--- a/app/views/users/_mail_notifications.html.erb
+++ b/app/views/users/_mail_notifications.html.erb
@@ -1,5 +1,5 @@
 <p>
-<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" %>
+<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" , :style=> 'margin-right: 5px;'%>
 <%= select_tag(
       'user[mail_notification]',
       options_for_select(
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dd79a546c..830ea18e0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -224,7 +224,21 @@ en:
   mail_body_wiki_content_added: "The '%{id}' wiki page has been added by %{author}."
   mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
   mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}."
-
+  
+  # edit by meng
+  # emailer
+  mail_issue_greetings: "Dear user , Greetings from Trustie"
+  mail_issue_footer: "Unsubscribe this message?"
+  mail_issue_title_userin: "in"
+  mail_issue_title_active: "has a new activity which relevants to you , please pay more attention to this!"
+  mail_issue_subject: "Title："
+  mail_issue_content: "Content："
+  mail_issue_sent_from: "From："
+  mail_issue_from_project: "project issue"
+  mail_issue_attachments: "Attachments："
+  mail_issue_reply: "Want reply"
+  #end
+  
   field_name: Name
   field_description: Description
   field_summary: Summary
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f36174cf9..7d373ca25 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -233,6 +233,21 @@ zh:
   mail_body_wiki_content_added: "'%{id}' wiki页面已由 %{author} 添加。"
   mail_subject_wiki_content_updated: "'%{id}' wiki页面已更新。"
   mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
+  
+  # edit by meng
+  # emailer
+  mail_issue_greetings: "亲爱的Trustie用户，您好！"
+  mail_issue_footer: "退订该邮件！"
+  mail_issue_title_userin: "在"
+  mail_issue_title_active: "中有了一个与您相关的最新活动，请您关注！"
+  mail_issue_subject: "标题："
+  mail_issue_content: "内容："
+  mail_issue_sent_from: "来源："
+  mail_issue_from_project: "项目问题跟踪"
+  mail_issue_attachments: "附件："
+  mail_issue_reply: "我要回复"
+  #end
+  
   field_name: 名称
   #added by huang
   field_tea_name: 教师

From 432e3a05f2be310b92d0577a37d36e8d707ddafd Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 22 Jan 2015 16:30:21 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=EF=BC=8C=E5=8F=91=E5=B8=96=E6=97=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=8A=E9=82=AE=E4=BB=B6=E9=87=8D=E5=8F=91=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.c?=
 =?UTF-8?q?om>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/forums_controller.rb          |  13 +-
 app/models/forum.rb                           |   7 +-
 app/models/forum_observer.rb                  |   8 ++
 app/models/mailer.rb                          | 130 ++++++++++++++----
 app/models/memo.rb                            |   8 +-
 app/models/memo_observer.rb                   |   8 ++
 app/models/project.rb                         |   2 +-
 app/views/mailer/forum_add.html.erb           |   4 +
 app/views/mailer/forum_add.text.erb           |   4 +
 app/views/mailer/forum_message_added.html.erb |   4 +
 app/views/mailer/forum_message_added.text.erb |   5 +
 app/views/mailer/message_posted.html.erb      |   8 +-
 config/locales/en.yml                         |   2 +
 config/locales/zh.yml                         |   2 +
 lib/redmine/notifiable.rb                     |   2 +
 spec/models/forum_observer_spec.rb            |   5 +
 spec/models/memo_observer_spec.rb             |   5 +
 17 files changed, 178 insertions(+), 39 deletions(-)
 create mode 100644 app/models/forum_observer.rb
 create mode 100644 app/models/memo_observer.rb
 create mode 100644 app/views/mailer/forum_add.html.erb
 create mode 100644 app/views/mailer/forum_add.text.erb
 create mode 100644 app/views/mailer/forum_message_added.html.erb
 create mode 100644 app/views/mailer/forum_message_added.text.erb
 create mode 100644 spec/models/forum_observer_spec.rb
 create mode 100644 spec/models/memo_observer_spec.rb

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 03d1454ef..54b8c6305 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -160,12 +160,15 @@ class ForumsController < ApplicationController
   def create
     @forum = Forum.new(params[:forum])
     @forum.creator_id = User.current.id
+    if @forum.save
+      respond_to do |format|
 
-    respond_to do |format|
-      if @forum.save
-        format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
-        format.json { render json: @forum, status: :created, location: @forum }
-      else
+          format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
+          format.json { render json: @forum, status: :created, location: @forum }
+      end
+
+    else
+      respond_to do |format|
         flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
         format.html { render action: "new" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }
diff --git a/app/models/forum.rb b/app/models/forum.rb
index 61ba528a0..eb8bb19d2 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -18,7 +18,7 @@ class Forum < ActiveRecord::Base
   
   acts_as_taggable
   scope :by_join_date, order("created_at DESC")
-
+  after_create :send_email
   def reset_counters!
     self.class.reset_counters!(id)
   end
@@ -33,6 +33,11 @@ class Forum < ActiveRecord::Base
     self.creator == user || user.admin?
   end
 
+  def send_email
+    Thread.start do
+      Mailer.forum_add(self).deliver if Setting.notified_events.include?('forum_add')
+    end
+  end
   # Updates topic_count, memo_count and last_memo_id attributes for +board_id+
   def self.reset_counters!(forum_id)
     forum_id = forum_id.to_i
diff --git a/app/models/forum_observer.rb b/app/models/forum_observer.rb
new file mode 100644
index 000000000..1c514d6ab
--- /dev/null
+++ b/app/models/forum_observer.rb
@@ -0,0 +1,8 @@
+class ForumObserver < ActiveRecord::Observer
+  def after_create(forum)
+    Thread.start do
+      Mailer.forum_add(forum).deliver if Setting.notified_events.include?('forum_add')
+    end
+
+  end
+end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2cd069175..02684a187 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -26,7 +26,37 @@ class Mailer < ActionMailer::Base
   def self.default_url_options
     { :host => Setting.host_name, :protocol => Setting.protocol }
   end
-  
+
+  # 贴吧新建贴吧发送邮件
+  # example Mailer.forum(forum).deliver
+  def forum_add(forum)
+
+    redmine_headers 'Forum' => forum.id
+    @forum = forum
+    @author = forum.creator
+    recipients = forum.creator.mail
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => forum.id)
+    mail :to => recipients,:subject => "[ #{l(:label_forum)} : #{forum.name} #{l(:notice_successful_create)}]"
+
+  end
+
+  def forum_message_added(memo)
+    @memo = memo
+    redmine_headers 'Memo' => memo.id
+    @forum = memo.forum
+    @author = memo.author
+    recipients ||= []
+    mems = memo.self_and_siblings
+    mems.each do |mem|
+      recipients << mem.author.mail unless recipients.include? mem.author.mail
+    end
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @memo_url = url_for(forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)))
+    mail :to => recipients,:subject => "[ #{l(:label_message_plural)} : #{memo.subject} #{l(:label_memo_create_succ)}]"
+  end
   # Builds a Mail::Message object used to email recipients of the added journals for message.
 
   # 留言分为直接留言，和对留言人留言的回复
@@ -282,7 +312,7 @@ class Mailer < ActionMailer::Base
         recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
       when 'Course'
         added_to_url = url_for(:controller => 'files', :action => 'index', :course_id => container)
-        added_to = "#{l(:label_course)}: #{container}"
+        added_to = "#{l(:label_course)}: #{container.name}"
         recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
       when 'Version'
         added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
@@ -323,13 +353,25 @@ class Mailer < ActionMailer::Base
   #   news_added(news) => Mail::Message object
   #   Mailer.news_added(news).deliver => sends an email to the news' project recipients
   def news_added(news)
-    redmine_headers 'Project' => news.project.identifier
-    @author = news.author
-    message_id news
-    @news = news
-    @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-    mail :to => news.recipients,
-      :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+
+    if news.project
+      redmine_headers 'Project' => news.project.identifier
+      @author = news.author
+      message_id news
+      @news = news
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => news.recipients,
+        :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    elsif  news.course
+      redmine_headers 'Course' => news.course.id
+      @author = news.author
+      message_id news
+      @news = news
+      recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => recipients,
+           :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}"
+    end
   end
 
   # Builds a Mail::Message object used to email recipients of a news' project when a news comment is added.
@@ -339,15 +381,28 @@ class Mailer < ActionMailer::Base
   #   Mailer.news_comment_added(comment) => sends an email to the news' project recipients
   def news_comment_added(comment)
     news = comment.commented
-    redmine_headers 'Project' => news.project.identifier
-    @author = comment.author
-    message_id comment
-    @news = news
-    @comment = comment
-    @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-    mail :to => news.recipients,
-     :cc => news.watcher_recipients,
-     :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    if news.project
+      redmine_headers 'Project' => news.project.identifier
+      @author = comment.author
+      message_id comment
+      @news = news
+      @comment = comment
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => news.recipients,
+       :cc => news.watcher_recipients,
+       :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    elsif news.course
+      redmine_headers 'Course' => news.course.id
+      @author = comment.author
+      message_id comment
+      @news = news
+      @comment = comment
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
+
+      mail :to => recipients,
+           :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}"
+    end
   end
 
   # Builds a Mail::Message object used to email the recipients of the specified message that was posted.
@@ -356,18 +411,33 @@ class Mailer < ActionMailer::Base
   #   message_posted(message) => Mail::Message object
   #   Mailer.message_posted(message).deliver => sends an email to the recipients
   def message_posted(message)
-    redmine_headers 'Project' => message.project.identifier,
-                    'Topic-Id' => (message.parent_id || message.id)
-    @author = message.author
-    message_id message
-    references message.parent unless message.parent.nil?
-    recipients = message.recipients
-    cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
-    @message = message
-    @message_url = url_for(message.event_url)
-    mail :to => recipients,
-      :cc => cc,
-      :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    if message.project
+      redmine_headers 'Project' => message.project.identifier,
+                      'Topic-Id' => (message.parent_id || message.id)
+      @author = message.author
+      message_id message
+      references message.parent unless message.parent.nil?
+      recipients = message.recipients
+      cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+      @message = message
+      @message_url = url_for(message.event_url)
+      mail :to => recipients,
+        :cc => cc,
+        :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    elsif message.course
+      redmine_headers 'Course' => message.course.id,
+                      'Topic-Id' => (message.parent_id || message.id)
+      @author = message.author
+      message_id message
+      references message.parent unless message.parent.nil?
+      recipients = message.course.notified_users.select { |user| user.allowed_to?(:view_files, message.course) }.collect { |u| u.mail }
+      cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+      @message = message
+      @message_url = url_for(message.event_url)
+      mail :to => recipients,
+           :cc => cc,
+           :subject => "[#{message.board.course.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    end
   end
 
   # Builds a Mail::Message object used to email the recipients of a project of the specified wiki content was added.
diff --git a/app/models/memo.rb b/app/models/memo.rb
index cfc509923..f9482911a 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -43,7 +43,7 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters!#,:be_user_score -- 公共区发帖暂不计入得分
+	after_create :add_author_as_watcher, :reset_counters!, :sendmail#,:be_user_score -- 公共区发帖暂不计入得分
 	# after_update :update_memos_forum
 	after_destroy :reset_counters!#,:down_user_score  -- 公共区发帖暂不计入得分
 	# after_create :send_notification
@@ -54,6 +54,12 @@ class Memo < ActiveRecord::Base
 	# 	includes(:forum => ).where()
 	# }
 
+  def sendmail
+    thread1=Thread.new do
+      Mailer.forum_message_added(self).deliver if Setting.notified_events.include?('forum_message_added')
+    end
+  end
+
 	def cannot_reply_to_locked_topic
 		errors.add :base, l(:label_memo_locked) if root.locked? && self != root
 	end
diff --git a/app/models/memo_observer.rb b/app/models/memo_observer.rb
new file mode 100644
index 000000000..66cabe923
--- /dev/null
+++ b/app/models/memo_observer.rb
@@ -0,0 +1,8 @@
+class MemoObserver < ActiveRecord::Observer
+  def after_create(memo)
+
+    thread1=Thread.new do
+      Mailer.forum_message_added(memo).deliver if Setting.notified_events.include?('forum_message_added')
+    end
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index 14763347f..01e6cd91c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -600,7 +600,7 @@ class Project < ActiveRecord::Base
   # Returns the users that should be notified on project events
   def notified_users
     # TODO: User part should be extracted to User#notify_about?
-    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal}
+    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all' || m.principal.mail_notification == 'only_my_events' ||m.principal.mail_notification == 'selected')}.collect {|m| m.principal}
   end
 
   # Returns an array of all custom fields enabled for project issues
diff --git a/app/views/mailer/forum_add.html.erb b/app/views/mailer/forum_add.html.erb
new file mode 100644
index 000000000..8da8b7891
--- /dev/null
+++ b/app/views/mailer/forum_add.html.erb
@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@forum.name), @forum_url) %></h1>
+<em><%=h @forum.creator.name %></em>
+
+<%= @forum.description.html_safe %>
\ No newline at end of file
diff --git a/app/views/mailer/forum_add.text.erb b/app/views/mailer/forum_add.text.erb
new file mode 100644
index 000000000..ba7246a49
--- /dev/null
+++ b/app/views/mailer/forum_add.text.erb
@@ -0,0 +1,4 @@
+<%= @forum_url %>
+<%= @author.name %>
+
+<%= @forum.description %>
diff --git a/app/views/mailer/forum_message_added.html.erb b/app/views/mailer/forum_message_added.html.erb
new file mode 100644
index 000000000..743c06ae7
--- /dev/null
+++ b/app/views/mailer/forum_message_added.html.erb
@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@memo.subject), @memo_url) %></h1>
+<em><%=h @memo.author.name %></em>
+
+<%= @memo.content.html_safe %>
\ No newline at end of file
diff --git a/app/views/mailer/forum_message_added.text.erb b/app/views/mailer/forum_message_added.text.erb
new file mode 100644
index 000000000..bd084cd40
--- /dev/null
+++ b/app/views/mailer/forum_message_added.text.erb
@@ -0,0 +1,5 @@
+<%= @memo_url %>
+<%= @author.name %>
+
+<%= @memo.subject %>
+<%= @memo.content %>
diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index f43a8cf0f..4bb487405 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -1,4 +1,10 @@
-<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
+<h1>
+  <% if @message.project %>
+      <%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %>
+  <% elsif @message.course %>
+      <%=h @message.board.course.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %>
+  <% end %>
+</h1>
 <em><%=h @message.author %></em>
 
 <%= textilizable(@message, :content, :only_path => false) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d25ba6ae2..ab248a062 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -568,6 +568,8 @@ en:
   label_document_new: New document
   label_document_plural: Documents
   label_document_added: Document added
+  label_forum_message_added: Message added
+  label_forum_add: Forum added
   label_document_public_info: "If you don't choose public, only the project's members can see the document."
   label_role: Role
   label_role_plural: Roles
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index bd6c6dc22..815dd6fa1 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -581,6 +581,8 @@ zh:
   label_document_new: 新建文档
   label_document_plural: 文档
   label_document_added: 文档已添加
+  label_forum_message_added: 发帖成功
+  label_forum_add: 贴吧创建成功
   label_document_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该文档。）
   label_role: 角色
   label_role_plural: 角色
diff --git a/lib/redmine/notifiable.rb b/lib/redmine/notifiable.rb
index 88ca9d776..42a81980f 100644
--- a/lib/redmine/notifiable.rb
+++ b/lib/redmine/notifiable.rb
@@ -20,6 +20,8 @@ module Redmine
       notifications << Notifiable.new('message_posted')
       notifications << Notifiable.new('wiki_content_added')
       notifications << Notifiable.new('wiki_content_updated')
+      notifications << Notifiable.new('forum_add')
+      notifications << Notifiable.new('forum_message_added', 'forum_add')
       notifications
     end
   end
diff --git a/spec/models/forum_observer_spec.rb b/spec/models/forum_observer_spec.rb
new file mode 100644
index 000000000..76d68fafa
--- /dev/null
+++ b/spec/models/forum_observer_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe ForumObserver do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/memo_observer_spec.rb b/spec/models/memo_observer_spec.rb
new file mode 100644
index 000000000..82603ba7a
--- /dev/null
+++ b/spec/models/memo_observer_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe MemoObserver do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 8f1249390a46a1804fc8bd659cdbc451f070a741 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 22 Jan 2015 17:31:34 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=A4=9A=E5=B0=81=E7=9B=B8=E5=90=8C=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E3=80=8B=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                 | 11 ++++++++---
 app/models/project.rb                |  2 +-
 app/views/mailer/issue_edit.html.erb |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 02684a187..23ac36054 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -147,8 +147,10 @@ class Mailer < ActionMailer::Base
      @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
 
       @user_url = url_for(my_account_url(user,:token => @token.value))
-
-    cc = issue.watcher_recipients - issue.recipients
+    cc = nil
+    if recipients == issue.recipients[0]
+      cc = issue.watcher_recipients - issue.recipients
+    end
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
     mail(:to => recipients,
          :cc => cc,
@@ -197,8 +199,11 @@ class Mailer < ActionMailer::Base
 
 
     # Watchers in cc
+    cc = nil
+    if recipients == journal.recipients[0]
+      cc = journal.watcher_recipients - journal.recipients
+    end
 
-    cc = journal.watcher_recipients - journal.recipients
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject
diff --git a/app/models/project.rb b/app/models/project.rb
index 01e6cd91c..14763347f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -600,7 +600,7 @@ class Project < ActiveRecord::Base
   # Returns the users that should be notified on project events
   def notified_users
     # TODO: User part should be extracted to User#notify_about?
-    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all' || m.principal.mail_notification == 'only_my_events' ||m.principal.mail_notification == 'selected')}.collect {|m| m.principal}
+    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal}
   end
 
   # Returns an array of all custom fields enabled for project issues
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index 6fcb0ddb5..af167cff5 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -12,7 +12,7 @@
   <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
 </div>
 <div class="cl"></div>
-<hr/>
+
 
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 <div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>