Merge branch 'develop' into szzh

app/views/bids/_homework_list.html.erb

@@ -23,7 +23,7 @@
           (<span id="jours_count" class="c_red f_12"><%= @jours_count %></span>)
         </li>
         <li>
-          <%= link_to "作品打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "tb_all"  unless @bid.homeworks.empty? %>
+          <%#= link_to "作品打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "tb_all"  unless @bid.homeworks.empty? %>
         </li>
       </ul>
   <% else %>

app/views/homework_attach/_homework.html.erb

@@ -26,7 +26,7 @@
   </span>
 </li>
 <li class="wdown">
-  <%= link_to "(#{homework.attachments.count.to_s}个附件)", zipdown_download_user_homework_path(:homework => homework)%>
+  <%#= link_to "(#{homework.attachments.count.to_s}个附件)", "javascript:"%>
 </li>
 <li class="wscore">
   <% unless is_student_batch_homework %>

config/routes.rb

@@ -102,10 +102,10 @@ RedmineApp::Application.routes.draw do
 
   mount SeemsRateable::Engine => '/rateable', :as => :rateable
 
-  namespace :zipdown do
-    match 'assort'
-    match 'download_user_homework', :as => :download_user_homework
-  end
+  # namespace :zipdown do
+    # match 'assort'
+    # match 'download_user_homework', :as => :download_user_homework
+  # end
   namespace :test do
     match 'courselist'
     match 'zip'

public/stylesheets/css.css

@@ -38,7 +38,7 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
 .pic_head a{ text-align:center; width:42px; overflow:hidden;text-overflow:ellipsis; white-space:nowrap;}
 .pic_head img{ border:1px solid #fff;}
 .pic_head img:hover{border:1px solid #15bccf;}
-.dis ul li.wname a{ width:260px; font-size:14px; color:#595959; padding:15px 0 0 0px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
+.dis ul li.wname a{ width:360px; font-size:14px; color:#595959; padding:15px 0 0 0px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
 .dis ul li.wdown a{padding-top:22px; color:#3d7ec2; margin-right:35px;}
 .wscore{ padding-top:22px; color:#888888; width:96px;}
 .dis ul li.wping{margin-left:12px; }