From 543bf2645e4f833cf9f4225db86a5d3f168f8745 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 11 Oct 2014 10:41:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?#1348=20=E4=BF=AE=E6=94=B9=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E8=BF=9F=E4=BA=A4=E5=88=A4=E6=96=AD=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A=E8=BF=9F=E4=BA=A4=E5=8F=AA?=
 =?UTF-8?q?=E6=AF=94=E8=BE=83=E5=B9=B4=E6=9C=88=E6=97=A5=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E6=97=B6=E5=88=86=E7=A7=92=E4=B9=9F=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=AF=94=E8=BE=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_homework_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 3ed809fe0..0326f218c 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -78,7 +78,7 @@
                         <% end %>
                     </td>
                     <td rowspan="4" style="text-align: center;vertical-align: middle;width: 30px">
-                      <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %>
+                      <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
                           <span class="required">迟交</span>
                       <% end %>
                     </td>

From 00278d8571124c9100289650386a0c5a23cda338 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 11 Oct 2014 14:18:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?#1347=20=20=E4=BF=AE=E5=A4=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E6=A0=87=E7=AD=BE=E6=90=9C=E7=B4=A2=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/users.html.erb            | 2 +-
 app/views/tags/_show_attachments.html.erb | 2 +-
 public/stylesheets/application.css        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index 4a76a42ef..c70196a2f 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -26,7 +26,7 @@
     &nbsp;
 
     <div class="autoscroll">
-      <table class="list" style="width: 100%;table-layout: fixed">
+      <table class="list" style="width: 100%;table-layout: fixed;">
         <thead>
         <tr >
           <%= sort_header_tag('login', :caption => l(:field_login)) %>
diff --git a/app/views/tags/_show_attachments.html.erb b/app/views/tags/_show_attachments.html.erb
index 8b0bb1f8b..83fb857f4 100644
--- a/app/views/tags/_show_attachments.html.erb
+++ b/app/views/tags/_show_attachments.html.erb
@@ -4,7 +4,7 @@
 <hr />
 	<% attachments_results.each do |file| %>
 	<p class="font_description2">
-		<table border=0 cellSpacing=0 cellPadding=0>
+		<table border=0 cellSpacing=0 cellPadding=0 style="width: 100%;table-layout: fixed;">
 		  <tbody>
 		  <tr>
 		    <td class="r1">
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 50dc9393d..d7bf08fb5 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1389,7 +1389,7 @@ a.toggle-all:hover {text-decoration:none;}
 
 table.list tbody tr:hover { background-color:#ffffdd; }
 table.list tbody tr.group:hover { background-color:inherit; }
-table td {padding:2px;}
+table td {padding:2px;word-break: break-all;word-wrap: break-word;}
 table p {margin:0;}
 .odd {background-color:#f6f7f8;}
 .even {background-color: #fff;}

From 3dca123b0f5af5bee7213da94b1b87b16e14aa5d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 11 Oct 2014 14:51:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?#1209=20=E4=BF=AE=E5=A4=8D=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84BUg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/zipdown_controller.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 0393206b7..a7d804321 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -17,6 +17,7 @@ class ZipdownController < ApplicationController
         @project = obj.courses[0]
     end
   end
+
   def assort
     obj_class = params[:obj_class]
     obj_id = params[:obj_id]
@@ -76,18 +77,18 @@ class ZipdownController < ApplicationController
 
     homeattaches = bid.homeworks
     #记录所有作业是不是有附件，有一个附件就改为true
-    has_file = false
+    #has_file = false
     # 得到每一个人所有文件打包的zip文件
     # 并将每一个人的zip打包为一个并返回路径
     user_zip_paths = homeattaches.map do |homeattach|
       if homeattach.attachments.count > 0
         zip_homework_by_user homeattach
-        has_file = true unless has_file
+        #has_file = true unless has_file
       end
     end
-    unless has_file
-      render file: 'public/no_file_fond.html' , :layout => 'course_base'
-    end
+    #unless has_file
+    #  render file: 'public/no_file_fond.html' , :layout => 'course_base'
+    #end
     zipping "#{Time.now.to_i}_#{bid.name}.zip", user_zip_paths, OUTPUT_FOLDER
 
     #@paths = homeworks_attach_path