From e1675c40091b026a935f2e01421a00a1b5ffcad6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 17 Sep 2014 17:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/show.html.erb | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index ff0a3e6e1..a1feaf12a 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -1,8 +1,6 @@
 <% if @events_by_day != nil && @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
-      <!-- <h3><%#= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> -->
       <p class="subtitle">
-        <%#= l(:label_date_from_to, :start => format_date(@date_from), :end => format_date(@date_to - 1)) %>
       </p>
 
       <% @events_by_day.keys.sort.reverse.each do |day| %>
@@ -13,23 +11,21 @@
                     <tr>
                       <td colspan="2" valign="top" width="50"><%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %></td>
                       <td>
-                        <table width="580px" border="0">
+                        <table width="580px" border="0" style="width: 100%;table-layout: fixed">
                           <tr>
-                            <td colspan="2" valign="top">
+                            <td colspan="2" valign="top" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
                               <strong> <%= h(e.event_title) if @course.nil? || (e.course != nil && @course.id != e.course.id) %></strong>
-										<span class="font_lighter">
-                                          <% if @canShowRealName %>
-                                               <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
-                                              (<%= link_to_user(e.event_author, @canShowRealName) if e.respond_to?(:event_author) %>
-                                              )
-                                          <% else %>
-                                                <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
-                                          <% end %>
-
-                                          <%= l(:label_new_activity) %> </span>
-
-
-                              <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:style => "word-break:break-all;word-wrap: break-word;" %>
+                                <span class="font_lighter">
+                                  <% if @canShowRealName %>
+                                       <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
+                                      (<%= link_to_user(e.event_author, @canShowRealName) if e.respond_to?(:event_author) %>
+                                      )
+                                  <% else %>
+                                        <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
+                                  <% end %>
+                                  <%= l(:label_new_activity) %>
+                                </span>
+                              <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url%>
                             </td>
                           </tr>
                           <tr>
@@ -53,7 +49,6 @@
                     </tr>
                   </table>
                 </div>
-
             <% end %>
           </div>