From e09f795171ec41469befaf2cb6df56fc448a265d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Jan 2016 17:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_project_file_links.html.erb   |  2 +-
 app/views/messages/_course_show.html.erb             |  4 ++--
 app/views/messages/_org_subfield_show.html.erb       |  4 ++--
 app/views/messages/_project_show.html.erb            |  4 ++--
 app/views/news/_course_show.html.erb                 |  4 ++--
 app/views/news/_project_show.html.erb                |  4 ++--
 app/views/org_document_comments/show.html.erb        |  5 +++--
 app/views/organizations/_show_org_document.html.erb  |  4 ++--
 .../student_work/_work_attachments_status.html.erb   | 12 ++++++++++--
 app/views/student_work/index.html.erb                |  2 +-
 public/stylesheets/courses.css                       |  1 +
 public/stylesheets/public.css                        |  1 +
 12 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index 3b76689f5..0f7e8a012 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -37,7 +37,7 @@
         <% if options[:length] %>
           <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true,:length => options[:length] -%>
         <% else %>
-          <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true -%>
+          <%= link_to_short_attachment attachment, :length=> 58,:class => 'hidden link_file_a fl newsBlue mw400', :download => true -%>
         <% end %>
       </span>
         <%if is_float%>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index c3278a209..c760e686d 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -84,8 +84,8 @@
         <%= @topic.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @topic, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @topic} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 304694b39..6d12fe960 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -113,8 +113,8 @@
         <%= @topic.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @topic, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @topic} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index e5aba7c02..c98f2983e 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -139,8 +139,8 @@
           <%= @topic.content.html_safe%>
         </div>
         <div class="cl"></div>
-        <div class=" fl" style="width: 600px">
-          <%= link_to_attachments_course @topic, :author => false %>
+        <div class="mt10" style="font-weight:normal;">
+          <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @topic} %>
         </div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 07aaef26d..767c11553 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -89,8 +89,8 @@
         <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @news, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 26ff807db..880bd0885 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -89,8 +89,8 @@
         <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @news, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %>
       </div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 26d04924a..405631369 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -29,8 +29,9 @@
             <%= @document.content.html_safe %>
           </div>
       <% end %>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course @document, :author => false %>
+      <div class=" fl">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @document} %>
+        <%#= link_to_attachments_course @document, :author => false %>
       </div>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index e9db0e43f..d4b44a3d2 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -24,8 +24,8 @@
             <%= document.content.html_safe %>
           </div>
       <% end %>
-      <div class=" fl" style="width: 600px">
-        <%= link_to_attachments_course document, :author => false %>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %>
       </div>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
diff --git a/app/views/student_work/_work_attachments_status.html.erb b/app/views/student_work/_work_attachments_status.html.erb
index e8d4f144b..c4b2a795e 100644
--- a/app/views/student_work/_work_attachments_status.html.erb
+++ b/app/views/student_work/_work_attachments_status.html.erb
@@ -1,8 +1,16 @@
 <% attachments.each_with_index do |attachment,i| %>
     <div id="attachment_<%= attachment.id%>">
-      <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
+      <span class="fl">
+          <span title="<%= attachment.filename %>">
+            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw360', :download => true -%>
+          </span>
+      </span>
       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author && status != 2 %>
-      <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
+      <span class="postAttSize">(<%= number_to_human_size attachment.filesize %>)</span>
+      <span class="author" title="<%= attachment.author%>">
+        <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+        <%= format_time(attachment.created_on) %>
+      </span>
       <div class="cl"></div>
     </div>
 <% end -%>
\ No newline at end of file
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index afc97aca9..41ec2b61b 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -166,7 +166,7 @@
         <div id="homeworkDetailHide" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
         <div class="cl"></div>
         <div>
-          <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => @homework.attachments} %>
+          <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @homework} %>
           <div class="cl"></div>
         </div>
         <div class="mt5">
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 810cd0fec..ac2530124 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -95,6 +95,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .mt-2 {margin-top:-2px;}
 .homeworkInfo {background:#F6F6F6; padding:10px; margin-bottom:10px;}
 .homeworkDetail {line-height:18px; font-size:12px; color:#484848; overflow:hidden;}
+.homeworkDetail p,.homeworkDetail div,.homeworkDetail em, .homeworkDetail span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
 .max_h54 {max-height:54px; }
 .homeworkState {padding:3px 5px; background-color:#28be6c; border-radius:3px; float:left; margin-left:15px; color:#ffffff;}
 .homeworkClose {padding:3px 5px; background-color:#b2b2b2; border-radius:3px; float:left; margin-left:15px; color:#ffffff;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 79b441f25..f5b6c4981 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -170,6 +170,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .h70{ height:70px;}
 .h150{ height:150px;}
 .p10 {padding-left:10px; padding-right:10px;}
+.mw360 {max-width: 360px !important;}
 .mw400 {max-width: 400px !important;}
 .mh18 {max-height: 18px;}