From e01f622bc0e24ca97226dc46404bf39c2c2dcb6a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 18 Jul 2015 15:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=EF=BC=8C=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=E6=88=91=E7=9A=84=E5=85=B6=E4=BB=96=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E5=8F=AF=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/searchone4reload.html.erb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/files/searchone4reload.html.erb b/app/views/files/searchone4reload.html.erb
index 4512e52dd..75dd7bcab 100644
--- a/app/views/files/searchone4reload.html.erb
+++ b/app/views/files/searchone4reload.html.erb
@@ -2,26 +2,29 @@
 <% if file.is_public? || User.current.member_of_course?(course) %>
     <div class="re_con_box" id="container_files_<%= file.id %>">
       <div class="">
-        <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s,:class => "c_dblue f_14 f_b f_l hiddent" %>
+        <%= link_to truncate(file.filename,length: 35, 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 => "c_dblue f_14 f_b f_l"  %>
         <% if User.current.logged? %>
             <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
                 <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
 
                 <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
-              <span id="is_public_<%= file.id %>">
-                <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
-              </span>
+                      <span id="is_public_<%= file.id %>">
+                        <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
+                      </span>
                 <% else %>
                     <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
                 <% end %>
             <% else %>
                 <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
             <% end %>
+            <%= file_preview_tag(file, class: 'f_l re_open') %>
         <% else %>
         <% end %>
       </div>
       <div class="cl"></div>
-      <div class="">
+      <div class="mt5">
         <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
         <%= link_to( l(:button_delete), attachment_path(file),
                      :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>