课程讨论区添加真实姓名

编辑器图片更新

app/views/boards/_course_show.html.erb

@@ -39,9 +39,9 @@
           <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
           <div class="talkmain_txt fl mt5 f14">
             <% author = topic.author.to_s %>
-            <div style="max-width:60px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
-              <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl f14",:title=>author,
-                          :style=>'max-width:60px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %>
+            <div style="max-width:120px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
+              <%= link_to "#{topic.author.show_name}(#{topic.author.login})", 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>
 
@@ -51,14 +51,11 @@
                         margin-right: 10px;"><%= l(:button_edit) %></a>
             <% end %>
 
-            <%= link_to(
-                        l(:button_delete),
-                        {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
+            <%= link_to(l(:button_delete), {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
                        :method => :post,
                        :data => {:confirm => l(:text_are_you_sure)},
                        :class => 'talk_edit fr',
-                        :style => ' margin-right: 10px;'
-                ) if topic.destroyable_by?(User.current) %>
+                       :style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
 
             <% if topic.sticky? %>
                 <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
@@ -165,7 +162,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 message.author,false,:class => 'fl c_orange f14 ' %>
+                            <%= link_to_user_header message.author.show_name,false,:class => 'fl c_orange f14 ' %>
                             <br/>
                             <div class="fl break_word f14">
                               <%= textAreailizable message,:content,:attachments => message.attachments %>

app/views/boards/_project_show.html.erb

@@ -46,14 +46,11 @@
                 <% if topic.editable_by?(User.current) %>
                   <a href="javascript:void(0)" nhname="showbtn" style="color: #426e9a;float: right;margin-right: 10px;"><%= l(:button_edit) %></a>
                 <% end %>
-            <%= link_to(
-                        l(:button_delete),
-                        {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
+                <%= link_to(l(:button_delete), {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
                            :method => :post,
                            :data => {:confirm => l(:text_are_you_sure)},
                            :class => 'talk_edit fr',
-                        :style => ' margin-right: 10px;'
-                ) if topic.destroyable_by?(User.current) %>
+                           :style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
                 <% if topic.sticky? %>
                   <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
                 <% end %>
@@ -141,8 +138,7 @@
                   </div>
               <% end %>
               <div class="cl"></div>
-        <% replies_all = topic.children.includes(:author, :attachments, {:board => :project}).
-                reorder("#{Message.table_name}.id desc").all %>
+              <% replies_all = topic.children.includes(:author, :attachments, {:board => :project}).reorder("#{Message.table_name}.id desc").all %>
               <% unless replies_all.empty? %>
                   <div class="talkWrapMsg" nhname="nh_reply_div" id="nh_reply_div_<%= topic.id %>">
                     <ul>
@@ -161,18 +157,12 @@
                               <input nhname="nh_content_val" type="hidden" value="<%= message.content %>"/>
                               <br/><div class="cl"></div>
                               <span class=" c_grey fl f14"><%= format_time(message.created_on) %></span>
-                    <%= link_to(
-
-                                l(:button_delete),
-                                {:controller => 'messages', :action => 'destroy',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
+                              <%= link_to(l(:button_delete),{:controller => 'messages', :action => 'destroy',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
                                        :method => :post,
                                        :data => {:confirm => l(:text_are_you_sure)},
                                        :title => l(:button_delete),
-                                :class => ' c_dblue fr f14'
-                        ) if message.course_destroyable_by?(User.current) %>
-                    <%= link_to(
-                                l(:button_reply),
-                                'javascript:;',
+                                       :class => ' c_dblue fr f14') if message.course_destroyable_by?(User.current) %>
+                              <%= link_to(l(:button_reply), 'javascript:;',
                                        :nhname =>'showbtn_child_reply',
                                        :class => ' c_dblue fr f14',
                                        :style => 'margin-right: 10px;',