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| %>
  • - <%= link_to_user_header member.principal,false,:class => "w150 c_orange fl" %> + <%= link_to_user_header member.principal,true,:class => "w150 c_orange 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;}