Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/courses_controller.rb

@@ -36,7 +36,6 @@ class CoursesController < ApplicationController
         join = cs.join_course params,@user
         @state = join[:state]
         @course = join[:course]
-        Mailer.run.join_course_request(@course, User.current, params[:role])
       # else
       #   @course = Course.find_by_id params[:object_id]
       #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')

app/views/mailer/join_course_request.html.erb

@@ -1,4 +1,14 @@
-<p>
-  <%= @user.show_name %>申请成为课程<%= @course.name %>的<%= @role.eql?('9') ? '老师': '教辅' %>
-    <%=link_to user_message_url(@receive),user_message_url(@receive)%>
-</p>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<p><span style="color:#1b55a7; font-weight:bold;"><%= @user.show_name %></span> 请求成为课程：<span style="color:#1b55a7; font-weight:bold;"><%=link_to @course.name, course_url(@course) %></span>的<%= @role.eql?('9') ? '老师': '教辅' %> </p>
+            <p><%=link_to user_message_url(@receive),user_message_url(@receive)%></p>
+        </span>
+    </li>
+
+  </ul>
+
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>