Merge remote-tracking branch 'origin/szzh' into szzh

app/views/student_work/index.html.erb

@@ -139,6 +139,10 @@
         <div id="homeworkDetailShow" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
         <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} %>
+          <div class="cl"></div>
+        </div>
         <div class="mt5">
           <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %></div>
           <% if @homework.homework_detail_manual%>

app/views/users/import_resources_to_homework.js.erb

@@ -1,13 +1,13 @@
 <% unless @attachments.empty?%>
-    <% @attachments.each_with_index do |attachment, i| %>
+    <% @attachments.each do |attachment| %>
     $("#attachments_fields").append(
-    '<span id="attachments_p<%= i %>">'+
-    '<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+
-    '<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
+    '<span id="attachments_p<%= attachment.id %>">'+
+    '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+
+    '<%= text_field_tag("attachments[p#{attachment.id}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
         '<span class="ispublic-label"><%= l(:field_is_public)%>:</span>'+
-    '<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+
-    '<%= link_to("&nbsp;".html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => "js"), :method => "delete", :remote => true, :class => "remove-upload") unless attachment.id.nil? %>'+
-    '<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>'+
+    '<%= check_box_tag("attachments[p#{attachment.id}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+
+    '<%= link_to("&nbsp;".html_safe, attachment_path(attachment, :attachment_id => "p#{attachment.id}", :format => "js"), :method => "delete", :remote => true, :class => "remove-upload") unless attachment.id.nil? %>'+
+    '<%= hidden_field_tag "attachments[p#{attachment.id}][token]", "#{attachment.token}" %>'+
     '</span>'+
     '<div class="cl"></div>')
 

public/stylesheets/courses.css

@@ -1045,6 +1045,8 @@ a.pro_mes_w{ height:20px; display:block; color:#999999;}
 .rside_work_con{ width:650px;}
 a.c_grey{ color:#999999;}
 a:hover.c_grey{ color:#333;}
+a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .last_time{width:auto; text-align:right; margin-right:70px;}
 .link_file_box{ width:360px;}