- <%= link_to_user_header message.author.show_name,false,:class => 'fl c_orange f14 ' %>
+ <%= 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 ' %>
<%= textAreailizable message,:content,:attachments => message.attachments %>
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index d8e034161..07e9c2b98 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -9,7 +9,7 @@
- <%= link_to "#{journal.user.show_name}(#{journal.user.login})", user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%>
+ <%= link_to User.current.member_of_course?(@course) ? "#{journal.user.show_name}(#{journal.user.login})" : "#{journal.user.login}", user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%>
<%= format_time(journal.created_on) %>
@@ -24,10 +24,9 @@
<% ids = 'project_respond_form_'+ journal.id.to_s%>
<% if journal.user == User.current|| User.current.admin? || (@course && User.current.allowed_to?(:as_teacher,@course)) %>
- <%= link_to(l(:label_bid_respond_delete),
- {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
- :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
- :class => "delete", :title => l(:button_delete)) %>
+ <%= link_to(l(:label_bid_respond_delete), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
+ :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
+ :class => "delete", :title => l(:button_delete)) %>
<% end %>
<% if reply_allow %>
<%#= link_to l(:label_bid_respond_quote),'',
@@ -43,9 +42,7 @@
<% end %>
-
- <%= render :partial => "words/journal_reply", :locals => {:journal => journal, :show_name => true, :allow_delete => @course && User.current.allowed_to?(:as_teacher,@course)} %>
-
+ <%= render :partial => "words/journal_reply", :locals => {:journal => journal, :show_name => true , :allow_delete => @course && User.current.allowed_to?(:as_teacher,@course)} %>