From 6abdc4c7e16726a60f9514b125184c90946a022f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 9 Apr 2015 14:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=88=90=E5=91=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E7=9A=84=E8=94=A1=E5=85=88?=
 =?UTF-8?q?=E7=94=9Flogin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb  | 5 +++--
 app/views/courses/_member.html.erb | 2 +-
 public/stylesheets/courses.css     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cfc4545a9..095d0ada5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -132,9 +132,10 @@ module ApplicationHelper
   def link_to_user_header user,canShowRealName=false,options={}
     if user.is_a?(User)
       if canShowRealName
-        name = h(user.realname(options[:format]))
+        name = user.show_name
+        name = user.login if name == ""
       else
-        name = h(user.name(options[:format]))
+        name = user.login
       end
       link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => options[:class]
     else
diff --git a/app/views/courses/_member.html.erb b/app/views/courses/_member.html.erb
index 53e7c15a5..a4b5bae6e 100644
--- a/app/views/courses/_member.html.erb
+++ b/app/views/courses/_member.html.erb
@@ -1,6 +1,6 @@
 <% @members.each do |member| %>
     <li >
-      <%= link_to_user_header member.principal,false,:class => "w150 c_orange fl" %>
+      <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
       <span class="w150 fl">
         <%= h member.roles.sort.collect(&:to_s).join(', ') %>
         <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 00d4e445f..cfb27e20b 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -243,7 +243,7 @@ a:hover.tijiao{ background:#0f99a9;}
 .members_left ul li a{ float:left; text-align:center;}
 .members_left ul li span{ float:left; text-align:center; color:#484747;}
 
-.w150{ text-align:center; width:150px;}
+.w150{ text-align:center; width:150px;min-height: 10px;}
 .f_b{ font-weight: bold;}
 .members_right label{ margin-left:15px;}
 .N_search{ height:20px; border:1px solid #999;}