From 0b565b1be00a6bff64e1f69e0b625fd1aa61545f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 19 Oct 2015 17:34:59 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E8=AF=BE=E4=BB=B6=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20151019085603_update_attachments.rb      | 23 +++++++++++++++++++
 db/schema.rb                                  |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20151019085603_update_attachments.rb

diff --git a/db/migrate/20151019085603_update_attachments.rb b/db/migrate/20151019085603_update_attachments.rb
new file mode 100644
index 000000000..bd3ec2325
--- /dev/null
+++ b/db/migrate/20151019085603_update_attachments.rb
@@ -0,0 +1,23 @@
+class UpdateAttachments < ActiveRecord::Migration
+  def up
+    count = Attachment.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        Attachment.page(i).per(30).each do |attachment|
+          if attachment.container_type == 'Course'
+            course = attachment.course
+            if course
+              if course.is_public == 0 && attachment.attachtype == 1
+                attachment.is_public = 0
+                attachment.save
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4a0d2312a..44548ad9c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151014023806) do
+ActiveRecord::Schema.define(:version => 20151019085603) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From ec1eddbf073894396800b5fd1a7451fc9cdf0b21 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 19 Oct 2015 18:19:27 +0800
Subject: [PATCH 02/13] =?UTF-8?q?1.=E5=AD=A6=E7=94=9F=E7=9A=84=E2=80=9C?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BA=86=E4=BD=9C=E4=B8=9A=E2=80=9D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E9=93=BE=E6=8E=A5=E5=88=B0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2=EF=BC=8C=E8=80=8C=E9=9D=9E?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=EF=BC=9B?=
 =?UTF-8?q?=202.=E5=BC=80=E8=AF=BE=E5=AD=A6=E6=9C=9F=E5=85=B7=E4=BD=93?=
 =?UTF-8?q?=E5=88=B0=E6=9F=90=E5=B9=B4=EF=BC=8C=E5=A6=82=E2=80=9C=E7=A7=8B?=
 =?UTF-8?q?=E5=AD=A3=E5=AD=A6=E6=9C=9F=E2=80=9D=EF=BC=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C2015=E5=B9=B4=E7=A7=8B=E5=AD=A3=E5=AD=A6=E6=9C=9F?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 7f535f2ec..e5105561d 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -44,10 +44,18 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a></li>
+            <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
+                <%= link_to ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
+                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %>
+            <% else %>
+                <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                            :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %>
+            <% end %>
+          </a></li>
           <div  style="display: none" class="message_title_red system_message_style">
             <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
                 <p>
@@ -55,7 +63,7 @@
                   <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
                 </p>
                 <p>课程名称：<%= ma.course_message.course.name %>
-                  (<%= ma.course_message.course.term %>)</p>
+                  (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
                 <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
                 <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
@@ -68,7 +76,7 @@
             <% else %>
                 <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
                 <p>课程名称：<%= ma.course_message.course.name %>
-                  (<%= ma.course_message.course.term %>)</p>
+                  (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
                 <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
                 <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
@@ -99,7 +107,7 @@
                   <%= User.current.lastname + User.current.firstname %>同学您好！
                   <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
                 </p>
-                <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
                 <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
                 <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
@@ -107,7 +115,7 @@
                 <p>请同学们抓紧时间提交自己的作品，谢谢！</p>
             <% else %>
                 <p><%= User.current.lastname + User.current.firstname %>老师您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：</p>
-                <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
                 <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
                 <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
@@ -142,7 +150,7 @@
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
               <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
             </p>
-            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
             <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
             <p>
@@ -172,7 +180,7 @@
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
               <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>关闭了匿评，作业详情如下：
             </p>
-            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -201,7 +209,7 @@
               <p> 失败原因：提交作品的人数低于2人</p>
             </p>
             <p>作业详情如下：</p>
-            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
             <p>
               提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;24点</span>
@@ -288,7 +296,7 @@
                             :onmouseover =>"message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %></a></li>
                 <div  style="display: none" class="message_title_red system_message_style" >
-                  <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
+                  <p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
                   <p>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></p>
                   <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
                   <p>
@@ -354,7 +362,7 @@
                 <div class="ml60"><%= ma.course_message.notes  %></div>
                 <div class="fl">您的评论：</div>
                 <div class="ml60"><%= ma.course_message.jour.comment  %></div>
-                <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
+                <p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></p>
               </div>
               <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>

From dbbdae1be24c5e310765a57cb2de7b1ad4a26c27 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 20 Oct 2015 09:24:50 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20151019085603_update_attachments.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20151019085603_update_attachments.rb b/db/migrate/20151019085603_update_attachments.rb
index bd3ec2325..afb63a277 100644
--- a/db/migrate/20151019085603_update_attachments.rb
+++ b/db/migrate/20151019085603_update_attachments.rb
@@ -7,7 +7,7 @@ class UpdateAttachments < ActiveRecord::Migration
           if attachment.container_type == 'Course'
             course = attachment.course
             if course
-              if course.is_public == 0 && attachment.attachtype == 1
+              if course.is_public == 0
                 attachment.is_public = 0
                 attachment.save
               end

From 50abd3785afcbf2d682c4f7e561ccef408995230 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 20 Oct 2015 09:42:26 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=9F=E4=B8=80=E5=8A=A0=E4=B8=8A=E2=80=9C=E6=9F=90?=
 =?UTF-8?q?=E6=9F=90=E6=82=A8=E5=A5=BD=EF=BC=81=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index e5105561d..6c22976fd 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -296,6 +296,10 @@
                             :onmouseover =>"message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %></a></li>
                 <div  style="display: none" class="message_title_red system_message_style" >
+                  <p>
+                    <%= User.current.show_name %>同学您好！
+                    <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%><%= ma.status == 0? "评阅了您的作品":"重新评阅了您的作品"%>。详情如下：
+                  </p>
                   <p>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</p>
                   <p>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></p>
                   <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
@@ -356,8 +360,10 @@
                             :onmouseout => "message_titile_hide($(this))" %></a>
               </li>
               <div style="display: none" class="message_title_red system_message_style">
-                <div class="fl">回复人：</div>
-                <div class="ml36"><%= ma.course_message.user.show_name  %></div>
+                <p>
+                  <%= User.current.show_name %>老师您好！
+                  <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"学生"%>回复了您的作品评论。详情如下：
+                </p>
                 <div class="fl">回复内容：</div>
                 <div class="ml60"><%= ma.course_message.notes  %></div>
                 <div class="fl">您的评论：</div>

From 90ee4bbe6061ec5c94b25af839329d3e4d60fcdb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 20 Oct 2015 09:55:51 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20151019085603_update_attachments.rb      | 23 -------------------
 .../20151020013352_update_attachment.rb       | 23 +++++++++++++++++++
 ...51020014759_delete_null_course_activity.rb | 17 ++++++++++++++
 db/schema.rb                                  |  2 +-
 4 files changed, 41 insertions(+), 24 deletions(-)
 delete mode 100644 db/migrate/20151019085603_update_attachments.rb
 create mode 100644 db/migrate/20151020013352_update_attachment.rb
 create mode 100644 db/migrate/20151020014759_delete_null_course_activity.rb

diff --git a/db/migrate/20151019085603_update_attachments.rb b/db/migrate/20151019085603_update_attachments.rb
deleted file mode 100644
index afb63a277..000000000
--- a/db/migrate/20151019085603_update_attachments.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class UpdateAttachments < ActiveRecord::Migration
-  def up
-    count = Attachment.all.count / 30 + 2
-    transaction do
-      for i in 1 ... count do i
-        Attachment.page(i).per(30).each do |attachment|
-          if attachment.container_type == 'Course'
-            course = attachment.course
-            if course
-              if course.is_public == 0
-                attachment.is_public = 0
-                attachment.save
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def down
-  end
-end
diff --git a/db/migrate/20151020013352_update_attachment.rb b/db/migrate/20151020013352_update_attachment.rb
new file mode 100644
index 000000000..3e1161c09
--- /dev/null
+++ b/db/migrate/20151020013352_update_attachment.rb
@@ -0,0 +1,23 @@
+class UpdateAttachment < ActiveRecord::Migration
+  def up
+    count = Attachment.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      Attachment.page(i).per(30).each do |attachment|
+        if attachment.container_type == 'Course'
+          course = attachment.course
+          if course
+            if course.is_public == 0
+              attachment.is_public = 0
+              attachment.save
+            end
+          end
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151020014759_delete_null_course_activity.rb b/db/migrate/20151020014759_delete_null_course_activity.rb
new file mode 100644
index 000000000..0d7b11693
--- /dev/null
+++ b/db/migrate/20151020014759_delete_null_course_activity.rb
@@ -0,0 +1,17 @@
+class DeleteNullCourseActivity < ActiveRecord::Migration
+  def up
+    count = CourseActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        CourseActivity.page(i).per(30).each do |activity|
+          unless activity.course_act
+            activity.destroy
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 44548ad9c..41efc5698 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151019085603) do
+ActiveRecord::Schema.define(:version => 20151020014759) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From 933041866872e048d30f57f914478c820bc583f3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 20 Oct 2015 10:11:07 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8div?=
 =?UTF-8?q?=20=E4=B8=8B=E6=8B=89=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/school_controller.rb |   8 +-
 app/views/my/account.html.erb        | 142 ++++++++++++++++-----------
 2 files changed, 90 insertions(+), 60 deletions(-)

diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index 85bd6a784..d20a58b75 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -125,16 +125,18 @@ class SchoolController < ApplicationController
          end
     end
     if(condition == '')
-      @school = School.all
+      @school = School.page((params[:page].to_i || 1) - 1).per(100)
+      @school_count = School.count
     else
-      @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").all
+      @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").page((params[:page].to_i || 1) - 1).per(100)
+      @school_count = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").count
     end
 
     result = []
     # @school.each do |sc|
     #   result << {:value=>sc.name,:data=>sc.id}
     # end
-   render :json => @school.to_json
+   render :json =>{ :schools => @school,:count=>@school_count}.to_json
   end
 
   #添加学校
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 4a2fe446d..0531ea9e7 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -542,19 +542,41 @@
       });
   }
   var lastSearchCondition = '';
+  var page = 1; //唯一控制页码 变量
+  var count = 0; //查询结果的总量
+  var maxPage = 0 ;//最大页面值
   $(function() {
-//      $("input[name='province']").keydown(function(e){
-//          if(e.keyCode == 13 && $("#search_school_result_list").css('display') == 'block'){
-//             str = $("#search_school_result_list").children().eq(0).attr('onclick').match(/\(.*\)/)[0]
-//
-//             str = str.replace(/\(/,'').replace(/\)/,'');
-//             arr = str.split(',');
-//             id = arr[1].replace(/\'/,'')
-//             name = arr.replace(/\'/,'')
-//             changeValue(name,id);
-//              return false;
-//          }
-//      });
+      $("#search_school_result_list").scroll(function(e){
+          nScrollHight = $(this)[0].scrollHeight;
+          nScrollTop = $(this)[0].scrollTop;
+          var nDivHight = $(this).height();
+          if(nScrollTop + nDivHight >= nScrollHight) //到底部了，
+          {
+              //判断页码是否是最大值，如果是的，就不去请求了
+              if(page >= maxPage){
+                  return;
+              }else{  //如果不是，那就请求下一页，请求数据处理
+                  page ++;
+                  $.ajax({
+                      url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + $("input[name='province']").val() + '&page=' + page,
+                      type: 'post',
+                      success: function (data) {
+                          schoolsResult = data.schools;
+                          if (schoolsResult.length != undefined && schoolsResult.length != 0) {
+                              var i = 0;
+                              for (; i < schoolsResult.length; i++) {
+                                  link = '<a onclick="window.changeValue(\'' + schoolsResult[i].school.name.replace(/\s/g, " ") + '\',\'' + schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + schoolsResult[i].school.name + '</a><br/>';
+                                  $("#search_school_result_list").append(link);
+                              }
+                          } else {
+
+                          }
+                      }
+                  });
+              }
+
+          }
+      });
       //查询学校
       $("input[name='province']").on('input', function (e) {
           throttle(shcool_search_fn,window,e);
@@ -568,20 +590,25 @@
       }
 
       function shcool_search_fn(e){
-          $("input[name='occupation']").val(''); //一旦有输入就清空id。
-          if($(e.target).val().trim() == lastSearchCondition && $(e.target).val().trim() != ''){
+
+          if($(e.target).val().trim() == lastSearchCondition && $(e.target).val().trim() != ''){//如果输入框没有改变或者输入框为空就返回
               return;
           }
+          $("input[name='occupation']").val(''); //一旦有输入就清空id。
           lastSearchCondition = $(e.target).val().trim();
+          page = 1; //有新的搜索，页面重置为1
           $.ajax({
-              url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
+              url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value+'&page='+page,
               type: 'post',
               success: function (data) {
-                  if(data.length != undefined && data.length != 0) {
+                  schoolsResult = data.schools;
+                  count = data.count;
+                  maxPage = count % 100 + 1; //最大页码值
+                  if(schoolsResult.length != undefined && schoolsResult.length != 0) {
                       var i = 0;
                       $("#search_school_result_list").html('');
-                      for (; i < data.length; i++) {
-                          link = '<a onclick="window.changeValue(\'' + data[i].school.name.replace(/\s/g," ") + '\',\'' + data[i].school.id + '\')" href="javascript:void(0)">' + data[i].school.name + '</a><br/>';
+                      for (; i < schoolsResult.length; i++) {
+                          link = '<a onclick="window.changeValue(\'' + schoolsResult[i].school.name.replace(/\s/g," ") + '\',\'' + schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + schoolsResult[i].school.name + '</a><br/>';
                           $("#search_school_result_list").append(link);
                       }
                       $("#search_school_result_list").css('left', $(e.target).offset().left);
@@ -590,7 +617,7 @@
                       $("#search_school_result_list").show();
                       if($(e.target).val().trim() != '') {
                           str = e.target.value.length > 8 ?  e.target.value.substr(0, 6)+"..." : e.target.value;
-                          $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
+                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校');
                           $("#hint").show();
                       }else{
                           $("#hint").hide();
@@ -610,45 +637,46 @@
               $("#search_school_result_list").hide();
               $("#hint").hide();
           }
-      })
-      $("input[name='province']").on('focus', function (e) {
-          if($(e.target).val() == ''){  //
-              return;
-          }
-          if( $("input[name='occupation']").val() != ''){ //如果已经有id了。肯定存在，不用去找了。
-              return;
-          }
-          $.ajax({
-              url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
-              type: 'post',
-              success: function (data) {
-                  if(data.length != undefined && data.length != 0) {
-                      var i = 0;
-                      $("#search_school_result_list").html('');
-                      for (; i < data.length; i++) {
-                          link = '<a onclick="window.changeValue(\'' + data[i].school.name.replace(/\s/g," ") + '\',\'' + data[i].school.id + '\')" href="javascript:void(0)">' + data[i].school.name + '</a><br/>';
-                          $("#search_school_result_list").append(link);
-                      }
-                      $("#search_school_result_list").css('left', $(e.target).offset().left);
-                      $("#search_school_result_list").css('top', $(e.target).offset().top + 28);
-                      $("#search_school_result_list").css("position", "absolute");
-                      $("#search_school_result_list").show();
-                      if ($(e.target).val().trim() != '') {
-                          str = e.target.value.length > 8 ? e.target.value.substr(0, 6) + "..." : e.target.value;
-                          $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
-                          $("#hint").show();
-                      } else {
-                          $("#hint").hide();
-                      }
-                  }else {
-                      $("#search_school_result_list").html('');
-                      str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
-                      $("#hint").show();
-                  }
-              }
-          });
       });
+//      $("input[name='province']").on('focus', function (e) {
+//          if($(e.target).val() == ''){  //
+//              return;
+//          }
+//          if( $("input[name='occupation']").val() != ''){ //如果已经有id了。肯定存在，不用去找了。
+//              return;
+//          }
+//
+//          $.ajax({
+//              url: '<%#= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
+//              type: 'post',
+//              success: function (data) {
+//                  if(data.length != undefined && data.length != 0) {
+//                      var i = 0;
+//                      $("#search_school_result_list").html('');
+//                      for (; i < data.length; i++) {
+//                          link = '<a onclick="window.changeValue(\'' + data[i].school.name.replace(/\s/g," ") + '\',\'' + data[i].school.id + '\')" href="javascript:void(0)">' + data[i].school.name + '</a><br/>';
+//                          $("#search_school_result_list").append(link);
+//                      }
+//                      $("#search_school_result_list").css('left', $(e.target).offset().left);
+//                      $("#search_school_result_list").css('top', $(e.target).offset().top + 28);
+//                      $("#search_school_result_list").css("position", "absolute");
+//                      $("#search_school_result_list").show();
+//                      if ($(e.target).val().trim() != '') {
+//                          str = e.target.value.length > 8 ? e.target.value.substr(0, 6) + "..." : e.target.value;
+//                          $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
+//                          $("#hint").show();
+//                      } else {
+//                          $("#hint").hide();
+//                      }
+//                  }else {
+//                      $("#search_school_result_list").html('');
+//                      str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
+//                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
+//                      $("#hint").show();
+//                  }
+//              }
+//          });
+//      });
 
 //    $("#province").leanModal({top: 100, closeButton: ".modal_close"});
 

From b3cd3c48d2b50ddb2d9cdd35c9a1e02f4ef56890 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 20 Oct 2015 10:11:43 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_list.html.erb | 2 +-
 public/stylesheets/courses.css        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 3c6d545db..4cc249c20 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -39,7 +39,7 @@
                           </span>
                         <% else %>
                           <span id="is_public_<%= file.id %>">
-                            <a class="f_l re_open c_blue">私有</a>
+                            <span class="f_l re_open c_blue">私有</span>
                           </span>
                         <% end %>
 
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 2fb7ec9c9..db02a0292 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -292,6 +292,7 @@ a.re_open{display:block; width:46px;  border:1px solid #64bdd9; color:#64bdd9;
 a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;}
 a.re_de{ color:#6883b6; margin-left:15px;}
 .re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
+span.re_open{display:block; width:46px;  border:1px solid #64bdd9; color:#64bdd9;  margin-left:10px;padding:1px 5px;text-align: center}
 
 
 /* 作业列表 */

From f59593cc1c4ce15520729cd8ea2752fe4ee729c4 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 20 Oct 2015 10:22:47 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/school/upload_logo.html.erb | 2 +-
 public/stylesheets/application.css    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/school/upload_logo.html.erb b/app/views/school/upload_logo.html.erb
index 96b577f46..01071fb81 100644
--- a/app/views/school/upload_logo.html.erb
+++ b/app/views/school/upload_logo.html.erb
@@ -61,7 +61,7 @@ function showPreview(source) {
         </select>
       </div>
       <div style="margin-top: 10px;">
-        <input type="button" value="提交" onclick="submit_edit_school($(this));" class="mr5 submit_btn" />
+        <input type="button" value="提交" onclick="submit_edit_school($(this));" class="mr5 submit_btn_s" />
         <input type="button" value="取消" onclick="history.go(-1);" class="cancel_btn" />
         <%#= submit_tag('提交',:class=>'mr5') %>
         <%#= submit_tag('取消') %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6c6227ed4..dbc91353b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -12,8 +12,8 @@ li{list-style-type:none;}
 /*Tim 151019*/
 .schoolName {border:1px solid #dddddd; outline: none; width: 180px; height: 22px;}
 .provinceSelect {border: 1px solid #dddddd; outline: none; color: #888888;}
-.submit_btn {background-color: #269ac9; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
-.submit_btn:hover {background-color:#297fb8;}
+.submit_btn_s {background-color: #269ac9; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
+.submit_btn_s:hover {background-color:#297fb8;}
 .cancel_btn {background-color: #c1c1c1; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
 .cancel_btn:hover {background-color:#656565; }
 /*huang*/

From d049a0065592210a17c97da7e620104d5c90302c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 20 Oct 2015 10:28:16 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=E6=9C=AA=E5=8F=91=E5=B8=83=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E7=9A=84=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20151020021234_update_course_activity.rb  | 23 +++++++++++++++++++
 db/schema.rb                                  |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20151020021234_update_course_activity.rb

diff --git a/db/migrate/20151020021234_update_course_activity.rb b/db/migrate/20151020021234_update_course_activity.rb
new file mode 100644
index 000000000..595b0d333
--- /dev/null
+++ b/db/migrate/20151020021234_update_course_activity.rb
@@ -0,0 +1,23 @@
+class UpdateCourseActivity < ActiveRecord::Migration
+  def up
+    count = CourseActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      CourseActivity.page(i).per(30).each do |activity|
+        if activity.course_act
+          if activity.course_act_type == 'Poll'
+            if activity.course_act.polls_status == 1
+              activity.destroy
+            end
+          end
+        else
+          activity.destroy
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 41efc5698..4aa12f627 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151020014759) do
+ActiveRecord::Schema.define(:version => 20151020021234) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From 1dd0954a9400a5508527b54de61ed35021172171 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 20 Oct 2015 10:29:51 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/feedback.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js
index fb3b35ca7..b30c8f91d 100644
--- a/public/javascripts/feedback.js
+++ b/public/javascripts/feedback.js
@@ -19,12 +19,12 @@
             if(options.minStatue == "true"){
                 show_btn.css("float", options.float);
                 sideContent.css('width', 0);
-                show_btn.css('width', 25);
+                show_btn.css('width', 28);
             }
             //close
             closeBtn.bind("click",function(){
                 sideContent.animate({width: '0px'},"fast");
-                show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
+                show_btn.stop(true, true).delay(300).animate({ width: '28px'},"fast");
                 cookiesave('minStatue','true','','','');
             });
             //show

From 515dad66e2d986b618d1e68d05673d8271c3657f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 20 Oct 2015 10:30:09 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E9=99=84=E4=BB=B6=E5=8D=95=E7=8B=ACJS=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_attachement_list.html.erb |   2 +-
 public/javascripts/attachments.js          | 285 ++++++++++++++-------
 2 files changed, 200 insertions(+), 87 deletions(-)

diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index c2c8d2d10..eb730640c 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -27,7 +27,7 @@
                    :id => '_file',
                    :class => ie8? ? '':'file_selector',
                    :multiple => true,
-                   :onchange => 'addInputFiles(this,"'+ checkBox.to_s+'");',
+                   :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");',
                    :style => ie8? ? '': 'display:none',
                    :data => {
                            :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 12384f451..329d0db5a 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -88,7 +88,7 @@ function addFile_board(inputEl, file, eagerUpload, id) {
     return null;
 }
 
-function addFile(inputEl, file, eagerUpload,checkBox) {
+function addFile(inputEl, file, eagerUpload) {
 
     var attachments_frame = '#attachments_fields';
     if ($(attachments_frame).children().length < 30) {
@@ -99,72 +99,50 @@ function addFile(inputEl, file, eagerUpload,checkBox) {
             'id': 'attachments_' + attachmentId,
             'class': 'attachment'
         });
-        //alert(checkBox);
-        if(checkBox){
-            fileSpan.append(
-                $('<input>', {
-                    'type': 'text',
-                    'class': 'filename readonly',
-                    'name': 'attachments[' + attachmentId + '][filename]',
-                    'readonly': 'readonly'
-                }).val(file.name),
-                $('<input>', {
-                    'type': 'text',
-                    'class': 'description',
-                    'name': 'attachments[' + attachmentId + '][description]',
-                    'maxlength': 254,
-                    'placeholder': $(inputEl).data('descriptionPlaceholder')
-                }).toggle(!eagerUpload),
-                $('<div>', {
-                    'class': 'div_attachments',
-                    'name': 'div_' + 'attachments_' + attachmentId
-                })
-            ).appendTo('#attachments_fields');
-        }else {
-            fileSpan.append(
-                $('<input>', {
-                    'type': 'text',
-                    'class': 'filename readonly',
-                    'name': 'attachments[' + attachmentId + '][filename]',
-                    'readonly': 'readonly'
-                }).val(file.name),
-                $('<input>', {
-                    'type': 'text',
-                    'class': 'description',
-                    'name': 'attachments[' + attachmentId + '][description]',
-                    'maxlength': 254,
-                    'placeholder': $(inputEl).data('descriptionPlaceholder')
-                }).toggle(!eagerUpload),
-                $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
-                    'class': 'ispublic-label'
-                }),
-                $('<input>', {
-                    'type': 'checkbox',
-                    'class': 'is_public_checkbox',
-                    'value': 1,
-                    'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
-                    checked: 'checked'
-                }).toggle(!eagerUpload),
-                $('<a>&nbsp</a>').attr({
-                    'href': "#",
-                    'class': 'remove-upload'
-                }).click(function () {
-                    if (confirm($(inputEl).data('areYouSure'))) {
-                        removeFile();
-                        if (!eagerUpload) {
-                            (function (e) {
-                                reload(e);
-                            })(fileSpan);
-                        }
+
+        fileSpan.append(
+            $('<input>', {
+                'type': 'text',
+                'class': 'filename readonly',
+                'name': 'attachments[' + attachmentId + '][filename]',
+                'readonly': 'readonly'
+            }).val(file.name),
+            $('<input>', {
+                'type': 'text',
+                'class': 'description',
+                'name': 'attachments[' + attachmentId + '][description]',
+                'maxlength': 254,
+                'placeholder': $(inputEl).data('descriptionPlaceholder')
+            }).toggle(!eagerUpload),
+            $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
+                'class': 'ispublic-label'
+            }),
+            $('<input>', {
+                'type': 'checkbox',
+                'class': 'is_public_checkbox',
+                'value': 1,
+                'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
+                checked: 'checked'
+            }).toggle(!eagerUpload),
+            $('<a>&nbsp</a>').attr({
+                'href': "#",
+                'class': 'remove-upload'
+            }).click(function() {
+                if (confirm($(inputEl).data('areYouSure'))) {
+                    removeFile();
+                    if (!eagerUpload) {
+                        (function(e) {
+                            reload(e);
+                        })(fileSpan);
                     }
+                }
 
-                }).toggle(!eagerUpload),
-                $('<div>', {
-                    'class': 'div_attachments',
-                    'name': 'div_' + 'attachments_' + attachmentId
-                })
-            ).appendTo('#attachments_fields');
-        }
+            }).toggle(!eagerUpload),
+            $('<div>', {
+                'class': 'div_attachments',
+                'name': 'div_' + 'attachments_' + attachmentId
+            })
+        ).appendTo('#attachments_fields');
 
         if (eagerUpload) {
             ajaxUpload(file, attachmentId, fileSpan, inputEl);
@@ -195,9 +173,9 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
         ajaxUpload.uploading++;
 
         uploadBlob(file, $(inputEl).data('upload-path'), attachmentId, {
-                loadstartEventHandler: onLoadstart.bind(progressSpan),
-                progressEventHandler: onProgress.bind(progressSpan)
-            })
+            loadstartEventHandler: onLoadstart.bind(progressSpan),
+            progressEventHandler: onProgress.bind(progressSpan)
+        })
             .done(function(result) {
                 progressSpan.progressbar('value', 100).remove();
                 fileSpan.find('input.description, a').css('display', 'inline-block');
@@ -284,22 +262,22 @@ function removeFile() {
 //gcm delete all file
 //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  start
 function removeAll(containerid) {
-        if (confirm(deleteallfiles)) {
-            if (containerid == undefined) {
-                $(".remove-upload").removeAttr("data-confirm");
-                $(".remove-upload").click();
-            } else {
-                var arr = $(".remove-upload").filter(function() {
-                    return $(this).data('containerid') == containerid;
-                });
-                arr.removeAttr("data-confirm");
-                arr.click();
-            }
+    if (confirm(deleteallfiles)) {
+        if (containerid == undefined) {
+            $(".remove-upload").removeAttr("data-confirm");
+            $(".remove-upload").click();
+        } else {
+            var arr = $(".remove-upload").filter(function() {
+                return $(this).data('containerid') == containerid;
+            });
+            arr.removeAttr("data-confirm");
+            arr.click();
         }
-        //	return false;
     }
-    //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  end
-    //gcm
+    //	return false;
+}
+//modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  end
+//gcm
 
 function uploadBlob(blob, uploadUrl, attachmentId, options) {
 
@@ -335,11 +313,10 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
 }
 
 function addInputFiles(inputEl) {
-    checkBox = arguments[1] == 'public' ? false : true;
     // var clearedFileInput = $(inputEl).clone().val('');
     if (inputEl.files) {
         // upload files using ajax
-        uploadAndAttachFiles(inputEl.files, inputEl,checkBox);
+        uploadAndAttachFiles(inputEl.files, inputEl);
         //   $(inputEl).remove();
     } else {
         // browser not supporting the file API, upload on form submission
@@ -386,7 +363,7 @@ function addInputFiles_board(inputEl, id) {
     //clearedFileInput.insertAfter('#attachments_fields');
 }
 
-function uploadAndAttachFiles(files, inputEl,checkBox) {
+function uploadAndAttachFiles(files, inputEl) {
 
     var maxFileSize = $(inputEl).data('max-file-size');
     var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
@@ -401,7 +378,7 @@ function uploadAndAttachFiles(files, inputEl,checkBox) {
         window.alert(maxFileSizeExceeded);
     } else {
         $.each(files, function() {
-            addFile(inputEl, this, true,checkBox);
+            addFile(inputEl, this, true);
         });
     }
 }
@@ -490,3 +467,139 @@ $(function() {
         }
     });
 });
+
+//课程课件
+function addInputFilesCourseSource(inputEl) {
+    checkBox = arguments[1] == 'public' ? false : true;
+    // var clearedFileInput = $(inputEl).clone().val('');
+    if (inputEl.files) {
+        // upload files using ajax
+        uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox);
+        //   $(inputEl).remove();
+    } else {
+        // browser not supporting the file API, upload on form submission
+        var attachmentId;
+        var aFilename = inputEl.value.split(/\/|\\/);
+        var count = $('#attachments_fields>span').length;
+        attachmentId = addFile(inputEl, {
+            name: aFilename[aFilename.length - 1]
+        }, false);
+        if (attachmentId) {
+            $(inputEl).attr({
+                name: 'attachments[' + attachmentId + '][file]'
+            }).hide();
+            if (count <= 0) count = 1;
+            $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
+        }
+    }
+
+    //clearedFileInput.insertAfter('#attachments_fields');
+}
+
+function uploadAndAttachFilesCourseSource(files, inputEl,checkBox) {
+
+    var maxFileSize = $(inputEl).data('max-file-size');
+    var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
+
+    var sizeExceeded = false;
+    $.each(files, function() {
+        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {
+            sizeExceeded = true;
+        }
+    });
+    if (sizeExceeded) {
+        window.alert(maxFileSizeExceeded);
+    } else {
+        $.each(files, function() {
+            addFileCourseSource(inputEl, this, true,checkBox);
+        });
+    }
+}
+
+function addFileCourseSource(inputEl, file, eagerUpload,checkBox) {
+
+    var attachments_frame = '#attachments_fields';
+    if ($(attachments_frame).children().length < 30) {
+        deleteallfiles = $(inputEl).data('deleteAllFiles');
+        var attachmentId = addFile.nextAttachmentId++;
+
+        var fileSpan = $('<span>', {
+            'id': 'attachments_' + attachmentId,
+            'class': 'attachment'
+        });
+        //alert(checkBox);
+        if(checkBox){
+            fileSpan.append(
+                $('<input>', {
+                    'type': 'text',
+                    'class': 'filename readonly',
+                    'name': 'attachments[' + attachmentId + '][filename]',
+                    'readonly': 'readonly'
+                }).val(file.name),
+                $('<input>', {
+                    'type': 'text',
+                    'class': 'description',
+                    'name': 'attachments[' + attachmentId + '][description]',
+                    'maxlength': 254,
+                    'placeholder': $(inputEl).data('descriptionPlaceholder')
+                }).toggle(!eagerUpload),
+                $('<div>', {
+                    'class': 'div_attachments',
+                    'name': 'div_' + 'attachments_' + attachmentId
+                })
+            ).appendTo('#attachments_fields');
+        }else {
+            fileSpan.append(
+                $('<input>', {
+                    'type': 'text',
+                    'class': 'filename readonly',
+                    'name': 'attachments[' + attachmentId + '][filename]',
+                    'readonly': 'readonly'
+                }).val(file.name),
+                $('<input>', {
+                    'type': 'text',
+                    'class': 'description',
+                    'name': 'attachments[' + attachmentId + '][description]',
+                    'maxlength': 254,
+                    'placeholder': $(inputEl).data('descriptionPlaceholder')
+                }).toggle(!eagerUpload),
+                $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
+                    'class': 'ispublic-label'
+                }),
+                $('<input>', {
+                    'type': 'checkbox',
+                    'class': 'is_public_checkbox',
+                    'value': 1,
+                    'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
+                    checked: 'checked'
+                }).toggle(!eagerUpload),
+                $('<a>&nbsp</a>').attr({
+                    'href': "#",
+                    'class': 'remove-upload'
+                }).click(function () {
+                    if (confirm($(inputEl).data('areYouSure'))) {
+                        removeFile();
+                        if (!eagerUpload) {
+                            (function (e) {
+                                reload(e);
+                            })(fileSpan);
+                        }
+                    }
+
+                }).toggle(!eagerUpload),
+                $('<div>', {
+                    'class': 'div_attachments',
+                    'name': 'div_' + 'attachments_' + attachmentId
+                })
+            ).appendTo('#attachments_fields');
+        }
+
+        if (eagerUpload) {
+            ajaxUpload(file, attachmentId, fileSpan, inputEl);
+
+        }
+        return attachmentId;
+    }
+    return null;
+}
+addFileCourseSource.nextAttachmentId = 1;
\ No newline at end of file

From 290e61599fdb8f526e6ebd45e98cbb492f86ba8d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 20 Oct 2015 10:47:51 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=AF=B9=E8=AF=BE=E7=A8=8B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=85=AC=E5=BC=80=E7=A7=81=E6=9C=89=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_attachement_list.html.erb | 55 +++++++++++++++-------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index eb730640c..4c631d22f 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -23,23 +23,44 @@
 </div>
 <% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
 <button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
-<%= file_field_tag 'attachments[dummy][file]',
-                   :id => '_file',
-                   :class => ie8? ? '':'file_selector',
-                   :multiple => true,
-                   :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");',
-                   :style => ie8? ? '': 'display:none',
-                   :data => {
-                           :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                           :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                           :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                           :upload_path => uploads_path(:format => 'js'),
-                           :description_placeholder => l(:label_optional_description),
-                           :field_is_public => l(:field_is_public),
-                           :are_you_sure => l(:text_are_you_sure),
-                           :file_count => l(:label_file_count),
-                           :delete_all_files => l(:text_are_you_sure_all)
-                   } %>
+<% if @course %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");',
+                       :style => ie8? ? '': 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+<% else %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :style => ie8? ? '': 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+<% end %>
+
 <!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
 
   <span id="upload_file_count">

From af4523815c6d53a95f8ff3ed0838698532c5bb4a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 20 Oct 2015 11:03:47 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BB=8E=E5=85=AC?=
 =?UTF-8?q?=E5=BC=80=E6=94=B9=E6=88=90=E7=A7=81=E6=9C=89=20=E5=88=99?=
 =?UTF-8?q?=E8=AF=A5=E8=AF=BE=E7=A8=8B=E4=B8=AD=E6=89=80=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=83=BD=E5=8F=98=E6=88=90=E7=A7=81=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/models/course.rb b/app/models/course.rb
index 46599dbfc..a583990c1 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -50,6 +50,8 @@ class Course < ActiveRecord::Base
   validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/
   validates_length_of :description, :maximum => 10000
   before_save :self_validate
+  # 公开课程变成私有课程，所有资源都变成私有
+  after_update :update_files_public
   after_create :create_board_sync, :act_as_course_activity, :act_as_course_message
   before_destroy :delete_all_members
 
@@ -213,6 +215,14 @@ class Course < ActiveRecord::Base
 
   end
 
+  def update_files_public
+    unless self.is_public?
+      self.attachments.each do |a|
+        a.update_attributes(:is_public => false)
+      end
+    end
+  end
+
   # 创建课程讨论区
   def create_board_sync
     @board = self.boards.build