From 586c3709db9293fc1327e3eac3acdf2e9b87bb07 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Thu, 28 May 2015 09:18:02 +0800
Subject: [PATCH] ...

---
 app/views/boards/_course_show.html.erb  | 10 +++++++---
 app/views/boards/_project_show.html.erb | 11 ++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 1f8cd9b77..889e82350 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -38,10 +38,14 @@
         <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply">
           <%= 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">
-            <% author = topic.author.to_s + "：" %>
-            <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
+            <% 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 ",:title=>author,
+                          :style=>'max-width:60px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %>
+            </div>
+            <p style="float:left;color:#ff5722;">&nbsp;&nbsp;:</p>
 
-            <p  class="talkmain_tit fl fb break_word" style="width:auto;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
+            <p class="talkmain_tit fl fb break_word" title="<%=  h(topic.subject) %>" style="width:auto;float:left;max-width:415px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
             <% if topic.course_editable_by?(User.current) %>
                 <a href="javascript:void(0)" nhname="showbtn"  style="color: #426e9a;float: right;
                         margin-right: 10px;"><%= l(:button_edit) %></a>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index a02bbff34..48b3d6ccf 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -34,9 +34,14 @@
       <div class="talkmain_box" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
         <%= 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">
-          <% author = topic.author.to_s + "：" %>
-          <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
-          <p  class="talkmain_tit fl fb break_word" style="width:auto;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
+          <% 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 ",:title=>author,
+                        :style=>'max-width:60px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %>
+          </div>
+          <p style="float:left;color:#ff5722;">&nbsp;&nbsp;:</p>
+
+          <p class="talkmain_tit fl fb break_word" title="<%=  h(topic.subject) %>" style="width:auto;float:left;max-width:415px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
           <div style="float:right;max-width:110px;">
             <% 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>