From 4646d13234a62e517315041908142929b6e8a89b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 25 Jul 2016 18:54:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=90=8D=E7=A7=B0=EF=BC=8C=E7=AB=9F=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A8=E3=80=82=202.=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=8B=EF=BC=8C=E5=8E=BB=E6=8E=89=E2=80=9C?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=8A=A8=E6=80=81>=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb             | 14 +++++++-------
 app/views/courses/show.html.erb           |  2 +-
 app/views/files/_resource_detail.html.erb |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 96e0d7683..e5066d0fe 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -595,19 +595,19 @@ module CoursesHelper
   def get_acts_list_type type
     case type
       when "homework"
-        ">" + l(:label_homework_acts)
+         l(:label_homework_acts)
       when "news"
-        ">" + l(:label_news_acts)
+        l(:label_news_acts)
       when "attachment"
-        ">" + l(:label_attachment_acts)
+        l(:label_attachment_acts)
       when "message"
-        ">" + l(:label_message_acts)
+        l(:label_message_acts)
       when "journalsForMessage"
-        ">" + l(:label_journalsForMessage_acts)
+        l(:label_journalsForMessage_acts)
       when "poll"
-        ">" + l(:label_poll_acts)
+        l(:label_poll_acts)
       else
-        ">" + l(:label_all_cats)
+        l(:label_all_cats)
     end
   end
 
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index e7800531b..3e509faa5 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -9,7 +9,7 @@
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="homepageRight mt0 ml10">
 <div class="homepageRightBanner">
-  <div class="NewsBannerName">班级动态
+  <div class="NewsBannerName">
     <%= get_acts_list_type @type %></div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 4e9f38c50..07d1f248b 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -8,11 +8,11 @@
       <div class="homepagePostTitle break_word">
         <%# 如果有历史版本则提供历史版本下载 %>
         <% if file.attachment_histories.count == 0 %>
-            <%= link_to truncate(file.filename,length: 40, omission: '...'),
+            <%= link_to truncate(file.filename,length: 70, omission: '...'),
                       download_named_attachment_path(file.id, file.filename),
                       :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
         <% else %>
-            <%= link_to truncate(file.filename,length: 40, omission: '...'), attachment_history_download_path(file.id),
+            <%= link_to truncate(file.filename,length: 70, omission: '...'), attachment_history_download_path(file.id),
                       :title => file.filename+"\n"+file.description.to_s,
                       :class => "linkGrey3 f_14",
                       :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %>