From 9caf9cbf2f065c0d5ce7b60be94cb3385cf2fb65 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 16 May 2016 16:16:24 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=EF=BC=8C=E5=9C=A8=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=A6=81=E5=BC=B9=E5=87=BA=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_apply_homework_course_message.html.erb   |   6 +-
 .../_join_course_course_message.html.erb      |   2 +-
 app/views/users/_user_message_course.html.erb | 136 +++++++++---------
 app/views/users/_user_message_forge.html.erb  |  62 ++++----
 app/views/users/_user_message_forum.html.erb  |   8 +-
 app/views/users/_user_message_org.html.erb    |   4 +-
 app/views/users/_user_message_system.html.erb |   2 +-
 .../_user_message_userfeedaback.html.erb      |   6 +-
 8 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/app/views/users/_apply_homework_course_message.html.erb b/app/views/users/_apply_homework_course_message.html.erb
index cf048bcd6..12bf0f2a4 100644
--- a/app/views/users/_apply_homework_course_message.html.erb
+++ b/app/views/users/_apply_homework_course_message.html.erb
@@ -1,12 +1,12 @@
-<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)) %></div></a></li>
+<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)), :target => '_blank' %></div></a></li>
 <li class="homepageNewsPubType fl">
   <%= link_to User.find(ma.apply_user_id).show_name,
-              user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher" %>
+              user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
   <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">申请引用作业：</span>
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
-  <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
   <!--:onmouseover => "message_titile_show($(this),event)",-->
   <!--:onmouseout => "message_titile_hide($(this))" %>-->
 </li>
diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb
index 28675b7eb..01ebb5cf9 100644
--- a/app/views/users/_join_course_course_message.html.erb
+++ b/app/views/users/_join_course_course_message.html.erb
@@ -6,7 +6,7 @@
 <li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <a href="javascript:void(0);" class="newsGrey">
     <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
-                :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
     <!--:onmouseover => "message_titile_show($(this),event)",-->
     <!--:onmouseout => "message_titile_hide($(this))" %>-->
   </a>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index d278c7d74..a80a08e42 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -1,11 +1,11 @@
 <% if ma.class == CourseMessage %>
     <% if ma.course_message_type == "News" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
           <li class="homepageNewsContent fl">
             <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -21,11 +21,11 @@
     <% end %>
     <% if ma.course_message_type == "Comment" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
           <li class="homepageNewsContent fl">
             <%= link_to  ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" , :target => '_blank'%>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -41,19 +41,19 @@
     <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil?%>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
                 <%= link_to "作业标题：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
-                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
             <% else %>
                 <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                            :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
             <% end %>
@@ -100,13 +100,13 @@
     <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师',
-            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师" %>
+            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
           <li class="homepageHomeworkContent fl">
             <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -136,17 +136,17 @@
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
           </li>
           <li class="homepageNewsContent fl">
             <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %>
+                        :onmouseout => "message_titile_hide($(this))", :target => '_blank' %>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <p>
@@ -170,12 +170,12 @@
     <!--作品关闭匿评-->
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
             <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
           <li class="homepageNewsContent fl">
-            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))"%>-->
           </li>
@@ -202,15 +202,15 @@
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动作业匿评失败</span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}" %>
+            <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -239,7 +239,7 @@
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag(url_to_avatar(User.find(ma.apply_user_id)), width: "30px", height: "30px", class: "mt3") %></div></a></li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.show_name,
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -247,7 +247,7 @@
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
             :
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
-            <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+            <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a>
@@ -257,11 +257,11 @@
     <% end %>
     <% if ma.course_message_type == "Poll" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
-                        :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}" %>
+                        :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a></li>
@@ -273,14 +273,14 @@
     <% end %>
     <% if ma.course_message_type == "Message" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+            <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
             <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
           <% if ma.course_message.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                 <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
               </a></li>
@@ -294,7 +294,7 @@
           <% else %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                 <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
               </a></li>
@@ -314,9 +314,9 @@
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <% if ma.course_message.reviewer_role == 3 %>
-                <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30") %>
+                <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30"), :target => '_blank' %>
             <% else %>
-                <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
+                <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
             <% end %>
           </li>
           <li class="homepageNewsPubType fl">
@@ -324,7 +324,7 @@
                 <span class="newsBlue homepageNewsPublisher">匿名用户</span>
             <% else %>
                 <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <% end %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
                           <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %>
@@ -333,7 +333,7 @@
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% unless ma.content.nil? %>
                 <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
-                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a></li>
@@ -365,14 +365,14 @@
             <% if params[:type] != 'homework' %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl">
-                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
                   </li>
-                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                     <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">在课程中留言了：</span>
                   </li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                     <%= link_to ma.course_message.notes.html_safe, course_feedback_path(:id => ma.course_id),
-                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                                 <!--:onmouseover => "message_titile_show($(this),event)",-->
                                 <!--:onmouseout => "message_titile_hide($(this))" %>-->
                     </a>
@@ -386,14 +386,14 @@
             <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl">
-                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
                   </li>
-                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                     <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了您的作业：</span>
                   </li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                     <%= link_to ma.course_message.notes.html_safe, homework_common_index_url_in_org( ma.course_id),
-                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                     <!--:onmouseover => "message_titile_show($(this),event)",-->
                     <!--:onmouseout => "message_titile_hide($(this))" %>-->
                   </a>
@@ -406,16 +406,16 @@
         <% else %>
             <ul class="homepageNewsList fl">
               <li class="homepageNewsPortrait fl">
-                <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
               </li>
               <li class="homepageNewsPubType fl">
                 <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname +
                                     "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}",
-                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
               </li>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
@@ -439,14 +439,14 @@
     <!-- 作业迟交，不能参与匿评提醒消息 -->
     <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span>
           </li>
           <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -474,16 +474,16 @@
     <% if ma.course_message_type == "StudentWork" && ma.status == 1 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "同学",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">重新提交了作品：</span>
           </li>
           <li class="homepageNewsContent fl">
             <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id),
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
             <%#= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}" %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -495,16 +495,16 @@
     <% if ma.course_message_type == "StudentWork" && ma.status == 2 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.show_name+ "同学",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">追加新附件了：</span>
           </li>
           <li class="homepageNewsContent fl">
             <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id),
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -523,7 +523,7 @@
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to "课程名称：" + ma.course_message.name, course_path(ma.course_message),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a></li>
@@ -565,7 +565,7 @@
                     '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过'
                      :
                     '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝', course_path(Course.find(ma.course_id)),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
@@ -588,14 +588,14 @@
     <% if ma.course_message_type == "JoinCourse" and ma.status == 0 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了课程：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -629,7 +629,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您增加了新的课程成员：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -656,14 +656,14 @@
     <% if ma.course_message_type == "RemoveFromCourse" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了课程：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -690,12 +690,12 @@
     <!--老师发布测验 发给学生看-->
     <% if ma.course_message_type == "Exercise" && ma.status == 2 %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
             <span><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程测验 ：</span></li>
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程测验 ：</span></li>
           <li class="homepageNewsContent fl">
-            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))"%>-->
           </li>
@@ -727,12 +727,12 @@
 
     <% if ma.course_message_type == "Exercise" && ma.status == 3 %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
            <span>  <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的测验：</span></li>
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的测验：</span></li>
           <li class="homepageHomeworkContent fl">
-            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))"%>-->
 
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 1fd981d73..9da768d0e 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -3,14 +3,14 @@
     <% if ma.forge_message_type == "AppliedProject" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申请加入项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -23,14 +23,14 @@
       <% unless ma.project.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -44,14 +44,14 @@
       <% unless ma.project.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -65,10 +65,10 @@
         <% inviter = User.find(ma.forge_message_id) %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目：</span>
           </li>
           <% if ma.user.member_of?(ma.project) %>
@@ -77,7 +77,7 @@
               <li class="homepageHomeworkContent fl">
           <% end %>
           <%= link_to ma.project, project_path(ma.project),
-                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                       <!--:onmouseover => "message_titile_show($(this),event)",-->
                       <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
@@ -86,7 +86,7 @@
                 <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id,  :key => ma.secret_key},
                            :value => ma.secret_key,
                            :class => "green_btn_cir ml10",
-                           :style => "color:#fff" %>
+                           :style => "color:#fff", :target => '_blank' %>
               </li>
           <% end %>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -96,14 +96,14 @@
         <% if ma.status == 1%>
             <ul class="homepageNewsList fl">
               <li class="homepageNewsPortrait fl">
-                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a>
               </li>
               <li class="homepageNewsPubType fl">
-                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%></span>
               </li>
               <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
@@ -114,14 +114,14 @@
         <% else %>
             <ul class="homepageNewsList fl">
               <li class="homepageNewsPortrait fl">
-                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a>
               </li>
               <li class="homepageNewsPubType fl">
-                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
               </li>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
@@ -133,16 +133,16 @@
     <% if ma.forge_message_type == "Journal" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
                             更新了问题状态：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to ma.forge_message.journalized.subject,
-                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -152,13 +152,13 @@
     <% end %>
     <% if ma.forge_message_type == "Message" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
                                                                       :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
-                                                                      :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                                                                      :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a>
@@ -169,15 +169,15 @@
     <% if ma.forge_message_type == "News" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了新闻：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id},
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}"  %>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
@@ -187,12 +187,12 @@
     <% end %>
     <% if ma.forge_message_type == "Comment" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span></li>
           <li class="homepageNewsContent fl">
             <%= link_to "#{ma.forge_message.commented.title}",
-                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb
index 716fef349..e0111276a 100644
--- a/app/views/users/_user_message_forum.html.erb
+++ b/app/views/users/_user_message_forum.html.erb
@@ -2,22 +2,22 @@
     <% if ma.memo_type == "Memo" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
           </li>
           <% if ma.memo.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
               </li>
           <% else %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>
diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb
index 8c6159a58..13c62318f 100644
--- a/app/views/users/_user_message_org.html.erb
+++ b/app/views/users/_user_message_org.html.erb
@@ -2,10 +2,10 @@
     <% if ma.message_type == 'ApplySubdomain'%>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>申请子域名：</span>
           </li>
           <li class="homepageHomeworkContent fl">
diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb
index 72241636f..a7e48f456 100644
--- a/app/views/users/_user_message_system.html.erb
+++ b/app/views/users/_user_message_system.html.erb
@@ -11,7 +11,7 @@
           <li class="homepageSystenMessageContent fl">
 
             <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current),
-                        :id => "content_link_#{ma.id}" %>
+                        :id => "content_link_#{ma.id}", :target => '_blank' %>
                         <!--:onmouseover =>"message_titile_show($(this),event);",-->
                         <!--:onmouseout => "message_titile_hide($(this));"-->
           </li>
diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index 1898090aa..3af623813 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -2,14 +2,14 @@
     <% if ma.journals_for_message_type == "JournalsForMessage" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}"%>
+            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank'%>
                         <!--:onmouseover =>"message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>

From 9b6c629d1071b6836a701ba9645d82dfa88bc2ef Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 17 May 2016 14:18:14 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E8=B7=83=E5=BA=A6=E7=9A=84=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         | 55 +++++++++++++------
 app/views/courses/_new_member_list.html.erb   | 35 ++++++++----
 .../courses/_show_member_act_score.html.erb   | 38 +++++++++++++
 app/views/courses/_show_member_score.html.erb |  2 +-
 app/views/courses/deletegroup.js.erb          |  3 +-
 .../courses/show_member_act_score.js.erb      |  7 +++
 config/routes.rb                              |  1 +
 ..._alter_course_contributor_score_default.rb | 52 ++++++++++++++++++
 db/schema.rb                                  | 35 +++++++++---
 public/stylesheets/courses.css                |  2 +
 10 files changed, 192 insertions(+), 38 deletions(-)
 create mode 100644 app/views/courses/_show_member_act_score.html.erb
 create mode 100644 app/views/courses/show_member_act_score.js.erb
 create mode 100644 db/migrate/20160517013659_alter_course_contributor_score_default.rb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 0fd4cc2c9..1478bceae 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -162,6 +162,7 @@ class CoursesController < ApplicationController
     @subPage_title = l :label_student_list
     @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
     # @is_remote = true
+    @sort_type = 'score'
     @score_sort_by = "desc"
     q = "#{params[:name].strip}"
     if params[:incourse]
@@ -185,9 +186,11 @@ class CoursesController < ApplicationController
       group.course_id = @course.id
       group.save
     end
+    @sort_type = 'score'
+    @score_sort_by = "desc"
     @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
     @is_remote = true
-    @members = student_homework_score(0,0, 10,"desc")
+    @members = student_homework_score(0,0, 10,@score_sort_by)
     @course_groups = @course.course_groups
   end
 
@@ -196,7 +199,9 @@ class CoursesController < ApplicationController
     @subPage_title = l :label_student_list
     @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
     @is_remote = true
-
+    @sort_type = 'score'
+    @score_sort_by = "desc"
+    @members = student_homework_score(0,0, 10,@score_sort_by)
     @course_groups = @course.course_groups
   end
 
@@ -281,6 +286,7 @@ class CoursesController < ApplicationController
     @render_file = 'new_member_list'
     @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
     @is_remote = true
+    @sort_type = 'score'
     @score_sort_by = "desc"
     if params[:group_id] && params[:group_id] != "0"
       @group = CourseGroup.find(params[:group_id])
@@ -298,6 +304,7 @@ class CoursesController < ApplicationController
 
       @render_file = 'new_member_list'
       @score_sort_by = "desc"
+      @sort_type = "score"
       @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
       @role = params[:role].nil? ?  '2':params[:role]
       @is_remote = true
@@ -312,7 +319,7 @@ class CoursesController < ApplicationController
           if @course.open_student == 1 || User.current.member_of_course?(@course)
             @subPage_title = l :label_student_list
             page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-            @all_members = student_homework_score(0,page, 10,"desc")
+            @all_members = student_homework_score(0,page, 10,@score_sort_by)
             @members =  @all_members
           else
             render_403
@@ -350,28 +357,29 @@ class CoursesController < ApplicationController
     @subPage_title = l :label_student_list
     @render_file = 'new_member_list'
     @is_remote = true
+    @sort_type = params[:sort_type] if params[:sort_type]
     @score_sort_by = params[:sort_by] if params[:sort_by]
     @search_name = params[:search_name] if params[:search_name]
     group_id = params[:group_id]
     if !@search_name.nil?
       if group_id == '0'
         page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-        @results = searchmember_by_name(student_homework_score(0,0,0,@score_sort_by), @search_name)
+        @results = searchmember_by_name(student_homework_score(0,0,0,@score_sort_by,@sort_type), @search_name)
         @result_count = @results.count
         # @results = paginateHelper @results, 10
       else
         @group = CourseGroup.find(group_id)
-        @results = searchmember_by_name(student_homework_score(group_id, 0, 0,@score_sort_by),@search_name)
+        @results = searchmember_by_name(student_homework_score(group_id, 0, 0,@score_sort_by,@sort_type),@search_name)
         @result_count = @results.count
         # @results = paginateHelper @results, 10
       end
     else
       if group_id == '0'
         page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-        @results = student_homework_score(0,page, 10,@score_sort_by)
+        @results = student_homework_score(0,page, 10,@score_sort_by,@sort_type)
       else
         @group = CourseGroup.find(group_id)
-        @results = student_homework_score(group_id, 0, 0,@score_sort_by)
+        @results = student_homework_score(group_id, 0, 0,@score_sort_by,@sort_type)
       end
     end
   end
@@ -384,6 +392,15 @@ class CoursesController < ApplicationController
     end
   end
 
+  # 显示每个学生的作业评分详情
+  def show_member_act_score
+    @member = Member.find(params[:member_id]) if params[:member_id]
+    respond_to do |format|
+      format.html {render :layout => 'course_base'}
+      format.js
+    end
+  end
+
   def handle_course courses, activities
     course_activity_count_array=activities.values()
     course_array=[]
@@ -1149,7 +1166,7 @@ class CoursesController < ApplicationController
     end
   end
 
-  def student_homework_score(groupid,start_from, nums, score_sort_by)
+  def student_homework_score(groupid,start_from, nums, score_sort_by, sort_type = 'score')
     start_from = start_from * nums
     sql_select = ""
     if groupid == 0
@@ -1159,11 +1176,13 @@ class CoursesController < ApplicationController
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
           AND student_works.user_id = members.user_id
-        ) AS score
+        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = 577 AND ccs.user_id = members.user_id
+        ) AS act_score
         FROM members
         JOIN students_for_courses
         ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
-        WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
+        WHERE members.course_id = #{@course.id} ORDER BY #{sort_type} #{score_sort_by}"
     else
       sql_select = "SELECT members.*,(
           SELECT SUM(student_works.work_score)
@@ -1171,11 +1190,13 @@ class CoursesController < ApplicationController
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
           AND student_works.user_id = members.user_id
-        ) AS score
+        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = 577 AND ccs.user_id = members.user_id
+        ) AS act_score
         FROM members
         JOIN students_for_courses
         ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
-        WHERE members.course_id = #{@course.id} AND members.course_group_id = #{groupid} ORDER BY score #{score_sort_by}"
+        WHERE members.course_id = #{@course.id} AND members.course_group_id = #{groupid} ORDER BY #{sort_type} #{score_sort_by}"
     end
     sql = ActiveRecord::Base.connection()
     homework_scores = Member.find_by_sql(sql_select)
@@ -1225,8 +1246,7 @@ class CoursesController < ApplicationController
       sheet1[5,i+4] = "第"+(i+1).to_s+"次"
     end
     sheet1[5,homeworks.count+4] = "总成绩"
-    sheet1[5,0] = "排名"
-    sheet1[5,0] = "排名"
+    sheet1[5,homeworks.count+5] = "活跃度"
     count_row = 6
     members.each_with_index do |member, i|
       sheet1[count_row,0]= i+1
@@ -1236,14 +1256,15 @@ class CoursesController < ApplicationController
       homeworks.each_with_index do |homework, j|
         student_works = homework.student_works.where("user_id = #{member.user.id}")
         if student_works.empty?
-          sheet1[count_row,j+4] = format("%0.2f",0)
+          sheet1[count_row,j+4] = 0
         else
           final_score = student_works.first.final_score.nil? ? 0 : student_works.first.final_score
           score = final_score - student_works.first.absence_penalty - student_works.first.late_penalty
-          sheet1[count_row,j+4] = format("%0.2f",score <0 ? 0:score)
+          sheet1[count_row,j+4] = score <0 ? 0:score.round(2)
         end
       end
-      sheet1[count_row,homeworks.count+4] = format("%0.2f",member.score.nil? ? 0:member.score.to_s)
+      sheet1[count_row,homeworks.count+4] = member.score.nil? ? 0:member.score.round(2)
+      sheet1[count_row,homeworks.count+5] = member.act_score.nil? ? 0:member.act_score
       count_row += 1
     end
 
diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index bf69c3a61..ef8a43d5c 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -24,16 +24,24 @@
       <ul class="st_box_top">
         <li  class="ml50" style="padding-right: 5px;"><a href="">姓名</a></li>
         <li  class="ml10" style="padding-right: 15px;"><a href="">学号</a></li>
-        <li style="padding-right: 55px; margin-left: 260px;"><a href="">分班</a></li>
-        <li style="margin-left: 25px;">
-          <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
-          <% if @score_sort_by == 'desc' %>
+        <li style="padding-right: 55px; margin-left: 160px;"><a href="">分班</a></li>
+        <li class="st_list_score ml10">
+          <%= link_to '作业积分', member_score_sort_course_path(:sort_type => 'score', :sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true, :class => 'ml25'%>
+          <% if @sort_type == "score" && @score_sort_by == 'desc' %>
               <a id="pic" href="javascript:" class= "st_down"></a>
-          <% else %>
+          <% elsif @sort_type == "score" && @score_sort_by == 'asc' %>
               <a id="pic" href="javascript:" class= "st_up"></a>
           <% end %>
         </li>
-        <li class="ml50"><a href="javascript:void(0)" >加入时间</a></li>
+        <li class="st_list_score">
+          <%= link_to '活跃度', member_score_sort_course_path(:sort_type => 'act_score', :sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true, :class => 'ml35'%>
+          <% if @sort_type == "act_score" && @score_sort_by == 'desc' %>
+              <a id="pic" href="javascript:" class= "st_down"></a>
+          <% elsif @sort_type == "act_score" && @score_sort_by == 'asc' %>
+              <a id="pic" href="javascript:" class= "st_up"></a>
+          <% end %>
+        </li>
+        <li class="ml20"><a href="javascript:void(0)" >加入时间</a></li>
       </ul>
       <div class="cl"></div><!--st_box_top end-->
 
@@ -61,21 +69,21 @@
             </ul>
             <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
                 <% if @course.course_groups.nil? || @group %>
-                    <div class="select-class-option fl" style="margin-left: 105px;">
+                    <div class="select-class-option fl" style="margin-left: 5px;">
                       <span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                     </div>
                 <% else %>
                     <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
-                        <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
+                        <div class="select-class-option fl" style="margin-left: 5px;"><span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                           <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a>
                         </div>
                         <%= select( :name,:group_id, course_group_option(@course),
                                     { :include_blank => false,:selected => member.course_group_id},
-                                    {:onchange=>"join_group_function('#join_group_form_#{member.id}');", :id =>"course_group_id", :name => "course_group_id",:class=>"w125 undis class-edit fl", :style => "margin-left: 105px;"}) %>
+                                    {:onchange=>"join_group_function('#join_group_form_#{member.id}');", :id =>"course_group_id", :name => "course_group_id",:class=>"w125 undis class-edit fl", :style => "margin-left: 5px;"}) %>
                     <% end %>
                 <% end %>
             <% else %>
-                <div class="select-class-option fl" style="margin-left: 105px;">
+                <div class="select-class-option fl" style="margin-left: 5px;">
                   <span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                 </div>
             <% end %>
@@ -83,7 +91,12 @@
                     :action => 'show_member_score',
                     :member_id => member.id,
                     :remote => true},
-                        :class => 'ml25 c_red' %>
+                        :class => 'st_list_score c_red' %>
+            <%= link_to member.act_score.nil? ? 0 : member.act_score.to_s, {
+                    :action => 'show_member_act_score',
+                    :member_id => member.id,
+                    :remote => true},
+                        :class => 'st_list_score c_red' %>
             <span class="fr mr15 c_grey"><%= format_date(member.created_on)%></span>
             <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
           </div>
diff --git a/app/views/courses/_show_member_act_score.html.erb b/app/views/courses/_show_member_act_score.html.erb
new file mode 100644
index 000000000..cec17f0b8
--- /dev/null
+++ b/app/views/courses/_show_member_act_score.html.erb
@@ -0,0 +1,38 @@
+<style>
+    .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  text-align: center; padding-top:5px;}
+    .tscore_box li{ height:25px;}
+</style>
+
+
+<div class="tscore_con" id="user_score">
+  <% act_score = CourseContributorScore.where("user_id = ? and course_id = ?", member.user_id, member.course_id).first %>
+  <h2><%= member.user.show_name %> 活跃度计算</h2>
+  <% if act_score.nil? %>
+      <div style="padding-left: 40px;padding-bottom: 2px;padding-right: 2px;padding-top: 10px;">
+        资源发布数 x 5 = 0 x 5 = 0</br>
+        问答发布数 x 2 = 0 x 2 = 0</br>
+        通知发布数 x 1 = 0 x 1 = 0</br>
+        问答回帖数 x 1 = 0 x 1 = 0</br>
+        作业留言数 x 1 = 0 x 1 = 0</br>
+        通知留言数 x 1 = 0 x 1 = 0</br>
+        课程留言数  x 1 = 0 x 1 = 0</br>
+        总得分：0
+      </div>
+  <% else %>
+      <% total_score = act_score.resource_num.to_i * 5 + act_score.message_num.to_i * 2 +
+              act_score.message_reply_num.to_i * 1 + act_score.journal_num.to_i * 1 +
+              + act_score.homework_journal_num.to_i * 1 + act_score.news_reply_num.to_i * 1 +
+              act_score.news_num.to_i * 1 %>
+      <div style="padding-left: 40px;padding-bottom: 2px;padding-right: 2px;padding-top: 10px;">
+        资源发布数 x 5 = <%= act_score.resource_num.to_i %> x 5 = <%= act_score.resource_num.to_i * 5 %></br>
+        问答发布数 x 2 = <%= act_score.message_num.to_i %> x 2 = <%= act_score.message_num.to_i * 2 %></br>
+        通知发布数 x 1 = <%= act_score.news_num.to_i %> x 1 = <%= act_score.news_num.to_i %></br>
+        问答回帖数 x 1 = <%= act_score.message_reply_num.to_i %> x 1 = <%= act_score.message_reply_num.to_i %></br>
+        作业留言数 x 1 = <%= act_score.homework_journal_num.to_i %> x 1 = <%= act_score.homework_journal_num.to_i %></br>
+        通知留言数 x 1 = <%= act_score.news_reply_num.to_i %> x 1 = <%= act_score.news_reply_num.to_i %></br>
+        课程留言数  x 1 = <%= act_score.journal_num.to_i %> x 1 = <%= act_score.journal_num.to_i %></br>
+        总得分：<%=total_score %>
+      </div>
+  <% end %>
+
+</div>
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index 94d282cec..27b3863b0 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -28,7 +28,7 @@
               </span>
             </li>
        <% end %>
-      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= format("%0.2f",(@member_score.student_work_score_sum).first.score)  %></span></li>
+      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= format("%0.2f",(@member_score.student_work_score_sum).first.score.nil? ? 0 : (@member_score.student_work_score_sum).first.score)  %></span></li>
     </ul>
 
   </div>
diff --git a/app/views/courses/deletegroup.js.erb b/app/views/courses/deletegroup.js.erb
index cb7e1fbb1..f0c0f4be3 100644
--- a/app/views/courses/deletegroup.js.erb
+++ b/app/views/courses/deletegroup.js.erb
@@ -1 +1,2 @@
-$("#st_groups").html("<%= escape_javascript(  render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
\ No newline at end of file
+$("#st_groups").html("<%= escape_javascript(  render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
+$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");
\ No newline at end of file
diff --git a/app/views/courses/show_member_act_score.js.erb b/app/views/courses/show_member_act_score.js.erb
new file mode 100644
index 000000000..c6327d164
--- /dev/null
+++ b/app/views/courses/show_member_act_score.js.erb
@@ -0,0 +1,7 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'courses/show_member_act_score', :locals => {:member => @member}) %>');
+showModal('ajax-modal', '300px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span>" +
+        "<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' style='margin-left: 275px;' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("new-watcher");
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 0feb60098..451d3e0a7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1060,6 +1060,7 @@ RedmineApp::Application.routes.draw do
       match "addgroups",  :via => [:post, :get]
       match 'deletegroup', :via => [:delete]
       match 'show_member_score', :via => [:get]
+      match 'show_member_act_score', :via => [:get]
       match 'valid_ajax', :to => 'courses#valid_ajax', :via => :get
       post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
       delete 'join_in/join_group', :to => 'courses#unjoin_group'
diff --git a/db/migrate/20160517013659_alter_course_contributor_score_default.rb b/db/migrate/20160517013659_alter_course_contributor_score_default.rb
new file mode 100644
index 000000000..488dab848
--- /dev/null
+++ b/db/migrate/20160517013659_alter_course_contributor_score_default.rb
@@ -0,0 +1,52 @@
+class AlterCourseContributorScoreDefault < ActiveRecord::Migration
+  def up
+    change_column :course_contributor_scores, :message_num, :integer, :default => 0
+    change_column :course_contributor_scores, :message_reply_num, :integer, :default => 0
+    change_column :course_contributor_scores, :news_reply_num, :integer, :default => 0
+    change_column :course_contributor_scores, :news_num, :integer, :default => 0
+    change_column :course_contributor_scores, :resource_num, :integer, :default => 0
+    change_column :course_contributor_scores, :journal_num, :integer, :default => 0
+    change_column :course_contributor_scores, :journal_reply_num, :integer, :default => 0
+    change_column :course_contributor_scores, :homework_journal_num, :integer, :default => 0
+    change_column :course_contributor_scores, :total_score, :integer, :default => 0
+
+    count = CourseContributorScore.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        CourseContributorScore.page(i).per(30).each do |cs|
+          if cs.message_num.nil?
+            cs.message_num = 0
+          end
+          if cs.message_reply_num.nil?
+            cs.message_reply_num = 0
+          end
+          if cs.news_reply_num.nil?
+            cs.news_reply_num = 0
+          end
+          if cs.news_num.nil?
+            cs.news_num = 0
+          end
+          if cs.resource_num.nil?
+            cs.resource_num = 0
+          end
+          if cs.journal_num.nil?
+            cs.journal_num = 0
+          end
+          if cs.journal_reply_num.nil?
+            cs.journal_reply_num = 0
+          end
+          if cs.homework_journal_num.nil?
+            cs.homework_journal_num = 0
+          end
+          if cs.total_score.nil?
+            cs.total_score = 0
+          end
+          cs.save
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d5334c43c..9b317fd9e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160511055221) do
+ActiveRecord::Schema.define(:version => 20160517013659) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -450,15 +450,15 @@ ActiveRecord::Schema.define(:version => 20160511055221) do
   create_table "course_contributor_scores", :force => true do |t|
     t.integer  "course_id"
     t.integer  "user_id"
-    t.integer  "message_num"
-    t.integer  "message_reply_num"
-    t.integer  "news_reply_num"
-    t.integer  "resource_num"
-    t.integer  "journal_num"
-    t.integer  "journal_reply_num"
+    t.integer  "message_num",          :default => 0
+    t.integer  "message_reply_num",    :default => 0
+    t.integer  "news_reply_num",       :default => 0
+    t.integer  "resource_num",         :default => 0
+    t.integer  "journal_num",          :default => 0
+    t.integer  "journal_reply_num",    :default => 0
     t.datetime "created_at",                          :null => false
     t.datetime "updated_at",                          :null => false
-    t.integer  "total_score"
+    t.integer  "total_score",          :default => 0
     t.integer  "homework_journal_num", :default => 0
     t.integer  "news_num",             :default => 0
   end
@@ -1107,6 +1107,23 @@ ActiveRecord::Schema.define(:version => 20160511055221) do
     t.integer  "viewed_count",  :default => 0
   end
 
+  create_table "mess", :id => false, :force => true do |t|
+    t.string   "课程名"
+    t.integer  "课程ID",                    :default => 0,  :null => false
+    t.string   "教师姓",                     :default => "", :null => false
+    t.string   "教师名",       :limit => 30, :default => "", :null => false
+    t.string   "主贴名",                     :default => "", :null => false
+    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
+    t.integer  "回帖对应主贴ID"
+    t.integer  "帖子点赞数"
+    t.integer  "主贴回复数",                   :default => 0,  :null => false
+    t.text     "主贴或回帖内容"
+    t.datetime "发帖时间",                                    :null => false
+    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
+    t.string   "发帖或回帖用户姓",                :default => "", :null => false
+    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
+  end
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1328,6 +1345,7 @@ ActiveRecord::Schema.define(:version => 20160511055221) do
     t.boolean  "allow_guest_download", :default => true
     t.integer  "visits",               :default => 0
     t.integer  "show_mode",            :default => 0
+    t.integer  "allow_teacher",        :default => 0
   end
 
   create_table "phone_app_versions", :force => true do |t|
@@ -2043,6 +2061,7 @@ ActiveRecord::Schema.define(:version => 20160511055221) do
     t.string   "salt",              :limit => 64
     t.integer  "gid"
     t.integer  "visits",                          :default => 0
+    t.integer  "excellent_teacher",               :default => 0
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 758e59296..cd9f88651 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -560,6 +560,8 @@ a:hover.st_img { border:1px solid #1c9ec7; }
 a:hover.st_add{ color:#ff8e15;}
 .classbox_on{ border:1px solid #f8df8c; background:#f6f098;   padding:0 3px; float:left; margin-left:15px;}
 .classbox_on a{ color:#716cad;}
+.st_list_score {width:105px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; vertical-align:middle; font-size:12px; text-align:center;}
+
 /* 创建课程courses*/
 .courses_input{ border:1px solid #64bdd9; height:16px; width:532px; background:#fff; margin-bottom:10px; padding:5px;}
 .courses_input_w{ width:300px;}

From 55a98d8d6e89805a268774c0fdca6f47dd9fac9d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 17 May 2016 15:33:16 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journals_for_message.rb            | 4 ++++
 app/views/users/_user_message_course.html.erb | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 4b5ac227f..68b747ab9 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -260,6 +260,10 @@ class JournalsForMessage < ActiveRecord::Base
         if self.user_id != self.jour.user_id
           self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.course.id, :viewed => false)
         end
+      else
+        if self.user_id != self.parent.user_id
+          self.course_messages << CourseMessage.new(:user_id => self.parent.user_id,:course_id => self.jour.course.id, :viewed => false)
+        end
       end
       count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.jour.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
       if count == 0
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index a80a08e42..bab7bb5ec 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -389,7 +389,13 @@
                     <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
                   </li>
                   <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了您的作业：</span>
+                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                      <% if ma.course_message.m_parent_id.nil? %>
+                          回复了您的作业：
+                      <% else %>
+                          回复了您：
+                      <% end %>
+                    </span>
                   </li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                     <%= link_to ma.course_message.notes.html_safe, homework_common_index_url_in_org( ma.course_id),

From ddafa7983595a4424d85779f29001197a8ad533c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 17 May 2016 15:52:24 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=A5=BC=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_comment_reply.html.erb        | 2 +-
 app/views/users/_user_homework_detail.html.erb | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_comment_reply.html.erb b/app/views/users/_comment_reply.html.erb
index ddc654463..895eda8a9 100644
--- a/app/views/users/_comment_reply.html.erb
+++ b/app/views/users/_comment_reply.html.erb
@@ -1,6 +1,6 @@
 <div class="orig_cont clearfix">
   <% unless comment.parent.nil? %>
-      <div id="comment_reply_<%=comment.id %>">
+      <div>
         <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
       </div>
   <% end %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index b8c5c2017..decaba88c 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -352,12 +352,16 @@
                           <% else %>
                             <div class="orig_cont clearfix">
                               <div class="orig_cont clearfix">
-                                <div id="comment_reply_<%=parents_rely[length - 1].id %>">
+                                <div>
                                   <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
                                 </div>
                                 <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
                               </div>
-                              <div class="orig_cont_hide clearfix"><span class="orig_icon" >&darr; </span><span class="orig_icon" style="display:none;" > &uarr;</span><%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %></div>
+                              <div class="orig_cont_hide clearfix">
+                                <span class="orig_icon" >&darr; </span>
+                                <span class="orig_icon" style="display:none;" > &uarr;</span>
+                                <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %>
+                              </div>
                               <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
                             </div>
                           <% end %>

From 28edaf2246f38a7807f592fa2f9a12cafc2f737d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 10:57:56 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=EF=BC=9A=E5=BF=AB=E9=80=9F=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE=E9=87=8D=E5=A4=8D=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E5=A4=9A=E6=9D=A1=E8=AE=B0=E5=BD=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  4 ++--
 app/views/courses/_courses_jours.html.erb     | 23 +++++++++----------
 app/views/projects/_project_jours.html.erb    | 23 ++++++++++++-------
 app/views/words/_new_respond_course.html.erb  |  4 ++--
 app/views/words/_new_respond_project.html.erb |  3 ++-
 public/javascripts/init_KindEditor.js         | 13 +++++++----
 6 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9f31edad1..da3b3b4d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
 source 'https://rubygems.org/'
-### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
+### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
 end
 
-gem 'certified'
+#gem 'certified'
 
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index c7e4a7428..1050a59b9 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -36,7 +36,7 @@
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_' name="new_form[course_message]"></textarea>
             <p nhname='contentmsg_'></p>
             <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10">取消</a>
-            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="submit_feedback_course" >留言</a>
+            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="new_message_submit_btn_" >留言</a>
         <% end %>
       </div>
   <% end %>
@@ -55,9 +55,6 @@
 <script type="text/javascript">
 
     $(function(){
-        $("#submit_feedback_course").one('click',function() {
-            $("#course_feedback_new").submit();
-        });
         KindEditor.ready(function(K){
             $("a[nhname='reply_btn']").live('click',function(){
                 var params = {};
@@ -68,15 +65,18 @@
                 params.textarea = $("textarea[name='user_notes']",params.div_form);
                 params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
                 params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+                params.submit_btn = $("input[nhname='submit_btn']",params.div_form);
                 params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
                 params.height = 55;
-                if(params.textarea.data('init') == undefined){
-                    params.editor = init_editor(params);
-                    init_form(params);
-                    params.cancel_btn.click(function(){
-                        nh_reset_form(params);
-                    });
-                }
+                params.editor = init_editor(params);
+                init_form(params);
+                params.cancel_btn.click(function(){
+                    nh_reset_form(params);
+                });
+                params.submit_btn.one('click', function () {
+                    params.form.submit();
+                });
+                params.textarea.data('init',1);
                 params.cancel_btn.click();
                 toggleAndSettingWordsVal(params.div_form, params.textarea);
                 setTimeout(function(){
@@ -86,7 +86,6 @@
                         params.textarea.hide();
                     }
                 },300);
-                params.textarea.data('init',1);
             });
         });
     });
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 6095bac96..eacc2a152 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -80,6 +80,9 @@
                     if(params.content.isEmpty()){
                         params.contentmsg.html('内容不能为空');
                         params.contentmsg.css({color:'#ff0000'});
+                        params.submit_btn.one('click', function(){
+                            params.form.submit();
+                        });
                     }else{
                         params.contentmsg.html('填写正确');
                         params.contentmsg.css({color:'#008000'});
@@ -124,7 +127,9 @@
                     issubmit:true,
                     content:params.editor,
                     contentmsg:params.contentmsg,
-                    textarea:params.textarea
+                    textarea:params.textarea,
+                    submit_btn:params.submit_btn,
+                    form:params.form
                 });
                 if(is_checked){
                     if(flag){
@@ -161,13 +166,15 @@
                 params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
                 params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
                 params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
-                if(params.textarea.data('init') == undefined){
-                    params.editor = init_editor(params);
-                    init_form(params);
-                    params.cancel_btn.click(function(){
-                        nh_reset_form(params);
-                    });
-                }
+                params.submit_btn = $("input[nhname='submit_btn']",params.div_form);
+                params.editor = init_editor(params);
+                init_form(params);
+                params.submit_btn.one('click', function () {
+                    params.form.submit();
+                });
+                params.cancel_btn.click(function(){
+                    nh_reset_form(params);
+                });
                 params.cancel_btn.click();
                 toggleAndSettingWordsVal(params.div_form, params.textarea);
                 setTimeout(function(){
diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb
index 3be435b15..88581b3bf 100644
--- a/app/views/words/_new_respond_course.html.erb
+++ b/app/views/words/_new_respond_course.html.erb
@@ -12,8 +12,8 @@
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
 
     <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
-    <!--<input nhname="submit_btn" type="button" class="reply_btn" value="<%#=l(:button_feedback_respond) %>"/>-->
-    <%= submit_tag l(:button_feedback_respond), :name => nil ,
+    <input nhname="submit_btn" type="button" class="reply_btn" value="<%=l(:button_feedback_respond) %>"/>
+    <%#= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "reply_btn"%>
     <input nhname="cancel_btn" type="button" style="display:none;"/>
 <% end %>
\ No newline at end of file
diff --git a/app/views/words/_new_respond_project.html.erb b/app/views/words/_new_respond_project.html.erb
index c3ff241b3..4430735a2 100644
--- a/app/views/words/_new_respond_project.html.erb
+++ b/app/views/words/_new_respond_project.html.erb
@@ -11,7 +11,8 @@
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
 
     <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
-    <%= submit_tag l(:button_feedback_respond), :name => nil ,
+    <input nhname="submit_btn" type="button" class="reply_btn" value="<%=l(:button_feedback_respond) %>"/>
+    <%#= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "reply_btn"%>
     <input nhname="cancel_btn" type="button" style="display:none;"/>
 
diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index f9b94e2d3..0f934e88e 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -1,5 +1,5 @@
 function init_editor(params){
-   // var minHeight;  //最小高度
+    // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
     var paramsWidth = params.width == undefined ? "100%" : params.width;
 
@@ -7,7 +7,7 @@ function init_editor(params){
         resizeType : 1,minWidth:"1px",width:paramsWidth,
         height:"30px",// == undefined ? "30px":paramsHeight+"px",
         minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
-            items:['emoticons'],
+        items:['emoticons'],
         afterChange:function(){//按键事件
             nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
             var edit = this.edit;
@@ -49,6 +49,9 @@ function nh_check_field(params){
             if(params.content.isEmpty()){
                 params.contentmsg.html('内容不能为空');
                 params.contentmsg.css({color:'#ff0000'});
+                params.submit_btn.one('click', function(){
+                    params.form.submit();
+                });
             }else{
                 params.contentmsg.html('填写正确');
                 params.contentmsg.css({color:'#008000'});
@@ -68,7 +71,9 @@ function init_form(params){
             issubmit:true,
             content:params.editor,
             contentmsg:params.contentmsg,
-            textarea:params.textarea
+            textarea:params.textarea,
+            submit_btn:params.submit_btn,
+            form:params.form
         });
         if(is_checked){
             if(flag){
@@ -115,7 +120,7 @@ function init_KindEditor_data(id){
                 params.cancel_btn.click(function () {
                     nh_reset_form(params);
                 });
-                params.submit_btn.click(function () {
+                params.submit_btn.one('click', function () {
                     params.form.submit();
                 });
                 params.textarea.data('init', 1);

From 617649129e9443fec65649caece21e9bb1404330 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 11:20:14 +0800
Subject: [PATCH 06/13] Gemfile

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index da3b3b4d7..a599613ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
-#gem 'certified'
+gem 'certified'
 
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'

From 3b3cafbc81e0daba276025233336a58d87f9f4f1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 14:49:49 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb |  6 +++---
 app/controllers/student_work_controller.rb    |  2 +-
 app/models/homework_common.rb                 | 16 ++++++++--------
 app/models/message.rb                         |  4 ++--
 app/models/news.rb                            |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 689ef2bd7..0566d3d98 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -291,9 +291,9 @@ class HomeworkCommonController < ApplicationController
 
   def open_student_works
     if @homework.is_open == 0
-      @homework.update_attribute(:is_open, 1)
+      @homework.update_column('is_open', 1)
     else
-      @homework.update_attribute(:is_open, 0)
+      @homework.update_column('is_open', 0)
     end
     @user_activity_id = params[:user_activity_id]
     @is_in_course = params[:is_in_course] if params[:is_in_course]
@@ -440,7 +440,7 @@ class HomeworkCommonController < ApplicationController
           puts time
           s_time = time
           if format_time(time) > format_time(h.updated_at)
-            h.update_attribute(:updated_at, s_time)
+            h.update_column('updated_at', s_time)
           end
         end
       end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index deab2feb6..c3d7dbbc6 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -814,7 +814,7 @@ class StudentWorkController < ApplicationController
           stu_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 3 ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
           @work.student_score = stu_score.first.score.try(:round, 2).to_f
       end
-      @homework.update_attributes(:updated_at => Time.now)
+      @homework.update_column('updated_at', Time.now)
       update_course_activity(@homework.class,@homework.id)
       update_user_activity(@homework.class,@homework.id)
       update_org_activity(@homework.class,@homework.id)
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index f11a48a80..e4426e78f 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -29,8 +29,8 @@ class HomeworkCommon < ActiveRecord::Base
                 :description => :description,
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
-  after_create :act_as_activity, :send_mail
-  after_update :update_activity
+  after_create :act_as_activity, :send_mail,:act_as_course_message
+  after_update :update_activity, :wechat_message
   after_save :act_as_course_activity
   after_destroy :delete_kindeditor_assets
 
@@ -59,12 +59,12 @@ class HomeworkCommon < ActiveRecord::Base
       else
         self.course.members.each do |m|
           # if m.user_id != self.user_id
-          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
-          #count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
-          #if count == 0
-          #  ws = WechatService.new
-          #  ws.homework_template(m.user_id, "homework", self.id, "#{l(:label_new_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
-          #end
+          #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+          count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
+          if count == 0
+            ws = WechatService.new
+            ws.homework_template(m.user_id, "homework", self.id, "#{l(:label_new_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
+          end
           # end
         end
       end
diff --git a/app/models/message.rb b/app/models/message.rb
index 7bfb9d80e..fdc3c6bdc 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -274,7 +274,7 @@ class Message < ActiveRecord::Base
       else    # 回帖
         parent_author_id = Message.find(self.parent_id).author_id
         if parent_author_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
-          #self.course_messages << CourseMessage.new(:user_id => parent_author_id, :course_id => self.board.course_id, :viewed => false)
+          self.course_messages << CourseMessage.new(:user_id => parent_author_id, :course_id => self.board.course_id, :viewed => false)
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{parent_author_id} and shield_type='Course' and shield_id=#{self.board.course_id}").count
           if count == 0
             content = strip_html self.content.html_safe, 200
@@ -297,7 +297,7 @@ class Message < ActiveRecord::Base
       else    # 回帖
         parent_author_id = Message.find(self.parent_id).author_id
         if parent_author_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
-          #self.forge_messages << ForgeMessage.new(:user_id => parent_author_id, :project_id => self.board.project_id, :viewed => false)
+          self.forge_messages << ForgeMessage.new(:user_id => parent_author_id, :project_id => self.board.project_id, :viewed => false)
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{parent_author_id} and shield_type='Project' and shield_id=#{self.board.project_id}").count
           if count == 0
             content = strip_html self.content.html_safe, 200
diff --git a/app/models/news.rb b/app/models/news.rb
index f0457dc81..1544faf61 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -62,7 +62,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
@@ -169,7 +169,7 @@ class News < ActiveRecord::Base
     if self.course
       self.course.members.each do |m|
         if m.user_id != self.author_id
-          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+          #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
           if count == 0
             ws = WechatService.new

From 670b2c48c7fc9e90344476dab512d82e58f6cf35 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 16:08:40 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=B6=88=E6=81=AF=E8=A6=81=E7=BB=86=E5=8C=96=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index d5d148117..b5e87feea 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -164,7 +164,20 @@ class Issue < ActiveRecord::Base
       count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Project' and shield_id=#{self.project_id}").count
       if m.user_id != self.author_id && count == 0
         ws = WechatService.new
-        content = strip_html self.project.name + " 有新缺陷了：" + self.subject.html_safe, 200
+        str = " 有新缺陷了： "
+        case self.tracker_id
+          when 1
+            str = " 有新缺陷了： "
+          when 2
+            str = " 有新功能了： "
+          when 3
+            str = " 有新支持了： "
+          when 4
+            str = " 有新任务了： "
+          when 5
+            str = " 有新周报了： "
+        end
+        content = strip_html self.project.name + str + self.subject.html_safe, 200
         ws.message_update_template m.user_id, "issues", self.id, "#{l(:label_new_issue_template)}", content, format_time(self.created_on)
       end
     end

From 31d94dc0528fab9d66497b019ddf0218fd43b710 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 May 2016 16:28:43 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8F=AF=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E4=BD=9C=E4=B8=9A=E8=87=B3=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=9C=E4=B8=9A=E7=9A=84=E5=8E=9F=E4=BD=9C=E8=80=85?=
 =?UTF-8?q?=E4=B8=8D=E5=BA=94=E6=94=B6=E5=88=B0=E5=BE=AE=E4=BF=A1=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a81ade3fa..373801963 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -589,7 +589,7 @@ class UsersController < ApplicationController
         new_homework.homework_detail_programing.save if new_homework.homework_detail_programing
         new_homework.homework_detail_group.save if new_homework.homework_detail_group
       end
-      homework.update_attribute(:quotes, homework.quotes+1)
+      homework.update_column(:quotes, homework.quotes+1)
     end
     @homework = homework
     respond_to do |format|
@@ -862,7 +862,7 @@ class UsersController < ApplicationController
 
       student_work.save
       send_message_to_teacher(student_work)
-      homework.update_attributes(:updated_at => Time.now)
+      homework.update_column(:updated_at, Time.now)
       update_course_activity(homework.class,homework.id)
       update_user_activity(homework.class,homework.id)
       update_org_activity(homework.class,homework.id)
@@ -950,7 +950,7 @@ class UsersController < ApplicationController
           homework_detail_group.save if homework_detail_group
           if params[:quotes] && !params[:quotes].blank?
             quotes_homework = HomeworkCommon.find params[:quotes].to_i
-            quotes_homework.update_attribute(:quotes, quotes_homework.quotes+1)
+            quotes_homework.update_column(:quotes, quotes_homework.quotes+1)
           end
           if params[:is_in_course] == "1"
             redirect_to homework_common_index_path(:course => homework.course_id)

From 0f2f4717b6f6aa40792ab5e1bce3fdbadfa76e75 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 13:50:45 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=8F=B7=E5=92=8C=E7=BF=BB=E9=A1=B5?=
 =?UTF-8?q?=E3=80=81=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92?=
 =?UTF-8?q?=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb  |  5 +++--
 app/helpers/application_helper.rb              | 11 +++++++++++
 app/views/homework_common/index.html.erb       |  6 ++++++
 app/views/users/_user_homework_detail.html.erb |  7 ++++++-
 app/views/users/_user_homework_list.html.erb   |  2 +-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 0566d3d98..9da4b90b9 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -20,15 +20,16 @@ class HomeworkCommonController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
-      @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
+      #@homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
       @homework_commons = @course.homework_commons.order("created_at desc")
     else
-      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
+      #@homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
       @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc")
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
 
+    @homeworks = paginateHelper @homework_commons,10
     #设置at已读
     @homeworks.each do |homework|
       homework.journals_for_messages.each do |j|
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 229aceb1c..7d970c762 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3248,3 +3248,14 @@ def strip_html(text,len=0,endss="...")
   end
   return ss
 end
+
+def get_hw_index(hw,is_teacher)
+  if is_teacher
+    homeworks = hw.course.homework_commons.order("created_at asc")
+  else
+    homeworks = hw.course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at asc")
+  end
+  hw_ids = homeworks.map{|hw| hw.id} if !homeworks.empty?
+  index = hw_ids.index(hw.id)
+  return index
+end
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index e34cf0736..29cff8933 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -73,6 +73,12 @@
   <% end%>
   <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1,:course_id => @course.id} %>
 
+  <div style="width:210px; text-align:center; margin:0 auto;">
+    <ul class="wlist" style=" border:none; display:inline-block; float:none; margin-top:10px;">
+      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+    </ul>
+    <div class="cl"></div>
+  </div>
 </div>
 <div class="cl"></div>
 
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index decaba88c..c0578c042 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -11,7 +11,12 @@
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
       </div>
           <span class="homepagePostTitle hidden fl m_w505">
-            <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+            <% if is_in_course == 1%>
+                <% index = get_hw_index(homework_common, is_teacher) %>
+                <%= link_to "<span class='fontBlue2'>作业#{index+1}：</span>".html_safe+homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+            <% else %>
+                <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
+            <% end %>
           </span>
 
       <% if homework_common.homework_detail_manual%>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index e42c5d8b2..f7669047c 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -31,7 +31,7 @@
 <% if homework_commons.count == 10%>
     <% if is_in_course == 1%>
         <!-- 在课程内 -->
-        <%= link_to "点击展开更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+        <%#= link_to "点击展开更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
     <% else%>
         <!-- 在个人主页 -->
         <%= link_to "点击展开更多",student_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>

From 05a475e47ea8bdeeb070b2a04a61411e9a922a74 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 14:35:40 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E5=BA=94=E5=87=BA=E7=8E=B0=E5=B7=B2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/activities.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 94ee14a56..ae60d548a 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -33,8 +33,8 @@ module Mobile
           shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
           page = params[:page] ? params[:page] : 0
-          user_project_ids = (user.projects.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")"
-          user_course_ids = (user.courses.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")"
+          user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")"
+          user_course_ids = (user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")"
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           project_types = "('Message','Issue','ProjectCreateInfo')"
           principal_types = "JournalsForMessage"

From 6517f23f03e727599ee39aeacc3e64df182b0ba1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 15:26:23 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=88=9B=E5=BB=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/activities.rb                        | 2 +-
 app/api/mobile/entities/activity.rb                      | 6 +++---
 app/controllers/organizations_controller.rb              | 2 +-
 app/controllers/users_controller.rb                      | 2 +-
 app/controllers/wechats_controller.rb                    | 2 +-
 app/models/course_activity.rb                            | 3 +--
 app/models/forge_activity.rb                             | 2 +-
 app/views/organizations/_org_activities.html.erb         | 2 +-
 app/views/organizations/_org_project_activities.html.erb | 2 +-
 app/views/users/_user_activities.html.erb                | 4 ++--
 db/migrate/20160519070718_change_user_activities_data.rb | 9 +++++++++
 db/schema.rb                                             | 3 ++-
 12 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 db/migrate/20160519070718_change_user_activities_data.rb

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index ae60d548a..cbd43bb79 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -36,7 +36,7 @@ module Mobile
           user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")"
           user_course_ids = (user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")"
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-          project_types = "('Message','Issue','ProjectCreateInfo')"
+          project_types = "('Message','Issue','Project')"
           principal_types = "JournalsForMessage"
           watched_user_ids = User.watched_by(user.id).count == 0 ? " " : ("," + User.watched_by(user.id).map{|u| u.id.to_s }.join(','))
           user_ids = "(" + user.id.to_s + watched_user_ids + ")"
diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index 20876bf69..3eab332a7 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -14,7 +14,7 @@ module Mobile
             else
               case f
                 when :user_act
-                  if ac.act_type == "ProjectCreateInfo"
+                  if ac.act_type == "Project"
                     ac unless ac.nil?
                   else
                     ac.act unless ac.nil? || ac.act.nil?
@@ -87,7 +87,7 @@ module Mobile
                         "项目缺陷"
                       when "Message"
                         "项目讨论区"
-                      when "ProjectCreateInfo"
+                      when "Project"
                         "项目"
                     end
                   end
@@ -101,7 +101,7 @@ module Mobile
       expose :container_type     #课程/项目/博客/个人
       expose :author, using: Mobile::Entities::User do |a, opt|    #用户信息
         if a.is_a? ::UserActivity
-          if a.act_type == "ProjectCreateInfo"
+          if a.act_type == "Project"
             get_user(get_project(a.act_id).user_id)
           elsif !a.act.nil?
             if a.act_type == 'Issue' || a.act_type == 'News' || a.act_type == 'Message' || a.act_type == 'BlogComment'
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index c94f734e1..1946378ef 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -127,7 +127,7 @@ class OrganizationsController < ApplicationController
           case params[:type]
             when nil
               @org_activities  = OrgActivity.where("(container_id =? and container_type =?) " +
-                                                       "or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')})) "+
+                                                       "or (container_type ='Project' and org_act_type in ('Issue','Message','Project') and container_id in (#{project_ids.join(',')})) "+
                                                        "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
                                                    @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
             when 'project_issue'
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 373801963..6f3aa6b18 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1373,7 +1373,7 @@ class UsersController < ApplicationController
     user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
     user_course_ids = (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
-    project_types = "('Message','Issue','ProjectCreateInfo')"
+    project_types = "('Message','Issue','Project')"
     principal_types = "JournalsForMessage"
     if params[:type].present?
       case params[:type]
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 0d75636f7..a9e4771e8 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -211,7 +211,7 @@ class WechatsController < ActionController::Base
     user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
     user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-    project_types = "('Message','Issue','ProjectCreateInfo')"
+    project_types = "('Message','Issue','Project')"
     principal_types = "JournalsForMessage"
 
     blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index 96ec6e355..2aae45d0a 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -5,8 +5,7 @@ class CourseActivity < ActiveRecord::Base
   belongs_to :course
   belongs_to :user
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity, :add_org_activity
-  after_create :add_course_lead
+  after_create :add_course_lead,:add_user_activity, :add_org_activity
   before_destroy :destroy_user_activity, :destroy_org_activity
 
   #在个人动态里面增加当前动态
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index c044392a0..44b13b315 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -20,7 +20,7 @@ class ForgeActivity < ActiveRecord::Base
   validates :forge_act_id,presence: true
   validates :forge_act_type, presence: true
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity, :add_org_activity
+  after_create :add_user_activity, :add_org_activity
   before_destroy :destroy_user_activity, :destroy_org_activity
 
   #在个人动态里面增加当前动态
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index a3e62fd16..c00cc6161 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -56,7 +56,7 @@
                 <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Message' %>
                 <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
-            <% when 'ProjectCreateInfo'%>
+            <% when 'Project'%>
                 <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
             <% end %>
         <% end %>
diff --git a/app/views/organizations/_org_project_activities.html.erb b/app/views/organizations/_org_project_activities.html.erb
index b46996661..d27e690c6 100644
--- a/app/views/organizations/_org_project_activities.html.erb
+++ b/app/views/organizations/_org_project_activities.html.erb
@@ -6,7 +6,7 @@
                         <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
                     <% when 'Message' %>
                         <%= render :partial => 'organizations/project_message', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
-                    <% when 'ProjectCreateInfo'%>
+                    <% when 'Project'%>
                         <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
                     <% end %>
                 <% end %>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index b7df824a4..2fe7315d5 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -54,7 +54,7 @@
                 sd_create_editor_from_data(<%= user_activity.id %>, null, "100%", "<%= user_activity.class.to_s %>");
             });
         </script>
-        <% if user_activity.act_type == "ProjectCreateInfo" %>
+        <% if user_activity.act_type == "Project" %>
             <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id} %>
         <% else %>
             <% act= user_activity.act  %>
@@ -94,7 +94,7 @@
                         <%# end %>
                         <% when 'Message' %>
                             <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_course=>0,:is_board=>0} %>
-                        <% when 'ProjectCreateInfo'%>
+                        <% when 'Project'%>
                         <%# cache (act) do %>
                             <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                         <%# end %>
diff --git a/db/migrate/20160519070718_change_user_activities_data.rb b/db/migrate/20160519070718_change_user_activities_data.rb
new file mode 100644
index 000000000..1a1bfb827
--- /dev/null
+++ b/db/migrate/20160519070718_change_user_activities_data.rb
@@ -0,0 +1,9 @@
+class ChangeUserActivitiesData < ActiveRecord::Migration
+  def up
+    execute("update user_activities set act_type = 'Project' where act_type = 'ProjectCreateInfo'")
+    execute("update org_activities set org_act_type = 'Project' where org_act_type = 'ProjectCreateInfo'")
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 43153fb76..9c4b4b333 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,8 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160511055221) do
+ActiveRecord::Schema.define(:version => 20160519070718) do
+
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
     t.string   "act_type",                                :null => false

From 3ebef0eae239955a499315a859054caeb19b1941 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 19 May 2016 15:57:20 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=B8=AD=E7=94=B3=E8=AF=B7=E5=BC=95=E7=94=A8=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E6=89=93=E5=BC=80=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BF=E9=97=AE=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 8 ++++++--
 public/stylesheets/new_user.css               | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index bab7bb5ec..d46c45593 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -240,14 +240,18 @@
           <li class="homepageNewsPubType fl">
             <%= link_to ma.course_message.user.show_name,
                         user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
+            <span class="<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl':'homepageNewsType fl' %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% link_str = ma.apply_result == 1 ?
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
             :
                     '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
-            <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
+            <% if User.current.member_of_course?(ma.course_message.course) || User.current.admin? || ma.course_message.is_open == 1 %>
+                <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
+            <% else %>
+                <span title='<%=link_str %>' style="color:#4b4b4b; cursor: default;" class="<%= ma.viewed == 0 ? 'newsBlack' : 'newsGrey'%>"><%=link_str %></span>
+            <% end %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 44e64e9ab..89712c89f 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -637,6 +637,7 @@ a.replyGrey1:hover {color:#4b4b4b;}
 a.newsBlue {color:#269ac9;}
 a.newsBlue:hover {color:#297fb8;}
 a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
+span.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}