From d882a3c5eea306a54e220eb232a7fd15d29614df Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 3 Jul 2015 15:20:53 +0800
Subject: [PATCH] =?UTF-8?q?bug#2948:=E5=9C=A8=E8=AF=BE=E7=A8=8B=E5=92=8C?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E8=A2=AB=E7=95=99=E8=A8=80=E7=9A=84=E4=BA=BA=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0=E7=95=99=E8=A8=80=E4=BA=BA=E7=9A=84?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E5=92=8C=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_history.html.erb           | 2 +-
 app/views/users/_history.html.erb             | 2 +-
 app/views/words/_journal_reply_items.html.erb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index e9639f4f0..043bac947 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -9,7 +9,7 @@
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
-                    <%= link_to journal.user.show_name, user_path(journal.user),:class => 'c_blue fb fl mb10', :target => "_blank"%>
+                    <%= link_to "#{journal.user.show_name}(#{journal.user.login})", user_path(journal.user),:class => 'c_blue fb fl mb10', :target => "_blank"%>
                   </span>
                   <span class="c_grey fr">
                     <%= format_time(journal.created_on) %>
diff --git a/app/views/users/_history.html.erb b/app/views/users/_history.html.erb
index d69b6b25b..a87c2d8e4 100644
--- a/app/views/users/_history.html.erb
+++ b/app/views/users/_history.html.erb
@@ -9,7 +9,7 @@
               <div class="ping_discon" style="width: 85%;">
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
-                  <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
+                  <span><%= link_to "#{journal.user.show_name}(#{journal.user.login})", user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
                   <!--<p><%#= textilizable journal.notes%></p>-->
                   <p><%=journal.notes.html_safe%></p>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index f93254218..5e9d6ef46 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -13,10 +13,10 @@
       </div>
       <div class="recall_con">
         <% id = 'project_respond_form_'+ reply.id.to_s %>
-        <%= link_to reply.user.show_name, user_path(reply.user) %>
+        <%= link_to "#{reply.user.show_name}(#{reply.user.login})", user_path(reply.user) %>
         <%= l(:label_reply_to)%>
         <% if show_name %>
-            <%= link_to parent_jour.user.show_name, user_path(parent_jour.user) %>
+            <%= link_to "#{parent_jour.user.show_name}(#{parent_jour.user.login})", user_path(parent_jour.user) %>
         <% else %>
             <%= l(:label_anonymous) %>
         <% end %>