From 87320bf77bbac99700ca9706f015c32b484bbc97 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 10 Jul 2015 14:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=A4=9A=E5=B1=82=E5=B5=8C=E5=A5=97=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E5=AD=97=E4=BD=93=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb        | 7 ++++---
 app/views/words/_journal_reply_items.html.erb | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index b69250b83..f09f070fe 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -40,8 +40,9 @@
           <div class="talkmain_txt fl mt5 f14">
             <% author = topic.author.to_s %>
             <div style="max-width:120px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
-              <%= link_to User.current.member_of_course?(@board.course) ? "#{topic.author.show_name}(#{topic.author.login})" : "#{topic.author}" , user_path(topic.author), :class =>"talkmain_name fl f14",:title=>author,
-                          :style=>'max-width:120px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %>
+              <%= link_to User.current.member_of_course?(@board.course) ? "#{topic.author.show_name}(#{topic.author.login})" : "#{topic.author}" , user_path(topic.author),
+                       :class =>"talkmain_name fl f14",:title=>author,
+                       :style=>'max-width:120px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %>
             </div>
             <p style="float:left;color:#ff5722;">&nbsp;&nbsp;:</p>
 
@@ -162,7 +163,7 @@
                         <li nhname="reply_rec" style="display:<%= replies_all_i>2?'none':'' %>" id="topic<%=message.id%>">
                           <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class => 'Msg_pic' %>
                           <div class="Msg_txt">
-                            <%= link_to_user_header User.current.member_of_course?(@board.course) ? (message.author.show_name + "(" +topic.author.login + ")") : message.author, false,:class => 'fl c_orange f14 ' %>
+                            <%= link_to User.current.member_of_course?(@board.course) ? "#{message.author.show_name}(#{message.author.login})" : "#{message.author}", user_path(message.author),:class => 'fl c_orange f14 ' %>
                             <br/>
                             <div class="fl break_word f14">
                               <%= textAreailizable message,:content,:attachments => message.attachments %>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 85712a007..dce0a75a7 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -11,7 +11,7 @@
             <%= image_tag url_to_avatar(nil),:width => '30',:height => '30' %>
         <% end %>
       </div>
-      <div class="recall_con">
+      <div class="recall_con f14">
         <% id = 'project_respond_form_'+ reply.id.to_s %>
         <% if User.current.member_of_course?(@course) %>
             <%= link_to User.current.member_of_course?(@course)? "#{reply.user.show_name}(#{reply.user.login})" : "#{reply.user.login}" , user_path(reply.user) %>