修改作业消息的内容：把“你”统一改成“您”；发布作业是本人的话，改成“您发布了作业”，而非“某某老师发布了作业”等

app/controllers/users_controller.rb

@@ -128,12 +128,12 @@ class UsersController < ApplicationController
 
       #课程相关消息
       when 'homework'
-        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?",  @user).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','NoEvaluation') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
       when 'course_news'
         # 课程通知包含发布的通知和回复的通知
-        @message_alls = CourseMessage.where("course_message_type =? or course_message_type =?", "News", "Comment").where("user_id =?", @user).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in (?, ? ,?)", "News", "Comment", "Course").where("user_id =?", @user).order("created_at desc")
       when 'poll'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
 

app/views/users/_user_message_course.html.erb

@@ -52,7 +52,7 @@
             <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
                 <p>
                   <%= User.current.lastname + User.current.firstname %>老师您好！
-                  <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：
+                  <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
                 </p>
                 <p>课程名称：<%= ma.course_message.course.name %>
                   (<%= ma.course_message.course.term %>)</p>
@@ -66,7 +66,7 @@
                   您可以修改作业内容、评分规则、匿评过程等，谢谢！
                 </p>
             <% else %>
-                <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
+                <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
                 <p>课程名称：<%= ma.course_message.course.name %>
                   (<%= ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
@@ -302,7 +302,7 @@
                     本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。
                   </p>
                   <p>
-                    期待你取得更大的进步！
+                    期待您取得更大的进步！
                   </p>
                 </div>
             <% end %>
@@ -348,6 +348,8 @@
                             :onmouseout => "message_titile_hide($(this))" %></a>
               </li>
               <div style="display: none" class="message_title_red system_message_style">
+                <div class="fl">回复人：</div>
+                <div class="ml36"><%= ma.course_message.user.show_name  %></div>
                 <div class="fl">回复内容：</div>
                 <div class="ml60"><%= ma.course_message.notes  %></div>
                 <div class="fl">您的评论：</div>
@@ -368,7 +370,7 @@
           </li>
           <% student_work = StudentWork.find(ma.course_message_id)%>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to student_work.homework_common.name, student_work_index_path(:homework => student_work.homework_common_id),
+            <%= link_to "由于迟交作业，您及您的作品都不能参与作业的匿评", student_work_index_path(:homework => student_work.homework_common_id),
                         :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %></a></li>
@@ -377,9 +379,9 @@
               <%= User.current.lastname + User.current.firstname %>
               <%= User.current.allowed_to?(:as_teacher,student_work.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
             </p>
-            <p>课程名称：<%= student_work.homework_common.course.name %>(<%= student_work.homework_common.course.term %>)</p>
+            <p>课程名称：<%= student_work.homework_common.course.name %>(<%= student_work.homework_common.course.time.to_s + '年' + student_work.homework_common.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%=student_work.homework_common.name %></span></p>
-            <p>提交截止：<span style="color:Red;"><%=student_work.homework_common.end_time %>&nbsp;&nbsp;24点</span></p>
+            <p>提交截止：<span style="color:Red;"><%=student_work.homework_common.end_time %>&nbsp;24:00</span></p>
             <p>提交时间：<span style="color:Red;"><%=format_time(student_work.created_at) %></span></p>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -394,7 +396,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 ma.course_message.name, course_path(ma.course_message),
+            <%= link_to "课程名称：" + ma.course_message.name, course_path(ma.course_message),
                         :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %></a></li>
@@ -403,7 +405,7 @@
               <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个课程，详情如下：
             </p>
             <p>课程名称：<%= ma.course_message.name %></p>
-            <p>开课学期：<%= ma.course_message.term %></p>
+            <p>开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %></p>
             <div class="fl">课程描述：</div>
             <div class="ml60"><%= ma.course_message.description.html_safe %></div>
             <p>学时总数：<%= ma.course_message.class_period%></p>