From d2bd1cc26167dd04fa2c4f12029149d7552701cf Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Fri, 22 Aug 2014 09:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA=E5=B8=96=E5=AD=90=E4=B8=BB=E9=A2=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A2=98=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=E7=A9=BA=E7=99=BD=E8=BF=87=E5=A4=9A=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb  | 10 ++--------
 app/views/messages/_project_show.html.erb |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 5b8b629d4..55cf9d61c 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -96,9 +96,9 @@
   <div class="memo-section">
     <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>">
       <% if @project %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project) %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
       <% elsif @course %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, course_boards_path(@topic.course) %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %>
       <% end %>
     </div>
     <div class="memo-content">
@@ -109,14 +109,8 @@
     </div>
     <div class="memo-timestamp">
       <div style="float: left"><%= authoring @topic.created_on, @topic.author %></div>
-
-
       <div style="float: right"><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></div>
     </div>
-
-
-
-
   </div>
   <br />
 </div>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index ec06e3e86..7f88816f5 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -97,9 +97,9 @@
   <div class="memo-section" style="width: 100%;word-break: break-all;">
     <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;">
       <% if @project %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(20, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
       <% elsif @course %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(20,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %>
       <% end %>
     </div>
     <div class="memo-content">