From af7ca36c92ad8f8bcbf0931e8d4293d292b05243 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 26 Jan 2016 15:59:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=8A=A0=E5=85=A5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=88=96=E9=80=80=E5=87=BA=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb            | 9 ++++-----
 app/views/layouts/_project_info.html.erb | 5 ++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 4e90fc106..f326f2099 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -697,17 +697,16 @@ module CoursesHelper
   def join_in_course_header(course, user, options=[])
     if user.logged?
       joined = course.members.map{|member| member.user_id}.include? user.id
-      text = joined ? ("<em class='pr_arrow'></em>".html_safe + l(:label_course_exit_student)) : ("<em class='pr_add'></em>".html_safe + l(:label_course_join_student))
+      text = joined ? l(:label_course_exit_student) : l(:label_course_join_student)
       url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id)
       method = joined ? 'delete' : 'post'
       if joined
-        link = "<span class='pr_join_span mr5' ><em class='pr_add'></em>#{l(:label_course_join_student)}</span>" + link_to(text, url, :remote => true, :method => method, :class => "pr_join_a", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))
+        link = link_to(text, url, :remote => true, :method => method, :class => "pr_join_a", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))
       else
-        link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "pr_join_a") + "<span class='pr_join_span  mr5' ><em class='pr_arrow'></em>#{l(:label_course_exit_student)}</span>".html_safe
+        link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "pr_join_a")
       end
     else
-      link = "<span class='pr_join_span  mr5' ><em class='pr_add'></em>#{l(:label_course_join_student)}</span>" +
-      "<span class='pr_join_span  mr5' ><em class='pr_arrow'></em>#{l(:label_course_exit_student)}</span>"
+      link = "<span class='pr_join_span  mr5' >#{l(:label_course_join_student)}</span>"
     end
     link.html_safe
   end
diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb
index d4b5b20fe..db9e24a36 100644
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@@ -15,7 +15,10 @@
   <% end %>
 </div>
 <div class="pr_info_id fl f14">
-<a href="" class="linkGrey">加入课程</a>
+  <% unless is_teacher %>
+    <!--<a href="" class="pr_join_a f12">加入课程</a>-->
+      <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
+  <% end %>
 </div>
 <!--<div class="pr_info_id fl mb5 f14">
       ID:<%#= @course.id%>