diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 00bf86ae5..b98e3be53 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -350,7 +350,7 @@
               </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) ? "老师":"同学"}",
+                                    "#{ma.course_message.user.members.where("course_id=?", ma.course.id).first.roles.first.name=='Student'?"同学":"老师"}",
                             user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
               </li>
@@ -430,22 +430,67 @@
     <% end %>
     <% if ma.course_message_type == "JoinCourseRequest" %>
         <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></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
           <li class="homepageNewsPubType fl">
-            <%= link_to User.find(ma.course_message_id), user_path(ma.course_message_id), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申请成为您课程的<%= ma.content %>：</span>
+            <span class="newsBlue homepageNewsPublisher">系统提示</span>
+            <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_path(ma.course),
+            <%= 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)),
                         :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a></li>
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+            <span id="deal_info_<%=ma.id%>">
+              <% if ma.status == 0 || ma.status.nil?%>
+                <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
+                  |
+                <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
+             <% elsif ma.status == 1%> <!-- 同意 -->
+                 您已经同意了该申请
+             <% elsif ma.status == 2%> <!-- 拒绝 -->
+                 您已经拒绝了该申请
+             <%end %>
+             </span>
+          </li>
           <div style="display: none" class="message_title_red system_message_style">
-            <p>申请人资料：</p>
-            <p>姓名：<%= User.find(ma.course_message_id).show_name %></p>
-            <p>职称：<%= User.find(ma.course_message_id).show_name %></p>
+            <p>
+              <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的课程成员申请，信息如下：
+            </p>
+            <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
+            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
+            <div class="fl">课程描述：</div>
+            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+            <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "CourseRequestDealResult" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher">系统提示</span>
+            <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.status == 1 ?
+                    '您申请成为课程"'+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"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></a>
+             </span>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>老师您好！您已成功加入课程<%= Course.find(ma.course_id).name%>。
+            </p>
+            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
+            <div class="fl">课程描述：</div>
+            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+            <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>