diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 07e9c2b98..864509546 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -1,53 +1,56 @@
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
-    <% if journals.size > 0 %>
-        <% for journal in journals %>
-            <div class="ping_C" id='word_li_<%= journal.id.to_s %>'>
-              <div class="ping_dispic">
-                  <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
-              </div>
-              <div class="ping_discon upload_img" style="width: 610px;">
-                <div class="ping_distop f14">
-                  <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
+<% if journals.size > 0 %>
+    <% for journal in journals %>
+        <div class="ping_C" id='word_li_<%= journal.id.to_s %>'>
+          <div class="ping_dispic">
+            <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
+          </div>
+          <div class="ping_discon upload_img" style="width: 610px;">
+            <div class="ping_distop f14">
+              <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
-                    <%= 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"%>
+                    <%= link_to "#{journal.user.show_name}(#{journal.user.login})", user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%>
                   </span>
                   <span class="c_grey fr f14">
                     <%= format_time(journal.created_on) %>
                   </span>
-                  <div class="cl"></div>
-                  <p>
-                    <%= journal.notes.html_safe %>
-                  </p>
-                  <div class="cl"></div>
-                </div>
-                <div class="ping_disfoot f14">
-                  <% 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))  %>
-                    <% end %>
-                    <% if reply_allow %>
-                        <%#= link_to l(:label_bid_respond_quote),'',
-                                {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
-                        <%= link_to l(:label_bid_respond_quote),'javascript:;',{:nhname=>"reply_btn"} %>
-                    <% end %>
-                </div>
-                  <div class="cl"></div>
-                <% ids = 'project_respond_form_'+ journal.id.to_s%>
-                <% if reply_allow %>
-                    <div id='<%= ids %>' class="respond-form">
-                      <%= render :partial => 'words/new_respond_course', :locals => {:journal => journal, :m_reply_id => journal,:show_name => true} %>
-                    </div>
-                <% end %>
-                <div class="cl"></div>
-                <%= render :partial => "words/journal_reply", :locals => {:journal => journal, :show_name => true , :allow_delete => @course && User.current.allowed_to?(:as_teacher,@course)} %>
-              </div>
               <div class="cl"></div>
+              <p>
+                <%= journal.notes.html_safe %>
+              </p>
+              <div class="cl"></div>
+            </div>
+            <div class="ping_disfoot f14">
+              <% 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))  %>
+              <% end %>
+              <% if reply_allow %>
+                  <%#= link_to l(:label_bid_respond_quote),'',
+                                {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                  <%= link_to l(:label_bid_respond_quote),'javascript:;',{:nhname=>"reply_btn"} %>
+              <% end %>
             </div>
-        <% end %>
+            <div class="cl"></div>
+            <% ids = 'project_respond_form_'+ journal.id.to_s%>
+            <% if reply_allow %>
+                <div id='<%= ids %>' class="respond-form">
+                  <%= render :partial => 'words/new_respond_course', :locals => {:journal => journal, :m_reply_id => journal,:show_name => true} %>
+                </div>
+            <% end %>
+            <div class="cl"></div>
+
+            <%= render :partial => "words/journal_reply", :locals => {:journal => journal, :show_name => true, :allow_delete => @course && User.current.allowed_to?(:as_teacher,@course)} %>
+
+          </div>
+          <div class="cl"></div>
+        </div>
     <% end %>
+<% end %>
 
 
 
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 7b5c354c2..a0998f539 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -13,20 +13,14 @@
       </div>
       <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) %>
-            <%= l(:label_reply_to)%>
-            <% if show_name %>
-                <%= link_to "#{parent_jour.user.show_name}(#{parent_jour.user.login})", user_path(parent_jour.user) %>
-            <% else %>
-                <%#= 之所以改成这样是因为觉得没有真实姓名的用“匿名用户”替换不合理 %>
-                <%= link_to "#{parent_jour.user}", user_path(parent_jour.user) %>
-            <% end %>
+        <%= 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}(#{parent_jour.user.login})", user_path(parent_jour.user) %>
         <% else %>
-            <%= link_to  "#{reply.user}", user_path(reply.user) %>
-            <%= l(:label_reply_to)%>
-              <%= link_to "#{parent_jour.user}", user_path(parent_jour.user) %>
+            <%= l(:label_anonymous) %>
         <% end %>
+
         <p>
           <%= reply.notes.html_safe %>
         </p>
@@ -34,17 +28,17 @@
             <span class="c_grey fl">
               <%= format_time reply.created_on %>
             </span>
-            <div class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
-                <% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
-                  <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
-                              :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
-                <% end %>
-              <% if reply_allow %>
-                         <%#= link_to l(:button_reply),'',
+        <div class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
+          <% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
+              <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
+                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
+          <% end %>
+          <% if reply_allow %>
+              <%#= link_to l(:button_reply),'',
                                      {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
-                         <%= link_to l(:button_reply),'javascript:;',{:nhname=>"reply_btn"} %>
-                <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
-            </div>
+              <%= link_to l(:button_reply),'javascript:;',{:nhname=>"reply_btn"} %>
+          <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
+        </div>
         <div class="cl"></div>
         <div id='<%=id%>' class="respond-form">
           <% if reply_allow %>