From db6218a4874acddb0516c8f91e3d7d7457ef6589 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 8 May 2015 09:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=88=97=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E3=80=81=E6=95=99=E5=B8=88=E6=98=BE=E7=A4=BA=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_teacher.html.erb | 4 +++-
 public/stylesheets/public.css              | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/courses/_course_teacher.html.erb b/app/views/courses/_course_teacher.html.erb
index 5571a4546..ef1ffc808 100644
--- a/app/views/courses/_course_teacher.html.erb
+++ b/app/views/courses/_course_teacher.html.erb
@@ -1,6 +1,7 @@
 <div class="st_list">
   <div class="st_box">
     <a href="javascript:void(0)" class="fr fb  mb5" >加入时间</a>
+    <a href="javascript:void(0)" class="fr fb  mb5 mr70" >角色</a>
     <div class="cl"></div><!--st_box_top end-->
 
     <% members.each do |member| %>
@@ -9,8 +10,9 @@
             <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
           </a>
           <span class="fl ml10 c_grey"><%= l(:label_username)%></span>
-          <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %>
+          <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %>
           <span class="fr c_grey"><%= format_date(member.created_on)%></span>
+          <span class="fr c_grey mr30 w45"><%= zh_course_role(h member.roles.sort.collect(&:to_s).first)%></span>
         </div>
         <div class="cl"></div>
     <% end%>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 5006a11e4..031b73afb 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -70,6 +70,9 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mr20{ margin-right:20px;}
 .mr30{ margin-right:30px;}
 .mr40{ margin-right:40px;}
+.mr50{margin-right: 50px;}
+.mr55{margin-right: 55px;}
+.mr70{margin-right: 70px;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
@@ -79,6 +82,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
 .w20{ width:20px;}
+.w45{ width: 45px;}
 .w60{ width:60px;}
 .w70{ width:70px;}
 .w90{ width:90px;}