Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/messages/_course_show.html.erb

@@ -94,11 +94,11 @@
     </p>
   </div>
   <div class="memo-section">
-    <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>">
+    <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
       <% if @project %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project),title: @topic.subject.to_s %>
       <% elsif @course %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
       <% end %>
     </div>
     <div class="memo-content">

app/views/tags/_show_forums.html.erb

@@ -6,7 +6,7 @@
 		<strong><%= l(:label_tags_forum) %>:<%= link_to "#{forum.name}",
 		               :controller => "forums",:action => "show",:id => forum.id %></strong>
 		<br />
-		<strong><%= l(:label_tags_forum_description) %>:</strong><%= forum.description %>
+		<strong><%= l(:label_tags_forum_description) %>:</strong><%= textAreailizable forum.description %>
 		<%= forum.updated_at %>
 	</p>
 	<div class="line_under"></div>