From c579ee51feb4dc233247dda4a65340ae46f409fe Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 6 Sep 2015 15:31:48 +0800
Subject: [PATCH 001/101] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/onclick_time.rb                    |  3 ++
 .../20150906065702_create_onclick_times.rb    | 10 +++++
 db/schema.rb                                  | 42 ++++++++++++-------
 spec/factories/onclick_times.rb               |  7 ++++
 spec/models/onclick_time_spec.rb              |  5 +++
 5 files changed, 51 insertions(+), 16 deletions(-)
 create mode 100644 app/models/onclick_time.rb
 create mode 100644 db/migrate/20150906065702_create_onclick_times.rb
 create mode 100644 spec/factories/onclick_times.rb
 create mode 100644 spec/models/onclick_time_spec.rb

diff --git a/app/models/onclick_time.rb b/app/models/onclick_time.rb
new file mode 100644
index 000000000..16b17ea9a
--- /dev/null
+++ b/app/models/onclick_time.rb
@@ -0,0 +1,3 @@
+class OnclickTime < ActiveRecord::Base
+  attr_accessible :onclick_time, :user_id
+end
diff --git a/db/migrate/20150906065702_create_onclick_times.rb b/db/migrate/20150906065702_create_onclick_times.rb
new file mode 100644
index 000000000..3922b775e
--- /dev/null
+++ b/db/migrate/20150906065702_create_onclick_times.rb
@@ -0,0 +1,10 @@
+class CreateOnclickTimes < ActiveRecord::Migration
+  def change
+    create_table :onclick_times do |t|
+      t.integer :user_id
+      t.datetime :onclick_time
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5bf838c25..5867a62e5 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 => 20150906025009) do
+ActiveRecord::Schema.define(:version => 20150906065702) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -497,23 +497,26 @@ ActiveRecord::Schema.define(:version => 20150906025009) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    t.string   "TraceInfo"
-    t.string   "Method"
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
     t.string   "File"
-    t.string   "IPLine"
-    t.string   "Review"
-    t.string   "Category"
-    t.string   "Defect"
-    t.string   "PreConditions"
-    t.string   "StartLine"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
     t.integer  "project_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -936,6 +939,13 @@ ActiveRecord::Schema.define(:version => 20150906025009) do
     t.datetime "updated_at",                 :null => false
   end
 
+  create_table "onclick_times", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "onclick_time"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
   create_table "open_id_authentication_associations", :force => true do |t|
     t.integer "issued"
     t.integer "lifetime"
diff --git a/spec/factories/onclick_times.rb b/spec/factories/onclick_times.rb
new file mode 100644
index 000000000..fcdda983d
--- /dev/null
+++ b/spec/factories/onclick_times.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :onclick_time do
+    user_id 1
+onclick_time "2015-09-06 14:57:02"
+  end
+
+end
diff --git a/spec/models/onclick_time_spec.rb b/spec/models/onclick_time_spec.rb
new file mode 100644
index 000000000..bc453f545
--- /dev/null
+++ b/spec/models/onclick_time_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe OnclickTime, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From ed5f14c9ebb2c0a3b06c3cd1d772ddca29eff7a8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 6 Sep 2015 17:42:10 +0800
Subject: [PATCH 002/101] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 859f19f19..7744f20a4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -105,6 +105,16 @@ class UsersController < ApplicationController
       redirect_to signin_url
       return
     end
+    # 记录当前点击按钮的时间
+    if OnclickTime.where("user_id =?", User.current).first.nil?
+      message_new_time = OnclickTime.new
+      message_new_time.user_id = User.current.id
+      message_new_time.onclick_time = Time.now
+      message_new_time.save
+    else
+      message_new_time = OnclickTime.where("user_id =?", User.current)
+      message_new_time.update_attributes(:onclick_time => Time.now)
+    end
     # 当前用户查看消息，则设置消息为已读
     if params[:viewed] == "all"
       course_querys = @user.course_messages

From ecd0056f0a8219e982b495a2978a4179b313e7eb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 7 Sep 2015 11:13:15 +0800
Subject: [PATCH 003/101] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E6=88=90=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=82=B9=E5=87=BB=E8=AE=B0=E5=90=8E=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=82=202=E3=80=81=E9=A6=96=E6=AC=A1=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E4=BB=A5=E2=80=9C=E6=9C=80=E5=90=8E=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E2=80=9D=E4=B8=BA=E5=87=86=EF=BC=8C=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=E4=BB=A5=E7=82=B9=E5=87=BB=E6=97=B6=E9=97=B4=E4=B8=BA?=
 =?UTF-8?q?=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb |  2 +-
 app/models/onclick_time.rb          |  2 ++
 app/models/user.rb                  | 21 ++++++++++++++++-----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7744f20a4..4bbb9848a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -112,7 +112,7 @@ class UsersController < ApplicationController
       message_new_time.onclick_time = Time.now
       message_new_time.save
     else
-      message_new_time = OnclickTime.where("user_id =?", User.current)
+      message_new_time = OnclickTime.where("user_id =?", User.current).first
       message_new_time.update_attributes(:onclick_time => Time.now)
     end
     # 当前用户查看消息，则设置消息为已读
diff --git a/app/models/onclick_time.rb b/app/models/onclick_time.rb
index 16b17ea9a..c62a9274c 100644
--- a/app/models/onclick_time.rb
+++ b/app/models/onclick_time.rb
@@ -1,3 +1,5 @@
 class OnclickTime < ActiveRecord::Base
   attr_accessible :onclick_time, :user_id
+
+  belongs_to :user
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index b08b29981..e7f4a8c50 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -132,6 +132,7 @@ class User < Principal
   has_many :course_messages
   has_many :memo_messages
   has_many :user_feedback_messages
+  has_one :onclick_time
 
 # 虚拟转换
   has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
@@ -209,7 +210,7 @@ class User < Principal
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy
   # added by fq
-  after_create :act_as_activity
+  after_create :act_as_activity, :add_onclick_time
   # end
 
   scope :in_group, lambda {|group|
@@ -257,10 +258,16 @@ class User < Principal
 
   # 新消息统计
   def count_new_message
-    course_count = CourseMessage.where("user_id =? and viewed =?", User.current.id, 0).count
-    forge_count = ForgeMessage.where("user_id =? and viewed =?", User.current.id, 0).count
-    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", User.current.id, 0).count
-    user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    if OnclickTime.where("user_id =?", User.current).first.nil?
+      message_new_time = OnclickTime.new
+      message_new_time.user_id = User.current.id
+      message_new_time.onclick_time = User.current.last_login_on.nil? ? Time.now : User.current.last_login_on
+      message_new_time.save
+    end
+    course_count = CourseMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
     messages_count = course_count + forge_count + user_feedback_count + user_memo_count
   end
 
@@ -994,6 +1001,10 @@ class User < Principal
     self.acts << Activity.new(:user_id => self.id)
   end
 
+  def add_onclick_time
+    self.onclick_time << OnclickTime.new(:user_id => self.id, :onclick_time => self.created_on)
+  end
+
   # Removes references that are not handled by associations
   # Things that are not deleted are reassociated with the anonymous user
   def remove_references_before_destroy

From ef011ad473178f18ab122cb9fcb97cc14a66f839 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 7 Sep 2015 15:23:34 +0800
Subject: [PATCH 004/101] =?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E9=82=80=E8=AF=B7-?=
 =?UTF-8?q?-=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7,=E5=AF=B9=E8=BE=93=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E5=90=8D=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/invite_members_by_mail.html.erb   | 18 +++++++++++++-----
 public/stylesheets/public.css                  |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 4c6ee47d8..8c951a485 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -24,16 +24,24 @@
         if(email == "")
         {
             $("#valid_email").text("<%= l(:label_input_email_blank)%>");
+            return false;
         }
-        else if (filter.test(email)) {
-            $("#valid_email").html("");
-            return true;
+        else if(!filter.test(email))
+        {
+            $("#valid_email").text("<%= l(:label_email_format_error)%>");
+            return false;
+        }
+        else if(email.split('@')[0].length >= 20)
+        {
+            $("#valid_email").text("邮箱名过长,最长为20个字符");
+            return false;
         }
         else
         {
-            $("#valid_email").text("<%= l(:label_email_format_error)%>");
+            $("#valid_email").text("");
+            return true;
         }
-        return false;
+
     }
 
     function senderEmail(obj)
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4cc859721..2288c4994 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -418,6 +418,8 @@ div.flash.notice {
     background-color: #dfffdf;
     border-color: #9fcf9f;
     color: #005f00;
+    word-wrap: break-word;
+    word-break: break-all
 }
 
 div.flash.warning, .conflict {

From 103d61056d7d7ea0c8799a77581c52ce0b724e13 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 7 Sep 2015 16:08:04 +0800
Subject: [PATCH 005/101] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=9A=201=E3=80=81=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E2=80=9D=E5=88=86=E7=B1=BB=202?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=82=B9=E5=87=BB=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb    | 12 +++++++++++-
 app/helpers/users_helper.rb            |  9 +++++++++
 app/models/user.rb                     |  5 ++++-
 app/views/users/user_messages.html.erb |  6 +++---
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4bbb9848a..f05fa891a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -106,6 +106,7 @@ class UsersController < ApplicationController
       return
     end
     # 记录当前点击按钮的时间
+    # 考虑到用户未退出刷新消息页面
     if OnclickTime.where("user_id =?", User.current).first.nil?
       message_new_time = OnclickTime.new
       message_new_time.user_id = User.current.id
@@ -132,10 +133,19 @@ class UsersController < ApplicationController
     case params[:type]
       when nil
         @message_alls = []
-        messages = MessageAll.where("user_id =?",@user).order("created_at desc")
+        messages = MessageAll.where("user_id =?" ,@user).order("created_at desc")
         messages.each do |message_all|
           @message_alls << message_all.message
         end
+      when 'unviewed'
+        @message_alls = []
+        messages = MessageAll.where("user_id =?", @user).order("created_at desc")
+        messages.each do |message_all|
+          # 在点击或者刷新消息列表后未读的消息存放在数组
+          if message_all.message.viewed == 0
+            @message_alls << message_all.message
+          end
+        end
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
       when 'course_message'
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 269630ec3..c806f3493 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -52,6 +52,15 @@ module UsersHelper
     end
   end
 
+  # 统计未读消息数
+  def unviewed_message(user)
+    course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+  end
+
   def user_mail_notification_options(user)
     user.valid_notification_options.collect {|o| [l(o.last), o.first]}
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index e7f4a8c50..2ccc41783 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1001,8 +1001,11 @@ class User < Principal
     self.acts << Activity.new(:user_id => self.id)
   end
 
+  # 注册用户的时候消息默认点击时间为用户创建时间
   def add_onclick_time
-    self.onclick_time << OnclickTime.new(:user_id => self.id, :onclick_time => self.created_on)
+    if OnclickTime.where("user_id =?" , self.id).first.nil?
+      OnclickTime.create(:user_id => self.id, :onclick_time => self.created_on)
+    end
   end
 
   # Removes references that are not handled by associations
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index c3c1a447b..6a6597af9 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -4,6 +4,7 @@
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
         <ul class="newsType">
           <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
+          <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
           <%# 课程相关消息 %>
           <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
           <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
@@ -22,16 +23,15 @@
           <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
           <%# 系统贴吧 %>
           <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
-
         </ul>
       </li>
     </ul>
   </div>
 <div class="resources mt10" id="users_setting">
 <div>
-<% if params[:type].nil? %>
+<% if params[:type].nil? || params[:type] == "unviewed" %>
     <div class="newsReadSetting">
-      有&nbsp;<span class="c_red"><%= User.current.count_new_message %></span>&nbsp;条未读<a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
+      有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读<a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
     </div>
 <% end %>
 <% if @message_alls.count >0 %>

From 0a45e0848816d8d8b8aec37949429c56ebd4eb8f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 7 Sep 2015 16:14:34 +0800
Subject: [PATCH 006/101] =?UTF-8?q?1=E3=80=81=E6=B6=88=E6=81=AF=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE=E7=A4=BA=20?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=95=B0=E5=92=8C=E2=80=9C=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B7=B2=E8=AF=BB=E2=80=9D=E3=80=82=202?=
 =?UTF-8?q?=E3=80=81=E6=B6=88=E6=81=AF=E4=B8=8D=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE=E7=A4=BA=E2=80=9C=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E8=AE=BE=E4=B8=BA=E5=B7=B2=E8=AF=BB=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 6a6597af9..cd64fb227 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -29,12 +29,15 @@
   </div>
 <div class="resources mt10" id="users_setting">
 <div>
-<% if params[:type].nil? || params[:type] == "unviewed" %>
-    <div class="newsReadSetting">
-      有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读<a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
-    </div>
-<% end %>
 <% if @message_alls.count >0 %>
+    <% if params[:type].nil? || params[:type] == "unviewed" %>
+        <div class="newsReadSetting">
+          有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读
+          <% unless unviewed_message(@user) == 0 %>
+              <a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
+          <% end %>
+        </div>
+    <% end %>
     <%# 课程消息 %>
     <% unless @message_alls.nil? %>
         <% @message_alls.each do |ma| %>

From fb6688265c9748d1dfc6fb7ce0b5292d99388748 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 7 Sep 2015 17:16:25 +0800
Subject: [PATCH 007/101] =?UTF-8?q?wiki=E5=88=A0=E9=99=A4=E5=90=8E?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wiki_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index f74fbb04d..da6d48b8d 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -264,7 +264,7 @@ class WikiController < ApplicationController
     end
     @page.destroy
     respond_to do |format|
-      format.html { redirect_to project_wiki_index_url(@project) }
+      format.html {redirect_to edit_project_wiki_page_url @project, @page.title}
       format.api { render_api_ok }
     end
   end

From 8d72a9a5390fafcc0b6f593765f3750d26cddcee Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Sep 2015 09:22:15 +0800
Subject: [PATCH 008/101] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AEbas?=
 =?UTF-8?q?e=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 425b720d9..ddafdab52 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -49,16 +49,6 @@
         <%= link_to l(:field_homepage), home_path %> > <a href="http://<%= Setting.host_name %>"><%=l(:label_project_hosting_platform) %> </a>><%= link_to @project.name, project_path(@project.id) %>
       </p>
     </div>
-    <!--<div class="search fl">-->
-      <!--<%#= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>-->
-        <!--<%#= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>-->
-        <!--<a href="#" onclick="submitSerch('<%#= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >-->
-          <!--<%#= l(:label_search)%>-->
-        <!--</a>-->
-        <!--<div class="cl"></div>-->
-        <!--<span id="project_name_span" class="fl"></span>-->
-      <!--<%# end %>-->
-    <!--</div>-->
   </div><!--TopBar end-->
 
   <div id="content">

From 4c73e00eafde6ee333cf7e42e72e75ec943564a6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Sep 2015 09:43:41 +0800
Subject: [PATCH 009/101] =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 9f8d25c7e..9bc7b52ed 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -67,13 +67,14 @@ class StudentWorkController < ApplicationController
   end
 
   def index
-    # 消息状态更新
+    # 作业消息状态更新
     @homework.course_messages.each do |homework_message|
       if User.current.id == homework_message.user_id
         homework_message.update_attributes(:viewed => true)
       end
     end
-
+    # 作品消息状态更新
+    
     # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages

From 2dacc882dfd2bd1056e1ebf8d9fe86da41e0d79a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 8 Sep 2015 10:33:40 +0800
Subject: [PATCH 010/101] test

---
 app/controllers/users_controller.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9853130ab..deeb3c42f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -27,19 +27,13 @@ class UsersController < ApplicationController
   menu_item :user_course, :only => :user_courses
   menu_item :user_homework, :only => :user_homeworks
   menu_item :user_project, :only => [:user_projects, :watch_projects]
-  # menu_item :requirement_focus, :only => :watch_bids
   menu_item :requirement_focus, :only => :watch_contests
   menu_item :user_newfeedback, :only => :user_newfeedback
   menu_item :user_messages, :only => :user_messages
 
 
-  #Ended by young
-
-  # edit
-
   #
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
-  #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
                                       :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
                                       :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,

From ae2aa2feddcfe8f1d1f0ea89c2a047d15198b936 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Sep 2015 14:14:49 +0800
Subject: [PATCH 011/101] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E9=80=BB=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 9bc7b52ed..3ed5eb914 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -69,12 +69,21 @@ class StudentWorkController < ApplicationController
   def index
     # 作业消息状态更新
     @homework.course_messages.each do |homework_message|
-      if User.current.id == homework_message.user_id
-        homework_message.update_attributes(:viewed => true)
+      if User.current.id == homework_message.user_id && homework_message.viewed == 0
+        homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
       end
     end
-    # 作品消息状态更新
-    
+    # 作品打分消息状态更新
+    studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
+    studentworks_scores.each do |studentworks_score|
+      studentworks_score.update_attributes(:viewed => true) if studentworks_score.viewed == 0
+    end
+    # 作品评论消息状态更新
+    journals_for_teacher = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "JournalsForMessage", 0)
+    journals_for_teacher.each do |journal_for_teacher|
+      journal_for_teacher.update_attributes(:viewed => true)
+    end
+    # 作品留言
     # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages

From 1cbda41997581bf7fe4927c6fc734600dfb4ddf7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 8 Sep 2015 14:43:59 +0800
Subject: [PATCH 012/101] 11

---
 db/schema.rb | 64 ++++++++++++++++------------------------------------
 1 file changed, 19 insertions(+), 45 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 0d6e87acf..15e69a3ba 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -236,13 +236,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.boolean  "tracker_in_review_dialog", :default => false
   end
 
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "code_reviews", :force => true do |t|
     t.integer  "project_id"
     t.integer  "change_id"
@@ -476,13 +469,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -1169,18 +1155,18 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
+    t.integer  "replies_count",      :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
+    t.boolean  "lock",               :default => false
+    t.boolean  "sticky",             :default => false
+    t.boolean  "is_quote",           :default => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_local", :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -1205,19 +1191,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1
@@ -1269,11 +1242,10 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.integer  "project_id"
     t.integer  "user_id"
-    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1296,9 +1268,9 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
-    t.integer  "status"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 9
     t.text     "results"
     t.text     "src"
   end
@@ -1436,8 +1408,8 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.integer  "zip_code"
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
     t.integer  "identity"
+    t.string   "technical_title"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1505,6 +1477,9 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
+    t.integer  "level"
+    t.integer  "file"
+    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|
@@ -1537,7 +1512,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
-    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"

From 52c2719a465ee6372d1921f6549105465848ca27 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 8 Sep 2015 14:48:02 +0800
Subject: [PATCH 013/101] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=80=81=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb |  2 +-
 public/javascripts/homework.js               | 25 +-------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 72ace3ba5..0549cd5b2 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -45,7 +45,7 @@
 
 
     <div class="mt5">
-      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_comm_homework('new_homework_common');">发送</a>
+      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
       <span class="fr mr10 mt3">或</span>
       <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
       <div class="cl"></div>
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index bebb8a973..f29cd7b14 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -99,30 +99,7 @@ $(function(){
     $('#program-src').focus(function(){
         $(this).css('height', '100px');
     });
-    var isProgramHomework = function(){
-        return !$(".advanced_option").is(":hidden");
-    }
-
-    var submit_comm_homework = function(id){
-        var valid = true;
-        if (isProgramHomework()) {
-            $.each($('.advanced_option textarea.InputBox'), function(i, val){
-                if ($(val).val().length<=0) {
-                    $(val).focus();
-                    valid = false;
-                    return false;
-                }
-            });
-            if (valid) {
-                $('input[name=homework_type]').val(2);
-            };
-        }
-        if (valid) {
-            submit_homework(id);    
-        }
-    }
-    window.submit_comm_homework = submit_comm_homework;
-
+    
     var datepickerOptions={dateFormat:'yy-mm-dd',firstDay:0,showWeek:true,showOtherMonths:true,selectOtherMonths:true};
 
     $('input.date-input').datepicker(datepickerOptions);

From d01a52904030dab8d9ddeb207b606fb27367308e Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 8 Sep 2015 15:27:58 +0800
Subject: [PATCH 014/101] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/news/_project_form.html.erb b/app/views/news/_project_form.html.erb
index dfe1fb937..269420bfe 100644
--- a/app/views/news/_project_form.html.erb
+++ b/app/views/news/_project_form.html.erb
@@ -1,7 +1,7 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <li>
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
-  <input  type="text" name="news[title]" class="hwork_input_news" id="news_title" width="576px" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
+  <input  type="text" name="news[title]" class="hwork_input_news" id="news_title" width="576px" onblur="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
   <p id="title_notice_span" class="ml55"></p>
 </li>
 <li class="mb10">

From 137a0b16a00574aec7e1771a158c6bbd0a5e17ad Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 8 Sep 2015 15:40:25 +0800
Subject: [PATCH 015/101] =?UTF-8?q?1=E3=80=81=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=9B=BE=E7=89=87=202=E3=80=81=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=BC=96=E7=A8=8B=E5=BC=B9=E6=A1=86=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BE=93=E5=85=A5=E8=8E=B7=E5=8F=96=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb | 2 +-
 public/javascripts/homework.js               | 4 ++--
 public/stylesheets/new_user.css              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 0549cd5b2..4af5742a9 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -89,7 +89,7 @@
                   </select>
             </div>
             <div class="mt10">
-              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
+              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
               <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
                 <div class="cl"></div>
             </div>
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index f29cd7b14..c136029bf 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -120,6 +120,7 @@ $(function(){
         $("a.CloseBtn").on('click', function(){
             $("#BluePopupBox" ).dialog("close");
         });
+        $('#textarea_input_test').focus();
 
         $("#BluePopupBox a.BlueCirBtn").on('click', function(){
             var test_numbers = 0;
@@ -157,8 +158,7 @@ $(function(){
                 var html=bt('t:program-input-list',data);
                 $("input[name=homework_type]").after(html);
                 $("#BluePopupBox" ).dialog( "close" );    
-            };
-
+            }
         });
     });
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 6817907c0..f2521f0d7 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -905,8 +905,8 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .T_C{ text-align:center;}
 .SearchIcon{background:url(../images/homepage_icon.png) 676px -393px no-repeat; }
 .SearchIcon:hover{background:url(../images/homepage_icon.png) 676px -419px no-repeat; }
-a.link_file{ background:url(../images/course/pic_file.png) 0 2px no-repeat; padding-left:20px; }
-a:hover.link_file{ background:url(../images/course/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}

From 966bd8f94cb8b18e91a99b2d6bc8c0d1c153dd14 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 8 Sep 2015 16:31:19 +0800
Subject: [PATCH 016/101] =?UTF-8?q?admin=E9=85=8D=E7=BD=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=BC=96=E8=BE=91=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/application.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3e01d68ff..ed274a61e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1833,7 +1833,7 @@ input#time_entry_comments { width: 90%;}
 
 .tabular.settings p{ padding-left: 300px; }
 .tabular.settings label{ margin-left: -300px; width: 295px; }
-.tabular.settings textarea { width: 99%; }
+.tabular.settings textarea { width: 96%; }
 
 .settings.enabled_scm table {width:100%}
 .settings.enabled_scm td.scm_name{ font-weight: bold; }

From 2e595840317aefb349e394c92be414426d95eebc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 8 Sep 2015 16:36:50 +0800
Subject: [PATCH 017/101] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8C=89=E9=92=AE=E3=80=81=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE=E7=AD=89=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb          |   1 +
 app/views/users/_user_homework_list.html.erb |   4 ++--
 app/views/users/user_homeworks.html.erb      |   2 +-
 public/images/homepage_icon2.png             | Bin 10889 -> 10323 bytes
 public/stylesheets/new_user.css              |   4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9c6492448..7fcd7f260 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -300,6 +300,7 @@ class UsersController < ApplicationController
       @page = params[:page] ? params[:page].to_i + 1 : 0
       user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
       @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+      @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
       respond_to do |format|
         format.js
         format.html {render :layout => 'new_base_user'}
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 1a24b1499..642373d58 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -35,8 +35,8 @@
             <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
             <div class="cl"></div>
           </div>
-          <%# if is_teacher%>
-          <% if false%>
+          <% if is_teacher%>
+          <%# if false%>
               <div class="homepagePostSetting">
                 <ul>
                   <li class="homepagePostSettingIcon">
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index e925ccd6b..b3aaf5ece 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -17,7 +17,7 @@
 </div>
 <div class="cl"></div>
 
-<% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+<% if @is_teacher%>
     <!-- 老师身份才可以发布作业 -->
     <div class="HomeWork mb10">
       <% homework = HomeworkCommon.new %>
diff --git a/public/images/homepage_icon2.png b/public/images/homepage_icon2.png
index 6cbde8f6235a780dc9116f7507f433dcf4f6cec8..d39624a2e24f10323817e45686e5090365e7f4d7 100644
GIT binary patch
delta 7655
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
P1?gz%-73|1_{V<%Q%Chc

delta 8226
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
Xu(A2Lj~@6h0LbWunO?1~>mUCGSD1iN

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index f2521f0d7..df6d4d632 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -499,8 +499,8 @@ a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageMenuSetting {display:inline-block; background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
-.homepageMenuSetting:hover {background:url(../images/homepage_icon.png) -190px -407px no-repeat;}
+.homepageMenuSetting {display:inline-block; background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
+.homepageMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}

From 0746408a9df9a92af52a0c8285e3987cf0db07f9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Sep 2015 16:55:36 +0800
Subject: [PATCH 018/101] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E9=86=92=E5=8A=9F=E8=83=BD=EF=BC=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb    |  2 ++
 app/models/applied_project.rb          | 18 +++++++++++++++---
 app/views/users/user_messages.html.erb | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f05fa891a..c738ab89a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -146,6 +146,8 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
+      when 'invite_info'
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
       when 'course_message'
diff --git a/app/models/applied_project.rb b/app/models/applied_project.rb
index accbc90e2..fb8bf90af 100644
--- a/app/models/applied_project.rb
+++ b/app/models/applied_project.rb
@@ -1,8 +1,21 @@
 class AppliedProject < ActiveRecord::Base
   attr_accessible :project_id, :user_id
 
-   belongs_to :user
-   belongs_to :project
+  belongs_to :user
+  belongs_to :project
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+
+  after_create :send_appliled_message
+
+  def send_appliled_message
+    # if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+    self.project.members.each do |m|
+      if m.roles.first.to_s.include?("Manager")
+        self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+      end
+    end
+    # end
+  end
 
   #删除用户申请
   def self.deleteappiled(userid, projectid)
@@ -11,5 +24,4 @@ class AppliedProject < ActiveRecord::Base
       applied.destroy
     end
   end
-
 end
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index cd64fb227..778805db6 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -134,6 +134,21 @@
             <% end %>
             <!--项目消息-->
             <% if ma.class == ForgeMessage %>
+                <% if ma.forge_message_type == "AppliedProject" %>
+                    <ul class="homepageNewsList fl">
+                      <li class="homepageNewsPortrait fl">
+                        <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
+                      </li>
+                      <li class="homepageNewsPubType fl">
+                        <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        <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.project, project_path(ma.project_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ma.project}" %></a>
+                      </li>
+                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                    </ul>
+                <% end %>
                 <% if ma.forge_message_type == "Issue" %>
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl">

From 51d964d37149bf1de5d447ca239a4dcae279d30c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Sep 2015 17:26:10 +0800
Subject: [PATCH 019/101] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=AE=9A=E4=BD=8D=E5=88=B0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9F=90=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings.html.erb   | 12 +++++++-----
 app/views/users/user_messages.html.erb |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb
index e70e20cef..3fc9a89d6 100644
--- a/app/views/projects/settings.html.erb
+++ b/app/views/projects/settings.html.erb
@@ -2,13 +2,15 @@
     $(function(){
         <%if @select_tab%>
           <%if @select_tab == "modules"%>
-          project_setting(2);
+            project_setting(2);
+          <% elsif @select_tab == "members"%>
+            project_setting(3);
           <% elsif @select_tab == "versions"%>
-          project_setting(4);
-          $("#pro_st_edit_ban").toggle();
+            project_setting(4);
+            $("#pro_st_edit_ban").toggle();
           <% elsif @select_tab == "repositories" %>
-          project_setting(6);
-          $("#pro_st_edit_ku").toggle();
+            project_setting(6);
+            $("#pro_st_edit_ku").toggle();
           <%else%>
           <% end%>
         <% end%>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 778805db6..e3f8c04d0 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -144,7 +144,7 @@
                         <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.project, project_path(ma.project_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ma.project}" %></a>
+                        <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ma.project}" %></a>
                       </li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>

From a7f2f0a6d2a22af97a48034f533c9b684951f4d6 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 8 Sep 2015 17:31:16 +0800
Subject: [PATCH 020/101] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BAflash.now[:error]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 77933666f..0f44be36c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -342,7 +342,7 @@ class ProjectsController < ApplicationController
       if params[:repository] == "pswd_is_null"
         html  << l(:label_password_not_null)
       end
-      flash[:error] = html if !html.to_s.blank?
+      flash.now[:error] = html if !html.to_s.blank?
     end
       scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
       @repository = Repository.factory(scm)

From c413d66c4421ffab6e6a42413bebb1d71c137036 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 9 Sep 2015 00:43:54 +0800
Subject: [PATCH 021/101] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=89=93=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 35 ++++++++++------------
 app/controllers/users_controller.rb        | 11 +++++--
 app/models/homework_common.rb              |  4 +++
 app/models/student_work.rb                 | 22 ++++++++++++++
 app/models/student_work_test.rb            | 13 ++++++--
 5 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 17c98e3b1..593d6bf53 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -42,9 +42,6 @@ class StudentWorkController < ApplicationController
 
         end
       end
-
-   
-
     
     render :json => resultObj
   end
@@ -165,24 +162,23 @@ class StudentWorkController < ApplicationController
 
   def create
     if params[:student_work]
-      stundet_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
-      stundet_work ||= StudentWork.new
-      stundet_work.name = params[:student_work][:name]
-      stundet_work.description = params[:student_work][:description]
-      stundet_work.project_id = params[:student_work][:project_id]
-      stundet_work.homework_common_id = @homework.id
-      stundet_work.user_id = User.current.id
-      stundet_work.save_attachments(params[:attachments])
+      student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
+      student_work ||= StudentWork.new
+      student_work.name = params[:student_work][:name]
+      student_work.description = params[:student_work][:description]
+      student_work.project_id = params[:student_work][:project_id]
+      student_work.homework_common_id = @homework.id
+      student_work.user_id = User.current.id
+      student_work.save_attachments(params[:attachments])
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
-        stundet_work.late_penalty = @homework.late_penalty
+        student_work.late_penalty = @homework.late_penalty
         else
-        stundet_work.late_penalty = 0
+        student_work.late_penalty = 0
       end
-      render_attachment_warning_if_needed(stundet_work)
-      if stundet_work.save
-        if @homework.homework_type == 2 && @homework.homework_detail_programing       #编程作业，学生提交作品后计算系统得分
-         
-        end
+      render_attachment_warning_if_needed(student_work)
+
+      if student_work.save
+
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -624,7 +620,7 @@ class StudentWorkController < ApplicationController
   end
 
   def find_or_save_student_work(is_test)
-    student_work = @homework.student_works.where(user_id: User.current.id).first
+    student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
     if student_work.nil?
       @homework.student_works.build(
         name: params[:title],
@@ -633,6 +629,7 @@ class StudentWorkController < ApplicationController
         is_test: is_test
         )
       unless @homework.save
+        logger.debug @homework.errors.full_messages
       else
         student_work = @homework.student_works.where(user_id: User.current.id).first
       end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9c6492448..8bb971dab 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -367,8 +367,15 @@ class UsersController < ApplicationController
   end
 
   def user_commit_homework
-    flash[:notice] = l(:notice_successful_create)
-    redirect_to student_work_index_url(:homework => params[:homework])
+    homework = HomeworkCommon.find(params[:homework])
+    student_work = homework.student_works.where(user_id: User.current.id).first
+    if student_work
+      student_work.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to student_work_index_url(:homework => params[:homework])
+    else 
+      render_403
+    end
   end
 
   def user_new_homework
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index b51de6c2c..0bff38558 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -56,6 +56,10 @@ class HomeworkCommon < ActiveRecord::Base
     Mailer.run.homework_added(self)
   end
 
+  def is_program_homework?
+    self.homework_type == 2 && self.homework_detail_programing
+  end
+
   delegate :language_name, :to => :homework_detail_programing
 
 end
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index d7287dcc4..0a5c1b65c 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -10,10 +10,32 @@ class StudentWork < ActiveRecord::Base
   has_many :student_work_tests, order: 'id desc'
 
   before_destroy :delete_praise
+  before_save :set_program_score, :set_src
 
   acts_as_attachable
 
   def delete_praise
     PraiseTread.where("praise_tread_object_id = #{self.id} AND praise_tread_object_type = 'StudentWork'").destroy_all
   end
+
+  def last_test
+    student_work_tests.order('id desc').first
+  end
+
+  private 
+  def set_program_score
+    if homework_common.is_program_homework?       #编程作业，学生提交作品后计算系统得分
+        #根据最后一次测试计算得分
+        unless last_test
+          self.system_score = 0
+        else
+          self.system_score = last_test.test_score
+        end
+    end
+
+  end
+  def set_src
+    self.description = last_test.src if last_test
+  end
+
 end
diff --git a/app/models/student_work_test.rb b/app/models/student_work_test.rb
index 96aa1d6c3..1cfb7f8b2 100644
--- a/app/models/student_work_test.rb
+++ b/app/models/student_work_test.rb
@@ -34,10 +34,19 @@ class StudentWorkTest < ActiveRecord::Base
 
   def test_score
     if self.status.to_i == 0
-      format("%.1f",100.0 / self.student_work.homework_common.homework_tests.count)
-    else
+      100
+    elsif self.results.empty?
       0
+    else 
+      get_success_count * 100 / self.results.count
     end
   end
 
+  private
+  def get_success_count
+    self.results.inject(0) do |sum, result|
+      sum += (result["status"].to_i == 0 ? 1 : 0)
+    end || 0
+  end
+
 end

From e040c20f081c89d387521eab31846f5913940d02 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 9 Sep 2015 09:36:44 +0800
Subject: [PATCH 022/101] =?UTF-8?q?admin=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E7=99=BB=E5=BD=95=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/latest_login_users.html.erb | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/latest_login_users.html.erb b/app/views/admin/latest_login_users.html.erb
index c438dcebd..28ef8091e 100644
--- a/app/views/admin/latest_login_users.html.erb
+++ b/app/views/admin/latest_login_users.html.erb
@@ -70,18 +70,20 @@
                 <%=link_to(user.login, user_path(user)) %>
               </td>
               <td align="center">
-                <% case user.user_extensions.identity %>
-                <% when 0 %>
-                <%='老师' %>
-                <% when 1 %>
-                <%='学生' %>
-                <% when 2 %>
-                <%='企业' %>
-                <% when 3 %>
-                <%='开发者' %>
-                <% else %>
-                <%='未知身份' %>
-                <% end %>
+                <%if user.user_extensions%>
+                    <% case user.user_extensions.identity %>
+                    <% when 0 %>
+                        <%='老师' %>
+                    <% when 1 %>
+                        <%='学生' %>
+                    <% when 2 %>
+                        <%='企业' %>
+                    <% when 3 %>
+                        <%='开发者' %>
+                    <% else %>
+                        <%='未知身份' %>
+                    <% end %>
+                <% end%>
               </td>
             </tr>
         <% end %>

From 1a6f81f3020e585279a8164c760c5b6491f26091 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Sep 2015 10:15:05 +0800
Subject: [PATCH 023/101] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=BA=E5=88=86=E5=B7=B2=E8=AF=BB=E5=92=8C=E6=9C=AA?=
 =?UTF-8?q?=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 6 ++++++
 app/controllers/users_controller.rb    | 2 +-
 app/views/users/user_messages.html.erb | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 77933666f..04041bdf6 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -322,6 +322,12 @@ class ProjectsController < ApplicationController
   end
 
   def settings
+    # 修改查看消息状态
+    applied_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =? and viewed =?", User.current.id, @project, "AppliedProject", 0)
+    applied_messages.each do |applied_message|
+      applied_message.update_attributes(:viewed => true)
+    end
+    # end
     @issue_custom_fields = IssueCustomField.sorted.all
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c738ab89a..5680a333e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -146,7 +146,7 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
-      when 'invite_info'
+      when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index e3f8c04d0..a37ce30ff 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -5,6 +5,7 @@
         <ul class="newsType">
           <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
           <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
+          <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
           <%# 课程相关消息 %>
           <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
           <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>

From 20bef515dae1cea366f8f5a3a0ac8f5a718cd042 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 9 Sep 2015 11:42:06 +0800
Subject: [PATCH 024/101] =?UTF-8?q?issue=E5=91=A8=E6=8A=A5=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF=E7=BB=99=E6=89=80=E6=9C=89=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb | 6 ++++--
 app/models/issue.rb                  | 9 ++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6a0b351ba..47e425710 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -114,8 +114,10 @@ class IssuesController < ApplicationController
   def show
     # 当前用户查看指派给他的缺陷消息，则设置消息为已读
     query = @issue.forge_messages
-    if User.current.id == @issue.assigned_to_id
-      query.update_all(:viewed => true)
+    query.each do |m|
+      if m.user_id == User.current.id
+        m.update_attribute(:viewed, true)
+      end
     end
     # 缺陷状态更新
     query_journals = @issue.journals
diff --git a/app/models/issue.rb b/app/models/issue.rb
index fa8cee988..f7f596e17 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -147,6 +147,13 @@ class Issue < ActiveRecord::Base
     unless self.author_id == self.assigned_to_id
       self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
     end
+    if self.tracker_id == 5
+      self.project.members.each do |m|
+        if m.roles.first.to_s.include?("Manager") && m.user_id != self.author_id && m.user_id != self.assigned_to_id
+          self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+        end
+      end
+    end
   end
 
   # 更新缺陷
@@ -1009,7 +1016,7 @@ class Issue < ActiveRecord::Base
         if leaf.start_date
           # Only move subtask if it starts at the same date as the parent
           # or if it starts before the given date
-          if start_date == leaf.start_date || date > leaf.start_date 
+          if start_date == leaf.start_date || date > leaf.start_date
             leaf.reschedule_on!(date)
           end
         else

From 24dce81b316bd67ed7daaa80088a8995a5f0e449 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 9 Sep 2015 14:57:42 +0800
Subject: [PATCH 025/101] =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=94=A8=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/init_KindEditor.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index 36f6934a5..18e7182fb 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -1,18 +1,18 @@
 function init_editor(params){
-    var minHeight;  //最小高度
+   // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
 
     var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",
-        height:paramsHeight == undefined ? "30px":paramsHeight+"px",
-        minHeight:paramsHeight == undefined ? "30px":paramsHeight+"px",
+        height:"30px",// == undefined ? "30px":paramsHeight+"px",
+        minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
             items:['emoticons'],
         afterChange:function(){//按键事件
             nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
             var edit = this.edit;
             var body = edit.doc.body;
-            edit.iframe.height(minHeight);
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), minHeight));
+            edit.iframe.height(paramsHeight);
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), paramsHeight));
         },
         afterCreate:function(){
             var toolbar = $("div[class='ke-toolbar']",params.div_form);
@@ -26,9 +26,9 @@ function init_editor(params){
             //reset height
             var edit = this.edit;
             var body = edit.doc.body;
-            minHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
-            edit.iframe.height(minHeight);
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , minHeight));
+            paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
+            edit.iframe.height(paramsHeight);
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , paramsHeight));
 
         }
     }).loadPlugin('paste');

From b1463f08644ab8000b847515e9141d91bc4cf7bc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 9 Sep 2015 16:10:11 +0800
Subject: [PATCH 026/101] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E4=BD=9C=E4=B8=9A=E4=BD=9C=E5=93=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb   |   2 +-
 app/views/student_work/new.html.erb | 251 ++++++++--------------------
 public/javascripts/new_user.js      |  94 ++++++++++-
 public/stylesheets/new_user.css     |   9 +-
 4 files changed, 172 insertions(+), 184 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f4a70117f..4c78c03df 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2359,7 +2359,7 @@ module ApplicationHelper
         link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
       else
         if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "修改作品",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+          link_to "作品已交",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
         elsif homework.homework_type == 2 #编程作业不能修改作品
           link_to "作品已交",  student_work_index_path(:homework => homework.id),:class => 'c_blue',:title => "编程作业不可修改作品"
         else
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index f0f4d8e7c..703447756 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -1,8 +1,8 @@
+<!-- 此界面只用来新建匿评作业作品 -->
 <% content_for :header_tags do %>
    <%= javascript_include_tag 'homework','baiduTemplate' %>
 <% end %>
 
-<% if @homework.homework_type == 1 %>
 <script type="text/javascript">
   <%if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status != 1%>
     $(function(){
@@ -16,192 +16,85 @@
 //        alert("当前作业已开启匿评，您提交作品后将不会收到任何匿评作品，您的作品也不会被其他用户匿评，如需获得最终成绩，请您联系主讲老师对您的作品单独进行评分");
     });
   <% end%>
+
+  $(function(){
+      $('#student_work_description').autoResize({
+          // On resize:
+          onResize : function() {
+              $(this).css({opacity:0.8});
+          },
+          // After resize:
+          animateCallback : function() {
+              $(this).css({opacity:1});
+          },
+          // Quite slow animation:
+          animateDuration : 100,
+          // More extra space:
+          extraSpace : 0
+      });
+  });
 </script>
-    <div class="HomeWork" id="RSide">
-      <div class="RightBanner">
-        <div class="NewsBannerName">提交作品</div>
-      </div>
-      <div class="Newwork">
-        <div class="hwork_ctt">
-          <div class="hwork_dis" id="tbc_01">
-            <%= form_for(@student_work,
-                         :html => { :multipart => true },
-                         :url => {:controller => 'student_work',
-                                  :action => 'create',
-                                  :homework => @homework.id
-                         }) do |f|%>
-                <div class="N_con">
-                  <% if @homework.homework_type == 1%>
-                      <div class=" c_red mb10 ml90">
-                        提示：匿评作业提交的作品，作品名称和描述中不能出现真实的姓名信息
-                      </div>
-                  <% end%>
-                  <p>
-                    <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                    <%= f.text_field "name", :required => true, :size => 60, :class => "bo  fl", :maxlength => 200, :placeholder => "作品名称", :onkeyup => "regexStudentWorkName();" %>
-                    <% if @homework.homework_type != 2%>
-                        <a href="javascript:void(0)" class="fl ml10 mt3"  onclick=" $('#about_project').slideToggle();" >
-                          项目信息
-                          <img class="ml5 " src="../images/bid/pic_question.png" width="15" height="15"  Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
-                        </a>
-                    <% end%>
-                    <div class="cl"></div>
-                    <p id="student_work_name_span" class="c_red ml90 mb10"></p>
-                    </p>
-                    <div class="cl"></div>
-                    <p id="about_project" class="about_project" >
-                      <label class="fl">&nbsp;&nbsp;&nbsp;选择项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                      <%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "bo02 mb10"}  %>
-                    </p>
-                    <div class="cl"></div>
-                    <p>
-                      <label class="fl">
-                        <span class="c_red">*</span>&nbsp;
-                        <%= @homework.homework_type == 2 ? "提交代码" : "作品描述"%>
-                        &nbsp;&nbsp;&nbsp;：
-                      </label>
-                      <% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
-                          <%= f.text_area "description", :class => "w620 hwork_txt h400", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();", :value => @homework.homework_detail_programing.language == "1" ? c_stantard_code_student : c_stantard_code_student_%>
-                      <% else %>
-                          <%= f.text_area "description", :class => "w620 hwork_txt", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();"%>
-                      <% end%>
-                    <div class="cl"></div>
-                    <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
-                    </p>
-                    <div class="cl"></div>
-                    <% if @homework.homework_type != 2%>
-                        <p>
-                          <label class="fl">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                          <%= render :partial => 'attachments/new_form' %>
-                        </p>
-                        <div class="cl"></div>
-                    <% end%>
-                    <p class="ml80 ">
-                      <a href="javascript:void(0)" class="blue_btn fl c_white mt10" onclick="new_student_work();">提交作品</a>
-                      <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white mt10 ml10"%>
-                    <div class="cl"></div>
-                    </p>
-                    </div><!---创建作业内容结束-->
-            <% end%>
-          </div>
-        </div>
-      </div><!--新建作业结束-->
-      <div class="cl"></div>
-    </div>
 
-<% else %>
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">提交作品</div>
+</div>
+<div class="cl"></div>
 
+<div class="HomeWork" id="RSide">
 
-<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<script id="t:result-list" type="text/html">
-    <div class="ProResultTop">
-      <p class="c_blue fl">第<!=index!>次测试</p><span class="fr c_grey"><!= time !></span>
+  <div class="HomeWorkBox">
+    <div class="">
+      <div class="homepagePostTitle fl">
+        <%= @homework.name%>（作业名称）
+      </div>
+      <span class="fr c_grey">
+        截止时间：<%= @homework.end_time%>
+      </span>
       <div class="cl"></div>
-    </div>
-
-    <! if(status == -2){!>
-      <div class="ProResultCon "><!= error_msg !></div>
-    <!}else{!>
-      <div class="ProResultTable " >
-        <ul class="ProResultUl " >
-          <! for(var i =0; i <results.length; ++i){ !>
-            <li ><span class="w60 T_C">测试<!=i+1!></span>
-            <! if(results[i]["status"]!=0){ !>
-              <span class="w150 c_red">测试错误！</span>
-              <span class="w60">您的输出：</span>
-              <span class="W200"><!=results[i]["result"]!></span>
-              <span class="w60">正确输出：</span>
-              <span  class="W200"><!=results[i]["output"]!></span>
-              <div class="cl"></div>
-            </li>
-            <!}else{!>
-              <span class="w150 c_green">测试正确！</span>
-              <div class="cl"></div>
-            </li>
-            <!}!>
-          <!}!>
-       </ul>
+      <a href="javascript:void(0);" class="c_blue">
+        <%= link_to @homework.user.show_name, user_activities_path(@homework.user_id), :class => "c_blue"%>
+      </a>
+      <div class="cl"></div>
+      <div class="HomeWorkP">
+        <%= @homework.description.html_safe %>
       </div>
-    <! } !>
-
-</script>
-<!-- 模板1结束 -->
+    </div>
+  </div><!----HomeWorkBox end-->
+  <div class="cl"></div>
 
+  <div class="HomeWorkCon">
+    <%= form_for(@student_work,
+                 :html => { :multipart => true },
+                 :url => {:controller => 'student_work',
+                          :action => 'create',
+                          :homework => @homework.id
+                 }) do |f|%>
+        <div class=" c_red mb10">
+          提示：匿评作业提交的作品，作品名称和描述中不能出现真实的姓名信息
+        </div>
+        <div class="cl"></div>
 
-      <div class="HomeWork" id="RSide">
-        <div class="RightBanner">
-          <div class="NewsBannerName">提交作品</div>
+        <div class="mt15">
+          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请简洁的概括作品的功能或特性", :onkeyup => "regexStudentWorkName();" %>
+          <div class="cl"></div>
+          <p id="student_work_name_span" class="c_red ml90 mb10"></p>
+        </div>
+        <div class="mt10">
+          <%= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请介绍你的作品", :onkeyup => "regexStudentWorkDescription();"%>
+          <div class="cl"></div>
+          <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
         </div>
-        <div class="HomeWorkBox">
-          <div class="">
-              <div class="homepagePostTitle fl"><%= @homework.name %></div><span class="fr c_grey">截止时间：<%= @homework.end_time %></span>
-                <div class="cl"></div>
-                <a href="javascript:void(0);" class="c_blue"><%= @homework.user.show_name %></a>
-                <p class="HomeWorkP"><%= @homework.description %> <br />
-输入  2 1 1 4 4 2 3 6 5 <br />
-输出  15<br />
-                 </p>
-            </div>
-            <p class="c_grey mt15">注：迟交扣<span class="c_red">2</span>分，缺评一个作品扣<span class="c_red">2</span>分</p>
-        </div><!---HomeWorkBox end  -->
-        <div class="HomeWorkCon">
-        <%= form_for(@student_work,
-                   :html => { :multipart => true },
-                   :url => {:controller => 'student_work',
-                            :action => 'create',
-                            :student_work_id => @student_work.id,
-                            :homework => @homework.id
-                   },
-                   :method => :post) do |f|%>
 
-          <div class="mt15">
-            <span>请使用 <%= @homework.language_name %> 语言编写</span>
-            </div>
-          <div class="mt10">
-              <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>
-            </div>
-            <div class="mt10">
-            <%= f.text_area :description, id: 'program-src', class:"  W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
-            </div>
-            <div class="mt10">
-              <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>
-                <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
-                <div class="cl"></div>
-            </div>
-        <% end %>
-        </div><!----HomeWorkCon end-->
-      </div><!----HomeWork end-->
-      <div class="ProResult mt10">
-        <% @student_work.student_work_tests.each_with_index do |test, index| %>
-          <div class="ProResultTop">
-             <p class="c_blue fl">第<%= @student_work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
-               <div class="cl"></div>
-          </div>
-          <% if test.status.to_i == -2 %>
-            <div class="ProResultCon "><%= test.results.first %></div>
-          <% else %>
-            <div class="ProResultTable " >
-              <ul class="ProResultUl " >
-                <% test.results.each_with_index do |x, i| %>
-                  <li ><span class="w60 T_C">测试<%=i+1%></span>
-                  <% if x["status"].to_i != 0 %>
-                    <span class="w150 c_red">测试错误！</span>
-                    <span class="w60">您的输出：</span>
-                    <span class="W200"><%=x["result"]%></span>
-                    <span class="w60">正确输出：</span>
-                    <span  class="W200"><%=x["output"]%></span>
-                    <div class="cl"></div>
-                  </li>
-                  <% else %>
-                    <span class="w150 c_green">测试正确！</span>
-                    <div class="cl"></div>
-                  </li>
-                  <% end %>
-                <% end %>
-             </ul>
-            </div>
-          <% end %>
-        <% end %>
-      </div><!----ProResult end-->
+        <div id="homework_attachments">
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
+        </div>
 
-<% end %>
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="new_student_work();">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <%= link_to "取消",  user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
+        </div>
+        <div class="cl"></div>
+    <% end%>
+  </div><!----HomeWorkCon end-->
+</div>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index fdf739bd0..9ffbf8b93 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -177,4 +177,96 @@ function regexStudentWorkDescription()
         $("#student_work_description_textarea").text("");
         return true;
     }
-}
\ No newline at end of file
+}
+
+//textarea自适应高度
+(function($){
+
+    $.fn.autoResize = function(options) {
+
+        // Just some abstracted details,
+        // to make plugin users happy:
+        var settings = $.extend({
+            onResize : function(){},
+            animate : true,
+            animateDuration : 150,
+            animateCallback : function(){},
+            extraSpace : 20,
+            limit: 1000
+        }, options);
+
+        // Only textarea's auto-resize:
+        this.filter('textarea').each(function(){
+
+            // Get rid of scrollbars and disable WebKit resizing:
+            var textarea = $(this).css({resize:'none','overflow-y':'hidden'}),
+
+            // Cache original height, for use later:
+                origHeight = textarea.height(),
+
+            // Need clone of textarea, hidden off screen:
+                clone = (function(){
+
+                    // Properties which may effect space taken up by chracters:
+                    var props = ['height','width','lineHeight','textDecoration','letterSpacing'],
+                        propOb = {};
+
+                    // Create object of styles to apply:
+                    $.each(props, function(i, prop){
+                        propOb[prop] = textarea.css(prop);
+                    });
+
+                    // Clone the actual textarea removing unique properties
+                    // and insert before original textarea:
+                    return textarea.clone().removeAttr('id').removeAttr('name').css({
+                        position: 'absolute',
+                        top: 0,
+                        left: -9999
+                    }).css(propOb).attr('tabIndex','-1').insertBefore(textarea);
+
+                })(),
+                lastScrollTop = null,
+                updateSize = function() {
+
+                    // Prepare the clone:
+                    clone.height(0).val($(this).val()).scrollTop(10000);
+
+                    // Find the height of text:
+                    var scrollTop = Math.max(clone.scrollTop(), origHeight) + settings.extraSpace,
+                        toChange = $(this).add(clone);
+
+                    // Don't do anything if scrollTip hasen't changed:
+                    if (lastScrollTop === scrollTop) { return; }
+                    lastScrollTop = scrollTop;
+
+                    // Check for limit:
+                    if ( scrollTop >= settings.limit ) {
+                        $(this).css('overflow-y','hidden');
+                        return;
+                    }
+                    // Fire off callback:
+                    settings.onResize.call(this);
+
+                    // Either animate or directly apply height:
+                    settings.animate && textarea.css('display') === 'block' ?
+                        toChange.stop().animate({height:scrollTop}, settings.animateDuration, settings.animateCallback)
+                        : toChange.height(scrollTop);
+                };
+
+            // Bind namespaced handlers to appropriate events:
+            textarea
+                .unbind('.dynSiz')
+                .bind('keyup.dynSiz', updateSize)
+                .bind('keydown.dynSiz', updateSize)
+                .bind('change.dynSiz', updateSize);
+
+        });
+
+        // Chain:
+        return this;
+
+    };
+
+
+
+})(jQuery);
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index df6d4d632..780fb72b7 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -895,6 +895,8 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .HomeWorkBox{ background:#f6f6f6; padding:10px; margin:10px 0;}
 .c_grey{ color:#888888;}
 .HomeWorkP{ width:690px; font-size:14px;}
+.HomeWorkP p{background-color: transparent !important;}
+.HomeWorkP div{background-color: transparent !important;}
 .H150{ height:150px;}
 .ProResult{width:748px; background-color:#fff;  border:1px solid #dddddd;border-bottom:none; }
 .ProResultTop{ height:38px; line-height:38px; border-bottom:1px solid #dddddd; background:#f2f2f2; padding:0 10px;}
@@ -903,10 +905,11 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .W200{ width:200px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
-.SearchIcon{background:url(../images/homepage_icon.png) 676px -393px no-repeat; }
-.SearchIcon:hover{background:url(../images/homepage_icon.png) 676px -419px no-repeat; }
+.SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; }
+.SearchIcon:hover{background:url(../images/homepage_icon2.png) 676px -419px no-repeat; }
 a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
 a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}
@@ -1001,7 +1004,7 @@ blockquote {
 }
 
 /* 创建作品 work */
-.Newwork{ width:668px; height:418px;}
+.Newwork{ width:668px;}
 .N_top{ float:right; margin-left:390px; }
 .N_con{ color:#484747; font-weight:bold; width:660px; margin-top:10px; }
 .N_con p{ }

From 401b0bc7e3911c5bb2da5eadddff92b7504b6a3a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 9 Sep 2015 16:50:46 +0800
Subject: [PATCH 027/101] =?UTF-8?q?textarea=E8=87=AA=E5=8A=A8=E6=8B=89?=
 =?UTF-8?q?=E4=BC=B8=E9=AB=98=E5=BA=A6=E4=BC=98=E5=8C=96=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/edit.html.erb | 106 +++++++++---------
 app/views/student_work/new.html.erb  |  31 ++----
 public/javascripts/new_user.js       | 157 ++++++++++++---------------
 3 files changed, 134 insertions(+), 160 deletions(-)

diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index 5bb362b46..deb6a1201 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -1,54 +1,62 @@
-<div class="HomeWork" id="RSide">
-  <div class="RightBanner">
-    <div class="NewsBannerName">编辑作品</div>
-  </div>
-  <div class="Newwork">
-    <div class="hwork_ctt">
-      <div class="hwork_dis" id="tbc_01">
-        <%= labelled_form_for @work,:html => { :multipart => true }  do |f|%>
-            <div class="N_con">
-              <p>
-                <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <input type="text" name="student_work[name]" id="student_work_name" class="bo  fl" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
-                <a href="javascript:void(0)" class="fl ml10 mt3"  onclick="show_project();" >项目信息
-                  <img class="ml5 " src="/images/bid/pic_question.png" width="15" height="15"  Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
-                </a>
-              <div class="cl"></div>
-              <p id="student_work_name_span" class="c_red ml90 mb10"></p>
-              </p>
-              <div class="cl"></div>
-
-              <p id="about_project" class="about_project" style="<%= @work.project.nil? ? '' : 'display:block;'%>">
-                <label class="fl">&nbsp;&nbsp;&nbsp;关联项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <%= f.select :project,options_for_select(user_projects_option,@work.project_id), {},{:class => "bo02 mb10"}  %>
-              </p>
-              <div class="cl"></div>
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">编辑作品</div>
+</div>
+<div class="cl"></div>
 
-              <p>
-                <label class="fl">
-                  <span class="c_red">*</span>
-                  &nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：
-                </label>
-                <textarea  name="student_work[description]" placeholder="最多3000个汉字(或6000个英文字符)" id="student_work_description"  class="w620 hwork_txt"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
-              <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
-              </p>
-              <div class="cl"></div>
-              <p>
-                <label class="fl">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <%= render :partial => 'attachments/new_form',:locals => {:container => @work} %>
-              </p>
-              <div class="cl"></div>
-              <p class="ml80 ">
-                <a href="javascript:void(0)" class="blue_btn fl c_white mt10" onclick="edit_student_work(<%= @work.id%>);">提交作品</a>
-                <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white mt10 ml10"%>
-              <div class="cl"></div>
-              </p>
-            </div><!---创建作业内容结束-->
-        <% end%>
+<div class="HomeWork" id="RSide">
 
+  <div class="HomeWorkBox">
+    <div class="">
+      <div class="homepagePostTitle fl">
+        <%= @homework.name%>（作业名称）
+      </div>
+      <span class="fr c_grey">
+        截止时间：<%= @homework.end_time%>
+      </span>
+      <div class="cl"></div>
+      <a href="javascript:void(0);" class="c_blue">
+        <%= link_to @homework.user.show_name, user_activities_path(@homework.user_id), :class => "c_blue"%>
+      </a>
+      <div class="cl"></div>
+      <div class="HomeWorkP">
+        <%= @homework.description.html_safe %>
       </div>
     </div>
-  </div>
-</div><!--新建作业结束-->
-<div class="cl"></div>
+  </div><!----HomeWorkBox end-->
+  <div class="cl"></div>
+
+  <div class="HomeWorkCon mt15">
+    <%= labelled_form_for @work,:html => { :multipart => true }   do |f|%>
+        <div class=" c_red mb10">
+          提示：作品名称和描述中不要出现真实的姓名信息
+        </div>
+        <div class="cl"></div>
+
+        <div>
+          <input type="text" name="student_work[name]" id="student_work_name" placeholder="请简洁的概括作品的功能或特性" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
+          <div class="cl"></div>
+          <p id="student_work_name_span" class="c_red mb10"></p>
+        </div>
+        <div class="mt10">
+          <textarea  name="student_work[description]" id="student_work_description" placeholder="请介绍你的作品"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
+          <script>
+              var text = document.getElementById("student_work_description");
+              autoTextarea(text);// 调用
+          </script>
+          <div class="cl"></div>
+          <p id="student_work_description_textarea" class="c_red mb10"></p>
+        </div>
+
+        <div id="homework_attachments">
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false} %>
+        </div>
+
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="edit_student_work(<%= @work.id%>);">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <%= link_to "取消",  student_work_index_path(:homework => @homework), :class => "fr mr10 mt3"%>
+        </div>
+        <div class="cl"></div>
+    <% end%>
+  </div><!----HomeWorkCon end-->
 </div>
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 703447756..1f9f547a0 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -16,23 +16,6 @@
 //        alert("当前作业已开启匿评，您提交作品后将不会收到任何匿评作品，您的作品也不会被其他用户匿评，如需获得最终成绩，请您联系主讲老师对您的作品单独进行评分");
     });
   <% end%>
-
-  $(function(){
-      $('#student_work_description').autoResize({
-          // On resize:
-          onResize : function() {
-              $(this).css({opacity:0.8});
-          },
-          // After resize:
-          animateCallback : function() {
-              $(this).css({opacity:1});
-          },
-          // Quite slow animation:
-          animateDuration : 100,
-          // More extra space:
-          extraSpace : 0
-      });
-  });
 </script>
 
 <div class="homepageRightBanner mb10">
@@ -62,7 +45,7 @@
   </div><!----HomeWorkBox end-->
   <div class="cl"></div>
 
-  <div class="HomeWorkCon">
+  <div class="HomeWorkCon mt15">
     <%= form_for(@student_work,
                  :html => { :multipart => true },
                  :url => {:controller => 'student_work',
@@ -70,19 +53,23 @@
                           :homework => @homework.id
                  }) do |f|%>
         <div class=" c_red mb10">
-          提示：匿评作业提交的作品，作品名称和描述中不能出现真实的姓名信息
+          提示：作品名称和描述中不要出现真实的姓名信息
         </div>
         <div class="cl"></div>
 
-        <div class="mt15">
+        <div>
           <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请简洁的概括作品的功能或特性", :onkeyup => "regexStudentWorkName();" %>
           <div class="cl"></div>
-          <p id="student_work_name_span" class="c_red ml90 mb10"></p>
+          <p id="student_work_name_span" class="c_red mb10"></p>
         </div>
         <div class="mt10">
           <%= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请介绍你的作品", :onkeyup => "regexStudentWorkDescription();"%>
+          <script>
+              var text = document.getElementById("student_work_description");
+              autoTextarea(text);// 调用
+          </script>
           <div class="cl"></div>
-          <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
+          <p id="student_work_description_textarea" class="c_red mb10"></p>
         </div>
 
         <div id="homework_attachments">
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 9ffbf8b93..8362217a7 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -179,94 +179,73 @@ function regexStudentWorkDescription()
     }
 }
 
-//textarea自适应高度
-(function($){
-
-    $.fn.autoResize = function(options) {
-
-        // Just some abstracted details,
-        // to make plugin users happy:
-        var settings = $.extend({
-            onResize : function(){},
-            animate : true,
-            animateDuration : 150,
-            animateCallback : function(){},
-            extraSpace : 20,
-            limit: 1000
-        }, options);
-
-        // Only textarea's auto-resize:
-        this.filter('textarea').each(function(){
-
-            // Get rid of scrollbars and disable WebKit resizing:
-            var textarea = $(this).css({resize:'none','overflow-y':'hidden'}),
-
-            // Cache original height, for use later:
-                origHeight = textarea.height(),
-
-            // Need clone of textarea, hidden off screen:
-                clone = (function(){
-
-                    // Properties which may effect space taken up by chracters:
-                    var props = ['height','width','lineHeight','textDecoration','letterSpacing'],
-                        propOb = {};
-
-                    // Create object of styles to apply:
-                    $.each(props, function(i, prop){
-                        propOb[prop] = textarea.css(prop);
-                    });
-
-                    // Clone the actual textarea removing unique properties
-                    // and insert before original textarea:
-                    return textarea.clone().removeAttr('id').removeAttr('name').css({
-                        position: 'absolute',
-                        top: 0,
-                        left: -9999
-                    }).css(propOb).attr('tabIndex','-1').insertBefore(textarea);
-
-                })(),
-                lastScrollTop = null,
-                updateSize = function() {
-
-                    // Prepare the clone:
-                    clone.height(0).val($(this).val()).scrollTop(10000);
-
-                    // Find the height of text:
-                    var scrollTop = Math.max(clone.scrollTop(), origHeight) + settings.extraSpace,
-                        toChange = $(this).add(clone);
-
-                    // Don't do anything if scrollTip hasen't changed:
-                    if (lastScrollTop === scrollTop) { return; }
-                    lastScrollTop = scrollTop;
-
-                    // Check for limit:
-                    if ( scrollTop >= settings.limit ) {
-                        $(this).css('overflow-y','hidden');
-                        return;
-                    }
-                    // Fire off callback:
-                    settings.onResize.call(this);
-
-                    // Either animate or directly apply height:
-                    settings.animate && textarea.css('display') === 'block' ?
-                        toChange.stop().animate({height:scrollTop}, settings.animateDuration, settings.animateCallback)
-                        : toChange.height(scrollTop);
-                };
-
-            // Bind namespaced handlers to appropriate events:
-            textarea
-                .unbind('.dynSiz')
-                .bind('keyup.dynSiz', updateSize)
-                .bind('keydown.dynSiz', updateSize)
-                .bind('change.dynSiz', updateSize);
-
-        });
-
-        // Chain:
-        return this;
-
+//textarea自适应高度 纯js写的 有浏览器判断
+/**
+ * 文本框根据输入内容自适应高度
+ * @param                {HTMLElement}        输入框元素
+ * @param                {Number}                设置光标与输入框保持的距离(默认0)
+ * @param                {Number}                设置最大高度(可选)
+ */
+var autoTextarea = function (elem, extra, maxHeight) {
+    extra = extra || 0;
+    var isFirefox = !!document.getBoxObjectFor || 'mozInnerScreenX' in window,
+        isOpera = !!window.opera && !!window.opera.toString().indexOf('Opera'),
+        addEvent = function (type, callback) {
+            elem.addEventListener ?
+                elem.addEventListener(type, callback, false) :
+                elem.attachEvent('on' + type, callback);
+        },
+        getStyle = elem.currentStyle ? function (name) {
+            var val = elem.currentStyle[name];
+
+            if (name === 'height' && val.search(/px/i) !== 1) {
+                var rect = elem.getBoundingClientRect();
+                return rect.bottom - rect.top -
+                    parseFloat(getStyle('paddingTop')) -
+                    parseFloat(getStyle('paddingBottom')) + 'px';
+            };
+
+            return val;
+        } : function (name) {
+            return getComputedStyle(elem, null)[name];
+        },
+        minHeight = parseFloat(getStyle('height'));
+
+
+    elem.style.resize = 'none';
+
+    var change = function () {
+        var scrollTop, height,
+            padding = 0,
+            style = elem.style;
+
+        if (elem._length === elem.value.length) return;
+        elem._length = elem.value.length;
+
+        if (!isFirefox && !isOpera) {
+            padding = parseInt(getStyle('paddingTop')) + parseInt(getStyle('paddingBottom'));
+        };
+        scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+
+        elem.style.height = minHeight + 'px';
+        if (elem.scrollHeight > minHeight) {
+            if (maxHeight && elem.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+            } else {
+                height = elem.scrollHeight - padding;
+                style.overflowY = 'hidden';
+            };
+            style.height = height + extra + 'px';
+            scrollTop += parseInt(style.height) - elem.currHeight;
+            document.body.scrollTop = scrollTop;
+            document.documentElement.scrollTop = scrollTop;
+            elem.currHeight = parseInt(style.height);
+        };
     };
 
-
-
-})(jQuery);
\ No newline at end of file
+    addEvent('propertychange', change);
+    addEvent('input', change);
+    addEvent('focus', change);
+    change();
+};
\ No newline at end of file

From adcd3b1ad56f030834a45da82c255fd60c735d17 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 9 Sep 2015 16:54:08 +0800
Subject: [PATCH 028/101] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=9A=84js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/new.html.erb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 1f9f547a0..8f36d3dd5 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -1,8 +1,4 @@
 <!-- 此界面只用来新建匿评作业作品 -->
-<% content_for :header_tags do %>
-   <%= javascript_include_tag 'homework','baiduTemplate' %>
-<% end %>
-
 <script type="text/javascript">
   <%if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status != 1%>
     $(function(){

From 1bf90739be291a71cb6691056bb6231f9f805e90 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 9 Sep 2015 17:00:11 +0800
Subject: [PATCH 029/101] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=8E=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=BA=93=E9=80=89=E6=8B=A9=E8=B5=84=E6=BA=90=E5=88=B0?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E3=80=81=E4=BD=9C=E5=93=81=E4=B8=AD=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E5=88=9D=E5=A7=8B=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_import_resource.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb
index dc3682d30..32a2cd697 100644
--- a/app/views/users/user_import_resource.js.erb
+++ b/app/views/users/user_import_resource.js.erb
@@ -4,5 +4,5 @@ $('#ajax-modal').css('height','500px').css("width","730px");
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" +
 "<a href='javascript:void(0)' class='resourceClose' onclick='hideModal();'></a></div>");
-$('#ajax-modal').parent().css("top","").css("left","").css("position","fixed").css("padding-left","16px").css("padding-bottom","16px").css("padding-right","16px");
+$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed").css("padding-left","16px").css("padding-bottom","16px").css("padding-right","16px");
 $('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");
\ No newline at end of file

From 66251c8d30b70f2cff928a19ed2420271f531053 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Sep 2015 17:05:32 +0800
Subject: [PATCH 030/101] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=9A=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascripts/system_messages.js.coffee     |  3 +
 .../stylesheets/system_messages.css.scss      |  3 +
 app/controllers/admin_controller.rb           |  5 ++
 app/controllers/system_messages_controller.rb | 83 +++++++++++++++++++
 app/helpers/system_messages_helper.rb         |  2 +
 app/models/system_message.rb                  |  4 +
 app/models/user.rb                            |  1 +
 app/views/admin/messages.html.erb             | 14 ++++
 app/views/system_messages/index.html.erb      |  3 +
 config/locales/admins/en.yml                  |  2 +
 config/locales/admins/zh.yml                  |  2 +
 config/locales/zh.yml                         |  2 +
 config/routes.rb                              | 11 +++
 .../20150909062619_create_system_messages.rb  | 11 +++
 db/schema.rb                                  |  9 +-
 lib/redmine.rb                                |  1 +
 .../system_messages_controller_spec.rb        |  5 ++
 spec/factories/system_messages.rb             |  8 ++
 spec/models/system_message_spec.rb            |  5 ++
 19 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/system_messages.js.coffee
 create mode 100644 app/assets/stylesheets/system_messages.css.scss
 create mode 100644 app/controllers/system_messages_controller.rb
 create mode 100644 app/helpers/system_messages_helper.rb
 create mode 100644 app/models/system_message.rb
 create mode 100644 app/views/admin/messages.html.erb
 create mode 100644 app/views/system_messages/index.html.erb
 create mode 100644 db/migrate/20150909062619_create_system_messages.rb
 create mode 100644 spec/controllers/system_messages_controller_spec.rb
 create mode 100644 spec/factories/system_messages.rb
 create mode 100644 spec/models/system_message_spec.rb

diff --git a/app/assets/javascripts/system_messages.js.coffee b/app/assets/javascripts/system_messages.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/system_messages.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/system_messages.css.scss b/app/assets/stylesheets/system_messages.css.scss
new file mode 100644
index 000000000..a9947d45a
--- /dev/null
+++ b/app/assets/stylesheets/system_messages.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the SystemMessages controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 1624008f2..5666934b6 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -79,6 +79,11 @@ class AdminController < ApplicationController
     end
   end
 
+  # 系统消息
+  def messages
+    @admin_messages = SystemMessage.new
+  end
+
   def plugins
     @plugins = Redmine::Plugin.all
   end
diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb
new file mode 100644
index 000000000..21b9ae9b8
--- /dev/null
+++ b/app/controllers/system_messages_controller.rb
@@ -0,0 +1,83 @@
+class SystemMessagesController < ApplicationController
+  # before_filter :message_author, :only => [:show]
+  #
+  # def message_author
+  #   if(!User.current.logged? && !token.nil?)
+  #
+  #     User.current =try_to_autologin1
+  #   end
+  #   if @system_messages
+  #     render_403 :message => :notice_not_authorized_message
+  #   else
+  #     deny_access
+  #   end
+  # end
+
+  def index
+    @system_messages = SystemMessage.all
+  end
+
+  # def show
+  #   @system_messages = SystemMessage.find(params[:id])
+  # end
+
+  # GET /products/new
+  # def new
+  #   @product = Product.new
+  # end
+
+  # GET /products/1/edit
+  # def edit
+  # end
+
+  # POST /products
+  # POST /products.json
+  def create
+    @system_messages = SystemMessage.new
+    @system_messages.content = params[:system_message][:content]
+    @system_messages.user_id = User.current.id
+    respond_to do |format|
+      if @system_messages.save
+        format.html {redirect_to system_messages_url(@project)}
+        flash[:notice] = l(:notice_successful_message)
+      end
+    end
+  end
+
+  # PATCH/PUT /products/1
+  # PATCH/PUT /products/1.json
+  # def update
+  #   respond_to do |format|
+  #     if @product.update(product_params)
+  #       format.html { redirect_to @product, notice: 'Product was successfully updated.' }
+  #       format.json { render :show, status: :ok, location: @product }
+  #     else
+  #       format.html { render :edit }
+  #       format.json { render json: @product.errors, status: :unprocessable_entity }
+  #     end
+  #   end
+  # end
+
+  # DELETE /products/1
+  # DELETE /products/1.json
+  # def destroy
+  #   @system_messages.destroy
+  #   respond_to do |format|
+  #     format.html { redirect_to products_url, notice: 'Product was successfully destroyed.' }
+  #     format.json { head :no_content }
+  #   end
+  # end
+
+  # private
+  # # Use callbacks to share common setup or constraints between actions.
+  # def set_product
+  #   @product = Product.find(params[:id])
+  # end
+  #
+  # # Never trust parameters from the scary internet, only allow the white list through.
+  # def message_params
+  #   params.require(:admin_system_messages).permit(:content)
+  # end
+
+
+end
diff --git a/app/helpers/system_messages_helper.rb b/app/helpers/system_messages_helper.rb
new file mode 100644
index 000000000..fef238676
--- /dev/null
+++ b/app/helpers/system_messages_helper.rb
@@ -0,0 +1,2 @@
+module SystemMessagesHelper
+end
diff --git a/app/models/system_message.rb b/app/models/system_message.rb
new file mode 100644
index 000000000..4802ba252
--- /dev/null
+++ b/app/models/system_message.rb
@@ -0,0 +1,4 @@
+class SystemMessage < ActiveRecord::Base
+  attr_accessible :content, :id, :user_id
+  belongs_to :user
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 2ccc41783..8b5951687 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -133,6 +133,7 @@ class User < Principal
   has_many :memo_messages
   has_many :user_feedback_messages
   has_one :onclick_time
+  has_many :system_messages
 
 # 虚拟转换
   has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
new file mode 100644
index 000000000..9d312c7e7
--- /dev/null
+++ b/app/views/admin/messages.html.erb
@@ -0,0 +1,14 @@
+<h3 style="float: left">
+  <%=l(:label_system_message)%>
+</h3><br/>
+<div style="padding-top: 20px; padding-left: 5px;">
+  <%= form_for(@admin_messages) do |f| %>
+      <div class="field">
+        <%= f.text_area :content %>
+      </div>
+      <div class="actions">
+        <%= f.submit l(:label_submit),:class => "small"  %>
+      </div>
+  <% end %>
+</div>
+
diff --git a/app/views/system_messages/index.html.erb b/app/views/system_messages/index.html.erb
new file mode 100644
index 000000000..4ed40757b
--- /dev/null
+++ b/app/views/system_messages/index.html.erb
@@ -0,0 +1,3 @@
+<% @system_messages.each do |sm| %>
+    <ul><li><%= sm.content %></li></ul>
+<% end %>
diff --git a/config/locales/admins/en.yml b/config/locales/admins/en.yml
index 479d2f0f0..ed23107cb 100644
--- a/config/locales/admins/en.yml
+++ b/config/locales/admins/en.yml
@@ -11,3 +11,5 @@ en:
   label_registration_activation_by_email: account activation by email
   label_registration_manual_activation: manual account activation
   label_registration_automatic_activation: automatic account activation
+
+  label_system_message: system messages
diff --git a/config/locales/admins/zh.yml b/config/locales/admins/zh.yml
index 936b3109f..49abcfc8d 100644
--- a/config/locales/admins/zh.yml
+++ b/config/locales/admins/zh.yml
@@ -14,3 +14,5 @@ zh:
   label_registration_manual_activation: 手动激活帐号
   label_registration_automatic_activation: 自动激活帐号
 
+  label_system_message: 系统消息
+
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 4a6ddce4e..d2fa502b9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -36,6 +36,7 @@ zh:
   notice_create_failed: 创建失败，请先完善个人信息
   notice_failed_create: 创建失败
   notice_successful_update: 更新成功
+  notice_successful_message: 消息创建成功！
   notice_successful_edit: 修改成功
   notice_failed_edit: 修改失败
   notice_successful_delete: 删除成功
@@ -49,6 +50,7 @@ zh:
   notice_not_contest_setting_authorized: 对不起，您无权配置此竞赛。
   notice_not_contest_delete_authorized: 对不起，您无权删除此竞赛。
   notice_not_authorized_archived_project: 要访问的项目已经归档。
+  notice_not_authorized_message: 您访问的消息不存在！
   notice_email_sent: "邮件已发送至 %{value}"
   notice_email_error: "发送邮件时发生错误 (%{value})"
   notice_feeds_access_key_reseted: 您的RSS存取键已被重置。
diff --git a/config/routes.rb b/config/routes.rb
index 8454a1c47..2a0e1a492 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -260,6 +260,16 @@ RedmineApp::Application.routes.draw do
   match '/users/search', :via => [:get, :post]
   #end
 
+  # 消息相关路由
+  resources :system_messages do
+    collection do
+      post 'create', :as => 'system_messages'
+      get 'index', :as => 'index'
+      get 'show', :as => 'show'
+    end
+  end
+  # match 'system_messages/index', to: 'system_messages#index', :via => :get, :as => 'system_messages'
+
   match 'account/heartbeat', to: 'account#heartbeat', :via => :get
   match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
   match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
@@ -702,6 +712,7 @@ RedmineApp::Application.routes.draw do
   match 'admin/projects',  :via => :get
   get 'admin/courses'
   match 'admin/users',  :via => :get
+  match 'admin/messages',  :via => :get
   match 'admin/first_page_made', as: :first_page_made
   match 'admin/course_page_made', as: :course_page_made
   match 'admin/contest_page_made', as: :contest_page_made
diff --git a/db/migrate/20150909062619_create_system_messages.rb b/db/migrate/20150909062619_create_system_messages.rb
new file mode 100644
index 000000000..a51715ead
--- /dev/null
+++ b/db/migrate/20150909062619_create_system_messages.rb
@@ -0,0 +1,11 @@
+class CreateSystemMessages < ActiveRecord::Migration
+  def change
+    create_table :system_messages do |t|
+      t.integer :id
+      t.integer :user_id
+      t.string :content
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e44bdd1d9..71d521453 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 => 20150906083453) do
+ActiveRecord::Schema.define(:version => 20150909062619) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1357,6 +1357,13 @@ ActiveRecord::Schema.define(:version => 20150906083453) do
   add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
   add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
 
+  create_table "system_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "content"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 99b7ea22f..8ebdacfa6 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -369,6 +369,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
   menu.push :courses, {:controller => 'admin', :action => 'courses'}, :caption => :label_course_all
   menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural
+  menu.push :messages, {:controller => 'admin', :action => 'messages'}, :caption => :label_system_message
   menu.push :schools, {:controller => 'admin', :action => 'schools'}, :caption => :label_school_plural
   menu.push :first_page_made, {:controller => 'admin',:action => 'first_page_made'},:caption => :label_first_page_made
   menu.push :mobile_version, {:controller => 'admin',:action => 'mobile_version'},:caption => :label_mobile_version
diff --git a/spec/controllers/system_messages_controller_spec.rb b/spec/controllers/system_messages_controller_spec.rb
new file mode 100644
index 000000000..c65f5b5e0
--- /dev/null
+++ b/spec/controllers/system_messages_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SystemMessagesController, :type => :controller do
+
+end
diff --git a/spec/factories/system_messages.rb b/spec/factories/system_messages.rb
new file mode 100644
index 000000000..7bcc27422
--- /dev/null
+++ b/spec/factories/system_messages.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :system_message do
+    id 1
+user_id 1
+content "MyString"
+  end
+
+end
diff --git a/spec/models/system_message_spec.rb b/spec/models/system_message_spec.rb
new file mode 100644
index 000000000..fd8df4e92
--- /dev/null
+++ b/spec/models/system_message_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SystemMessage, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 763939f176f4b91ab609b124753c53579eaeb120 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 9 Sep 2015 17:12:02 +0800
Subject: [PATCH 031/101] =?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8D=E7=94=A8=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kindeditor/plugins/code/prettify.css      | 13 ---------
 .../kindeditor/plugins/code/prettify.js       | 28 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 public/assets/kindeditor/plugins/code/prettify.css
 delete mode 100644 public/assets/kindeditor/plugins/code/prettify.js

diff --git a/public/assets/kindeditor/plugins/code/prettify.css b/public/assets/kindeditor/plugins/code/prettify.css
deleted file mode 100644
index b8287e5f6..000000000
--- a/public/assets/kindeditor/plugins/code/prettify.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
-
-pre.prettyprint {
-	border: 0;
-	border-left: 3px solid rgb(204, 204, 204);
-	margin-left: 2em;
-	padding: 0.5em;
-	font-size: 110%;
-	display: block;
-	font-family: "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
-	margin: 1em 0px;
-	white-space: pre;
-}
diff --git a/public/assets/kindeditor/plugins/code/prettify.js b/public/assets/kindeditor/plugins/code/prettify.js
deleted file mode 100644
index eef5ad7e6..000000000
--- a/public/assets/kindeditor/plugins/code/prettify.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
-(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
-[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
-f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
-(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
-{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
-t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
-"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
-l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
-q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
-q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
-"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
-a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
-for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
-m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
-a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
-j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
-"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
-H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
-J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
-I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
-["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
-/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
-["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
-hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
-!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
-250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
-PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();

From 1feb7022c7465b3abb3ad765d6f6bd997efde7f4 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 9 Sep 2015 17:42:38 +0800
Subject: [PATCH 032/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=BAkindeditor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/messages.html.erb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 9d312c7e7..10f20e2a0 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -1,13 +1,18 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <h3 style="float: left">
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
   <%= form_for(@admin_messages) do |f| %>
       <div class="field">
-        <%= f.text_area :content %>
+        <%= f.kindeditor :content, :edit_id => 'system_message',
+                         :width => '87%',
+                         :resizeType => '0',
+                         :no_label => true
+        %>
       </div>
       <div class="actions">
-        <%= f.submit l(:label_submit),:class => "small"  %>
+        <%= f.submit l(:label_submit),:class => "small", :onclick => "system_message.sync;" %>
       </div>
   <% end %>
 </div>

From 0aa8c5b5ccbbb0d7338b1bd761e07f1222aba5fb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Sep 2015 17:43:33 +0800
Subject: [PATCH 033/101] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/system_messages_controller.rb |  4 ++++
 app/controllers/users_controller.rb           |  2 ++
 app/views/users/user_messages.html.erb        | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb
index 21b9ae9b8..588e13c5e 100644
--- a/app/controllers/system_messages_controller.rb
+++ b/app/controllers/system_messages_controller.rb
@@ -33,6 +33,10 @@ class SystemMessagesController < ApplicationController
   # POST /products
   # POST /products.json
   def create
+    unless User.current.admin?
+      render_403
+      return
+    end
     @system_messages = SystemMessage.new
     @system_messages.content = params[:system_message][:content]
     @system_messages.user_id = User.current.id
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5680a333e..23106c954 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -114,8 +114,10 @@ class UsersController < ApplicationController
       message_new_time.save
     else
       message_new_time = OnclickTime.where("user_id =?", User.current).first
+      message_last_time = message_new_time.onclick_time
       message_new_time.update_attributes(:onclick_time => Time.now)
     end
+    @user_system_messages = SystemMessage.where("created_at >?", message_last_time)
     # 当前用户查看消息，则设置消息为已读
     if params[:viewed] == "all"
       course_querys = @user.course_messages
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index a37ce30ff..e36fd4f32 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -39,6 +39,18 @@
           <% end %>
         </div>
     <% end %>
+    <%# 系统消息 %>
+    <% @user_system_messages.each do |usm| %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);">ddddddddddddddd</a></li>
+          <li class="homepageNewsPubType fl">Trustiep平台<span class="homepageNewsType fl">发布新消息：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to usm.content, {:controller => 'system_messages', :action => 'index'},
+                        :class =>"newsGrey",
+                        :title => "#{usm.content.html_safe}" %></li>
+          <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
     <%# 课程消息 %>
     <% unless @message_alls.nil? %>
         <% @message_alls.each do |ma| %>

From 6ed0a151dc8c7e4d8e9ade34060b55dee71e464e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 9 Sep 2015 17:45:39 +0800
Subject: [PATCH 034/101] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 13 ++++++++-----
 public/stylesheets/header.css              | 13 +++++++++----
 public/stylesheets/new_user.css            | 14 +++++++-------
 public/stylesheets/public.css              |  2 +-
 public/stylesheets/public_new.css          |  9 +++++----
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 7b6b753ff..941f8b8e3 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -78,11 +78,11 @@
     </div>
   </div>
 
-  <div class="navHomepageProfile">
+  <div class="navHomepageProfile" id="navHomepageProfile">
     <ul>
-      <li class="homepageProfileMenuIcon">
+      <li class="homepageProfileMenuIcon" id="homepageProfileMenuIcon">
         <%= link_to "<div class='mt5 mb8' id='user_avatar'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
-        <ul class="topnav_login_list" id="topnav_login_list">
+        <ul class="topnav_login_list none" id="topnav_login_list">
           <li>
             <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
           </li>
@@ -110,9 +110,12 @@
         $("#navHomepageSearchType").hide();
     });
 
-    $("#user_avatar").mouseover(function(){
+    $("#user_avatar img").mouseenter(function(){
+        $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
         $("#topnav_login_list").show();
-    }).mouseout(function(){
+    });
+    $("#navHomepageProfile").mouseleave(function(){
+        $("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
         $("#topnav_login_list").hide();
     });
 
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 7f0ca8011..192a4a262 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -16,8 +16,10 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
 .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
 .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;}
-.homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
+.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
+/*.navHomepageProfile ul li ul {display:none;}
+.navHomepageProfile ul li:hover ul {display:block;}*/
 .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
 .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
 .homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
@@ -29,6 +31,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
 .homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;}
 .homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
+.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
 .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
 .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
 .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
@@ -75,6 +78,7 @@ a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
 #navSearchAlert {display:none;}
+.none{display: none;}
 
 /*myctrip*/
 .userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
@@ -88,9 +92,10 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
 a.topnav_login_box:hover {color:#a1ebff;}
 .navRow1 {margin:0; padding:0;}
 .navRow2 {margin:0; padding:0;}
-.topnav_login_list{diaplay:none; border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -5px;}
-.topnav_login_list a{color:#15bccf;}
+.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;}
+.topnav_login_list a{color:#269ac9;}
 .topnav_login_list li{ }
+.portraitRadius {border-radius: 3px;}
 
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 95f8e1d7d..d4797f9f9 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -261,7 +261,7 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
 a.topnav_login_box:hover {color:#a1ebff;}
 .navRow1 {margin:0; padding:0;}
 .navRow2 {margin:0; padding:0;}
-.topnav_login_list{display: none; border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;}
+.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;}
 .topnav_login_list a{color:#269ac9;}
 .topnav_login_list li{ }
 
@@ -296,7 +296,7 @@ a:hover.search_btn{ background: #0fa9bb;}
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#269ac9;}
 .resourcesBanner ul li:hover ul.resourcesType {display:block;}
-ul li:hover ul {display:block;}
+.resourcesSelected:hover ul {display:block;}
 .resourcesUploadBox {float:right; width:103px; height:34px; background-color:#269ac9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
 .resourcesUploadBox:hover {background-color:#297fb8;}
 .uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
@@ -460,8 +460,10 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
 .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
 .portraitRadius {border-radius: 3px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;}
-.homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
+.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
+/*.navHomepageProfile ul li ul {display:none;}
+.navHomepageProfile ul li:hover ul {display:block;}*/
 .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
 .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
 .homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;}
@@ -606,7 +608,7 @@ a:hover.gz_btn{ color:#ff5722;}
 .loginContent {width:1000px; margin:0px auto;}
 .loginLeft {width:595px; float:left;}
 .loginLogo {padding-left:208px; padding-top:155px;}
-.loginInro {width:465px; padding-top:66px; padding-left:50px; font-size:16px; color:#ffffff; text-indent: 2em;}
+.loginInro {width:465px; padding-top:55px; padding-left:50px; font-size:16px; color:#ffffff;}
 .loginRight {width:405px; float:left;}
 .loginChooseBox {width:405px; height:54px; background-color:#ffffff; padding-top:18px;}
 .loginChooseList {width:350px; height:30px; font-size:14px; margin:0px auto;}
@@ -671,8 +673,6 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 /*20150826协议 LB*/
 .AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
 .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
-.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
-.AgreementImg{margin: 0px auto; width: 820px;}
 
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index aa2655d10..5ff90bb43 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -482,7 +482,7 @@ img,embed{max-width: 100%;}
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
 .resourcesBanner ul li:hover ul.resourcesType {display:block;}
-ul li:hover ul {display:block;}
+.resourcesSelected:hover ul {display:block;}
 .resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
 .uploadIcon {background:url(../images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
 a.uploadText {color:#ffffff; font-size:14px;}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index 15650bc65..165046142 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -19,6 +19,7 @@ table{ background:#fff;}
 .line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 .no_border{ border:none;background:none;}
 .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
+.none{display: none;}
 
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}
@@ -459,7 +460,7 @@ div.ke-statusbar{height:1px; border-top:none;}
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
 .resourcesBanner ul li:hover ul.resourcesType {display:block;}
-ul li:hover ul {display:block;}
+.resourcesSelected:hover ul {display:block;}
 .resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
 .resourcesUploadBox:hover {background-color:#0781b4;}
 .uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
@@ -699,8 +700,8 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:29px; display:block;}
 .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
 .navHomepageProfile {width:65px; display:block; float:right; margin-top:8px; margin-left:33px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) -8px -175px no-repeat; width:20px; height:25px; float:left; margin-top:15px;}
-a.homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) -8px -175px no-repeat; width:12px; height:12px; float:left;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) -8px -175px no-repeat; width:20px; height:25px; float:left; margin-top:15px; line-height:0;}
+a.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) -8px -175px no-repeat; width:12px; height:12px; float:left;}
 .homepageLeft {width:240px; float:left; margin-right:10px;}
 .homepageRight {width:750px; float:left;}
 .homepagePortraitContainer {width:238px; height:348px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px;}
@@ -738,7 +739,7 @@ a.newsBlack {color:#4b4b4b; font-size:12px;}
 a.newsBlack:hover {color:#0781b4;}
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
-
+.portraitRadius {border-radius: 3px;}
 
 /***** Flash & error messages ****/
 #errorExplanation, div.flash, .nodata, .warning, .conflict {

From e30abd2a810df903a88a76d58f50554115b80c43 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 9 Sep 2015 17:50:49 +0800
Subject: [PATCH 035/101] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BD=9C=E5=93=81=E7=95=8C=E9=9D=A2=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/edit.html.erb  |   2 +-
 app/views/student_work/new.html.erb   |   2 +-
 public/javascripts/jquery.autosize.js | 274 ++++++++++++++++++++++++++
 public/stylesheets/new_user.css       |   2 +-
 4 files changed, 277 insertions(+), 3 deletions(-)
 create mode 100644 public/javascripts/jquery.autosize.js

diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index deb6a1201..25a65f039 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -3,7 +3,7 @@
 </div>
 <div class="cl"></div>
 
-<div class="HomeWork" id="RSide">
+<div class="HomeWork" id="users_setting">
 
   <div class="HomeWorkBox">
     <div class="">
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 8f36d3dd5..556f054f1 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -19,7 +19,7 @@
 </div>
 <div class="cl"></div>
 
-<div class="HomeWork" id="RSide">
+<div class="HomeWork" id="users_setting">
 
   <div class="HomeWorkBox">
     <div class="">
diff --git a/public/javascripts/jquery.autosize.js b/public/javascripts/jquery.autosize.js
new file mode 100644
index 000000000..4a7bc8fd2
--- /dev/null
+++ b/public/javascripts/jquery.autosize.js
@@ -0,0 +1,274 @@
+/*!
+	Autosize 1.18.13
+	license: MIT
+	http://www.jacklmoore.com/autosize
+*/
+(function ($) {
+	var
+	defaults = {
+		className: 'autosizejs',
+		id: 'autosizejs',
+		append: '\n',
+		callback: false,
+		resizeDelay: 10,
+		placeholder: true
+	},
+
+	// border:0 is unnecessary, but avoids a bug in Firefox on OSX
+	copy = '<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; padding: 0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',
+
+	// line-height is conditionally included because IE7/IE8/old Opera do not return the correct value.
+	typographyStyles = [
+		'fontFamily',
+		'fontSize',
+		'fontWeight',
+		'fontStyle',
+		'letterSpacing',
+		'textTransform',
+		'wordSpacing',
+		'textIndent',
+		'whiteSpace'
+	],
+
+	// to keep track which textarea is being mirrored when adjust() is called.
+	mirrored,
+
+	// the mirror element, which is used to calculate what size the mirrored element should be.
+	mirror = $(copy).data('autosize', true)[0];
+
+	// test that line-height can be accurately copied.
+	mirror.style.lineHeight = '99px';
+	if ($(mirror).css('lineHeight') === '99px') {
+		typographyStyles.push('lineHeight');
+	}
+	mirror.style.lineHeight = '';
+
+	$.fn.autosize = function (options) {
+		if (!this.length) {
+			return this;
+		}
+
+		options = $.extend({}, defaults, options || {});
+
+		if (mirror.parentNode !== document.body) {
+			$(document.body).append(mirror);
+		}
+
+		return this.each(function () {
+			var
+			ta = this,
+			$ta = $(ta),
+			maxHeight,
+			minHeight,
+			boxOffset = 0,
+			callback = $.isFunction(options.callback),
+			originalStyles = {
+				height: ta.style.height,
+				overflow: ta.style.overflow,
+				overflowY: ta.style.overflowY,
+				wordWrap: ta.style.wordWrap,
+				resize: ta.style.resize
+			},
+			timeout,
+			width = $ta.width(),
+			taResize = $ta.css('resize');
+
+			if ($ta.data('autosize')) {
+				// exit if autosize has already been applied, or if the textarea is the mirror element.
+				return;
+			}
+			$ta.data('autosize', true);
+
+			if ($ta.css('box-sizing') === 'border-box' || $ta.css('-moz-box-sizing') === 'border-box' || $ta.css('-webkit-box-sizing') === 'border-box'){
+				boxOffset = $ta.outerHeight() - $ta.height();
+			}
+
+			// IE8 and lower return 'auto', which parses to NaN, if no min-height is set.
+			minHeight = Math.max(parseInt($ta.css('minHeight'), 10) - boxOffset || 0, $ta.height());
+
+			$ta.css({
+				overflow: 'hidden',
+				overflowY: 'hidden',
+				wordWrap: 'break-word' // horizontal overflow is hidden, so break-word is necessary for handling words longer than the textarea width
+			});
+
+			if (taResize === 'vertical') {
+				$ta.css('resize','none');
+			} else if (taResize === 'both') {
+				$ta.css('resize', 'horizontal');
+			}
+
+			// The mirror width must exactly match the textarea width, so using getBoundingClientRect because it doesn't round the sub-pixel value.
+			// window.getComputedStyle, getBoundingClientRect returning a width are unsupported, but also unneeded in IE8 and lower.
+			function setWidth() {
+				var width;
+				var style = window.getComputedStyle ? window.getComputedStyle(ta, null) : false;
+				
+				if (style) {
+
+					width = ta.getBoundingClientRect().width;
+
+					if (width === 0 || typeof width !== 'number') {
+						width = parseInt(style.width,10);
+					}
+
+					$.each(['paddingLeft', 'paddingRight', 'borderLeftWidth', 'borderRightWidth'], function(i,val){
+						width -= parseInt(style[val],10);
+					});
+				} else {
+					width = $ta.width();
+				}
+
+				mirror.style.width = Math.max(width,0) + 'px';
+			}
+
+			function initMirror() {
+				var styles = {};
+
+				mirrored = ta;
+				mirror.className = options.className;
+				mirror.id = options.id;
+				maxHeight = parseInt($ta.css('maxHeight'), 10);
+
+				// mirror is a duplicate textarea located off-screen that
+				// is automatically updated to contain the same text as the
+				// original textarea.  mirror always has a height of 0.
+				// This gives a cross-browser supported way getting the actual
+				// height of the text, through the scrollTop property.
+				$.each(typographyStyles, function(i,val){
+					styles[val] = $ta.css(val);
+				});
+				
+				$(mirror).css(styles).attr('wrap', $ta.attr('wrap'));
+
+				setWidth();
+
+				// Chrome-specific fix:
+				// When the textarea y-overflow is hidden, Chrome doesn't reflow the text to account for the space
+				// made available by removing the scrollbar. This workaround triggers the reflow for Chrome.
+				if (window.chrome) {
+					var width = ta.style.width;
+					ta.style.width = '0px';
+					var ignore = ta.offsetWidth;
+					ta.style.width = width;
+				}
+			}
+
+			// Using mainly bare JS in this function because it is going
+			// to fire very often while typing, and needs to very efficient.
+			function adjust() {
+				var height, original;
+
+				if (mirrored !== ta) {
+					initMirror();
+				} else {
+					setWidth();
+				}
+
+				if (!ta.value && options.placeholder) {
+					// If the textarea is empty, copy the placeholder text into 
+					// the mirror control and use that for sizing so that we 
+					// don't end up with placeholder getting trimmed.
+					mirror.value = ($ta.attr("placeholder") || '');
+				} else {
+					mirror.value = ta.value;
+				}
+
+				mirror.value += options.append || '';
+				mirror.style.overflowY = ta.style.overflowY;
+				original = parseInt(ta.style.height,10);
+
+				// Setting scrollTop to zero is needed in IE8 and lower for the next step to be accurately applied
+				mirror.scrollTop = 0;
+
+				mirror.scrollTop = 9e4;
+
+				// Using scrollTop rather than scrollHeight because scrollHeight is non-standard and includes padding.
+				height = mirror.scrollTop;
+
+				if (maxHeight && height > maxHeight) {
+					ta.style.overflowY = 'scroll';
+					height = maxHeight;
+				} else {
+					ta.style.overflowY = 'hidden';
+					if (height < minHeight) {
+						height = minHeight;
+					}
+				}
+
+				height += boxOffset;
+
+				if (original !== height) {
+					ta.style.height = height + 'px';
+					if (callback) {
+						options.callback.call(ta,ta);
+					}
+					$ta.trigger('autosize.resized');
+				}
+			}
+
+			function resize () {
+				clearTimeout(timeout);
+				timeout = setTimeout(function(){
+					var newWidth = $ta.width();
+
+					if (newWidth !== width) {
+						width = newWidth;
+						adjust();
+					}
+				}, parseInt(options.resizeDelay,10));
+			}
+
+			if ('onpropertychange' in ta) {
+				if ('oninput' in ta) {
+					// Detects IE9.  IE9 does not fire onpropertychange or oninput for deletions,
+					// so binding to onkeyup to catch most of those occasions.  There is no way that I
+					// know of to detect something like 'cut' in IE9.
+					$ta.on('input.autosize keyup.autosize', adjust);
+				} else {
+					// IE7 / IE8
+					$ta.on('propertychange.autosize', function(){
+						if(event.propertyName === 'value'){
+							adjust();
+						}
+					});
+				}
+			} else {
+				// Modern Browsers
+				$ta.on('input.autosize', adjust);
+			}
+
+			// Set options.resizeDelay to false if using fixed-width textarea elements.
+			// Uses a timeout and width check to reduce the amount of times adjust needs to be called after window resize.
+
+			if (options.resizeDelay !== false) {
+				$(window).on('resize.autosize', resize);
+			}
+
+			// Event for manual triggering if needed.
+			// Should only be needed when the value of the textarea is changed through JavaScript rather than user input.
+			$ta.on('autosize.resize', adjust);
+
+			// Event for manual triggering that also forces the styles to update as well.
+			// Should only be needed if one of typography styles of the textarea change, and the textarea is already the target of the adjust method.
+			$ta.on('autosize.resizeIncludeStyle', function() {
+				mirrored = null;
+				adjust();
+			});
+
+			$ta.on('autosize.destroy', function(){
+				mirrored = null;
+				clearTimeout(timeout);
+				$(window).off('resize', resize);
+				$ta
+					.off('autosize')
+					.off('.autosize')
+					.css(originalStyles)
+					.removeData('autosize');
+			});
+
+			// Call adjust in case the textarea already contains text.
+			adjust();
+		});
+	};
+}(jQuery || $)); // jQuery or jQuery-like library, such as Zepto
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index ad1784995..128e0c4bb 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -539,7 +539,7 @@ a.homepagePostTypeNotice {background:url(../images/homepage_icon.png) -87px -280
 a.homepagePostTypeForum {background:url(../images/homepage_icon.png) -10px -310px no-repeat; padding-left:23px;}
 a.homepagePostTypeQuiz {background:url(../images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
 a.homepagePostTypeQuestion {background:url(../images/homepage_icon.png) -10px -273px no-repeat; padding-left:23px;}
-a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -10px -360px no-repeat; padding-left:23px;}
+a.homepagePostTypeAll {background:url(../images/homepage_icon2.png) -10px -360px no-repeat; padding-left:23px;}
 a.postTypeGrey {color:#888888;}
 a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostBrief {width:710px; margin:0px auto; position:relative;}

From 28d4bae9e7048144b08b1ed2a17784b4fce65c21 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 9 Sep 2015 17:53:34 +0800
Subject: [PATCH 036/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B/?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E7=9A=84=E6=96=87=E5=AD=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/header.css     | 1 +
 public/stylesheets/public_new.css | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 192a4a262..2d6f5e0b8 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -79,6 +79,7 @@ a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
 #navSearchAlert {display:none;}
 .none{display: none;}
+.db {display:block !important;}
 
 /*myctrip*/
 .userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index 165046142..555cef836 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -496,7 +496,7 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 a.sendButtonBlue {color:#15bccf;}
 a.sendButtonBlue:hover {color:#ffffff;}
 .resourcesSelectSendButton:hover {background-color:#15bccf;}
-.db {display:block;}
+.db {display:block !important;}
 
 .dropdown-menu {
     position: absolute;

From 6b0432c04c581dbe96b7e4142dc3f83093e0d14e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 10 Sep 2015 09:06:00 +0800
Subject: [PATCH 037/101] =?UTF-8?q?=E6=B7=BB=E5=8A=A0job=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/email.rake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index 5126d7a69..f805d1382 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -202,5 +202,13 @@ END_DESC
         Mailer.run.send_for_user_activities(user, Date.today, 1)
       end
     end
+
+    desc "send a message for Job deadline"
+    task :message => :environment do
+      users = User.where(mail_notification: 'day')
+      users.each do |user|
+        Mailer.run.send_for_user_activities(user, Date.today, 1)
+      end
+    end
   end
 end

From 50aa22c5e53ebb68869b6288950c7df5db1b39f3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Sep 2015 10:01:43 +0800
Subject: [PATCH 038/101] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E2=80=9C=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E8=BD=BB=E6=8A=9A?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E2=80=9D=EF=BC=8C=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E7=A7=BB=E5=88=B0=E6=96=B9=E6=A1=86=E4=B8=8A=E5=8D=B3?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index f071cbeb4..5ab315fab 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -62,5 +62,12 @@
 <% end %>
 
 <% if user_activities.count == 10%>
-    <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <div id="show_more_activities" class="loadMore mt10 f_grey">轻抚展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
+    <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
+
+<script type="text/javascript">
+  $("#show_more_activities").mouseover(function(){
+      $("#more_activities_link").click();
+  });
+</script>
\ No newline at end of file

From 97f9d4fa60ea0ea1934fc7c988e2797a3bf69e20 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 10 Sep 2015 10:26:16 +0800
Subject: [PATCH 039/101] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E8=8A=82=E7=A5=9D=E7=A6=8F=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb |   2 +
 app/views/users/show.html.erb            |  66 +++++++++++------------
 public/images/TeachersDay.jpg            | Bin 0 -> 34823 bytes
 public/stylesheets/new_user.css          |   5 +-
 4 files changed, 38 insertions(+), 35 deletions(-)
 create mode 100644 public/images/TeachersDay.jpg

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index ae8fd774e..3ab40d101 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -27,6 +27,8 @@
 </div>
 
 <div class="homepageContentContainer">
+  <div class="homepageRightBannerImg"></div>
+  <div class="cl"></div>
   <div class="homepageContent">
     <div class="homepageLeft" id="LSide">
       <div class="homepagePortraitContainer">
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 13f2518e1..aab715b16 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,41 +1,41 @@
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
-  <div class="homepageRightBanner">
+<div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>
     <ul class="resourcesSelect">
-      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-        <ul class="homepagePostType">
-          <li>
-            <ul class="homepagePostTypeHomework fl">
-              <li class="f14">课程动态</li>
-              <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-                <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-              <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-              <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-                <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-            </ul>
-          </li>
-          <li>
-            <ul class="homepagePostTypeProject fl">
-              <li class="f14">项目动态</li>
-              <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
-              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
-              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-            </ul>
-          </li>
-          <li>
-            <ul class="homepagePostTypeProject fl">
-              <li class="f14">更多</li>
-              <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%>
-              <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
-            </ul>
-          </li>
+  <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+    <ul class="homepagePostType">
+      <li>
+        <ul class="homepagePostTypeHomework fl">
+          <li class="f14">课程动态</li>
+          <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+            <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+          <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+          <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+          <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+          <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+            <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+        </ul>
+      </li>
+      <li>
+        <ul class="homepagePostTypeProject fl">
+          <li class="f14">项目动态</li>
+          <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+          <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+          <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+        </ul>
+      </li>
+      <li>
+        <ul class="homepagePostTypeProject fl">
+          <li class="f14">更多</li>
+          <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%>
+          <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
         </ul>
       </li>
     </ul>
-  </div>
+  </li>
+</ul>
+</div>
 
 <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %>
diff --git a/public/images/TeachersDay.jpg b/public/images/TeachersDay.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..036a6f7299e301b3b7796e7ab8aa0d2ca336204a
GIT binary patch
literal 34823
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

literal 0
HcmV?d00001

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0515da364..b6e1919f2 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -465,8 +465,8 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 /*.navHomepageProfile ul li ul {display:none;}
 .navHomepageProfile ul li:hover ul {display:block;}*/
 .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
-.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
-.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;}
+.homepageRight {width:750px; float:left; margin-top:10px; margin-bottom:10px;}
+.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px; padding:15px;}
 .homepagePortraitImage {width:78px; height:78px; position:relative; border:1px solid #cbcbcb; padding: 2px;}
 .homepagePortraitImage:hover {border:1px solid #269ac9;}
 .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
@@ -505,6 +505,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
 .homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
+.homepageRightBannerImg{width:1000px; margin:0px auto;  height: 60px; margin-top: 10px; background:url(../images/TeachersDay.jpg)}
 .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
 .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}

From 8d415b085690c81e40da41a882a3b6decb334448 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 10 Sep 2015 10:51:53 +0800
Subject: [PATCH 040/101] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_list.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 642373d58..1a24b1499 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -35,8 +35,8 @@
             <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
             <div class="cl"></div>
           </div>
-          <% if is_teacher%>
-          <%# if false%>
+          <%# if is_teacher%>
+          <% if false%>
               <div class="homepagePostSetting">
                 <ul>
                   <li class="homepagePostSettingIcon">

From a29ab60481a788aaa1fb6ae9413bf760fed07980 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 10 Sep 2015 11:34:10 +0800
Subject: [PATCH 041/101] =?UTF-8?q?=E8=80=81=E5=B8=88=E7=9A=84=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=BB=93=E6=9E=9C=E8=83=BD=E6=98=BE=E7=A4=BA=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 2 +-
 app/controllers/users_controller.rb        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 593d6bf53..018a293e3 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -631,7 +631,7 @@ class StudentWorkController < ApplicationController
       unless @homework.save
         logger.debug @homework.errors.full_messages
       else
-        student_work = @homework.student_works.where(user_id: User.current.id).first
+        student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
       end
     end
     student_work
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9b2d49f2d..d71b24fc8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -354,7 +354,7 @@ class UsersController < ApplicationController
       @user = User.current
       @homework = HomeworkCommon.find(params[:homework_id])
       @is_test = params[:is_test] == 'true'
-      @student_work = @homework.student_works.where(user_id: User.current.id).first
+      @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
       if @student_work.nil?
         @student_work = StudentWork.new
       end
@@ -369,7 +369,7 @@ class UsersController < ApplicationController
 
   def user_commit_homework
     homework = HomeworkCommon.find(params[:homework])
-    student_work = homework.student_works.where(user_id: User.current.id).first
+    student_work = StudentWork.where(homework_common_id: homework.id, user_id: User.current.id).first
     if student_work
       student_work.save
       flash[:notice] = l(:notice_successful_create)

From 596c512d0afc6800226c9343e2b326d73d1ac91c Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 10 Sep 2015 11:39:53 +0800
Subject: [PATCH 042/101] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb    |  2 ++
 app/views/users/user_messages.html.erb | 29 ++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 23106c954..220781ed9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -148,6 +148,8 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
+      when 'system_message'
+        @message_alls = SystemMessage.order("created_at desc").all
       when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index e36fd4f32..b5473edee 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -6,6 +6,8 @@
           <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
           <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
           <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
+          <%# 系统消息 %>
+          <li><%= link_to "系统消息", user_message_path(User.current, :type => 'system_message'), :class => "resourcesGrey" %></li>
           <%# 课程相关消息 %>
           <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
           <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
@@ -42,8 +44,14 @@
     <%# 系统消息 %>
     <% @user_system_messages.each do |usm| %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);">ddddddddddddddd</a></li>
-          <li class="homepageNewsPubType fl">Trustiep平台<span class="homepageNewsType fl">发布新消息：</span></li>
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);">
+              <div class="navHomepageLogo fl">
+                <%=image_tag("/images/logo.png",width:"30px", height: "30px",class: "mt3") %>
+              </div>
+            </a>
+          </li>
+          <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
           <li class="homepageNewsContent fl">
             <%= link_to usm.content, {:controller => 'system_messages', :action => 'index'},
                         :class =>"newsGrey",
@@ -303,6 +311,23 @@
                     </ul>
                 <% end %>
             <% end %>
+              <% if ma.class == SystemMessage %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl">
+                      <a href="javascript:void(0);">
+                        <div class="navHomepageLogo fl">
+                          <%=image_tag("/images/logo.png",width:"30px", height: "30px",class: "mt3")%>
+                        </div>
+                      </a>
+                    </li>
+                    <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
+                    <li class="homepageNewsContent fl">
+                      <%= link_to ma.content, {:controller => 'system_messages', :action => 'index'},
+                                  :class =>"newsGrey",
+                                  :title => "#{ma.content.html_safe}" %></li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                  </ul>
+                  <% end %>
         <% end %>
         <ul class="wlist" style=" border:none; padding-top: 15px;">
           <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>

From fb155c84583d943a810a32e35656aa427973b8f2 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 10 Sep 2015 11:42:53 +0800
Subject: [PATCH 043/101] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index b5473edee..36392c7ac 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -311,6 +311,7 @@
                     </ul>
                 <% end %>
             <% end %>
+              <%# 系统消息 %>
               <% if ma.class == SystemMessage %>
                   <ul class="homepageNewsList fl">
                     <li class="homepageNewsPortrait fl">

From fce5405c419d717a200c72e7e381350164876fc7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 10 Sep 2015 14:44:25 +0800
Subject: [PATCH 044/101] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb | 4 ++--
 public/stylesheets/new_user.css              | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 4af5742a9..949fb7f83 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -5,7 +5,7 @@
 
 <div class="HomeWorkCon">
   <div>
-    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  w712" maxlength="255" onfocus="$('#homework_editor').show()" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
+    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  w701" maxlength="255" onfocus="$('#homework_editor').show()" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
     <p id="homework_name_span" class="c_red mt5"></p>
   </div>
   <div class="cl"></div>
@@ -34,7 +34,7 @@
 
 
     <div class="mt10">
-      <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox  w720",:value => "请选择发布作业的课程"} %>
+      <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>
     </div>
     <p id="homework_course_id_span" class="c_red mt5"></p>
     <div class="cl"></div>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index b6e1919f2..a37123d76 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -856,6 +856,8 @@ a:hover.BlueCirBtn{ background:#269ac9; color:#fff;}
 .w708{width: 708px;}
 .w712{width:712px;max-width:712px;min-width: 712px;}
 .w720{width:721px;}
+.w709{width: 709px;}
+.w701{width: 701px;}
 a.AnnexBtn{  background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;}
 a.FilesBtn{  background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}

From 5f0aac9265e63597602f5b6a9edb26d4bcc825d8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Sep 2015 15:01:59 +0800
Subject: [PATCH 045/101] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E6=80=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 688d7e2ac..0e36d5fd9 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -213,6 +213,7 @@
   <% occupation1 = User.current.user_extensions.occupation %>
   <% occupation = User.current.user_extensions.occupation %>
   <% title = User.current.user_extensions.technical_title %>
+  <% gender = User.current.user_extensions.gender %>
   <% language = User.current.language %>
 <% else %>
   <% province = "湖南省" %>
@@ -510,6 +511,13 @@
       }
     }
   }
+  function init_gender(pField, gender) {
+      for (var i=0; i<pField.options.length; i++) {
+          if (pField.options[i].value == gender) {
+              pField.selectedIndex = i;
+          }
+      }
+  }
   $(function(){
     //学校
     $("#province").attr("href", "#WOpenWindow")
@@ -527,6 +535,10 @@
     var occupation1 = "<%= "#{occupation}" %>"
     init_identity_and_title(document.getElementById('userIdentity'), identity, document.getElementById('userTechnical_title'), title, language);
 
+    //sex
+    var gender = "<%= "#{gender}" %>"
+    init_gender(document.getElementById('gender'), gender);
+
     $("#userIdentity").change();
     <% if( !@act.nil? && @act == 'password') %>
     $("#users_tb_2").click();

From e6d5d1785963bb8db69c0de0dcf8125f4559fb8a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Sep 2015 15:08:10 +0800
Subject: [PATCH 046/101] =?UTF-8?q?=E8=BD=BB=E6=8A=9A=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A->=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 5ab315fab..6955f5f69 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -62,7 +62,7 @@
 <% end %>
 
 <% if user_activities.count == 10%>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">轻抚展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
+    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
     <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
 

From 756aae0cf2f58b567d1d9f093ed20b4f61b5ae85 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 10 Sep 2015 15:45:08 +0800
Subject: [PATCH 047/101] =?UTF-8?q?=E5=8F=91=E5=B8=83issue=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=BC=A0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=B9=B6=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/edit.html.erb                  |    3 +-
 app/views/layouts/base_projects.html.erb      |    6 +-
 .../lib/rails_kindeditor/helper.rb            |    6 +-
 public/assets/kindeditor/kindeditor.js        |    8 +-
 public/assets/kindeditor/plugins/code/code.js |    5 +-
 .../kindeditor/plugins/code/previewcode.css   |   76 +
 public/javascripts/prettify.js                | 1655 +++++++++++++++++
 public/stylesheets/prettify.css               |   77 +
 8 files changed, 1824 insertions(+), 12 deletions(-)
 create mode 100644 public/assets/kindeditor/plugins/code/previewcode.css
 create mode 100644 public/javascripts/prettify.js
 create mode 100644 public/stylesheets/prettify.css

diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb
index da3d19267..554702d97 100644
--- a/app/views/bids/edit.html.erb
+++ b/app/views/bids/edit.html.erb
@@ -1,4 +1,5 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'prettify','/assets/kindeditor/pasteimg' %>
+<%= stylesheet_link_tag 'prettify'%>
 <%= labelled_form_for @bid,:html => { :multipart => true } do |f| %>
     <%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %>
 <% end %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 425b720d9..ca1b324a4 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -12,8 +12,8 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2','header' %>
-  <%= javascript_include_tag 'cookie','project', 'header','select_list_move' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header' %>
+  <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
@@ -21,7 +21,7 @@
 
 </head>
 <!--add by huang-->
-<body>
+<body onload=" ">
 <div class="navContainer mb10">
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
index 6ed45d92e..f30ee2236 100644
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@@ -9,7 +9,8 @@ module RailsKindeditor
       output << text_area_tag(name, content, input_html)
       output << javascript_tag(js_replace(id, options.merge(window_onload: 'true',
                                                             :autoHeightMode=>true,
-                                                            afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})')))
+                                                            afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})'
+                                                            )))
     end
     
     def kindeditor(name, method, options = {})
@@ -20,7 +21,8 @@ module RailsKindeditor
       output_buffer << build_text_area_tag(name, method, self, options, input_html)
       output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
                                                                                  :autoHeightMode=>true,
-                                                                                afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})')))
+                                                                                afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})'
+                                                                                )))
     end
     
     def kindeditor_upload_json_path(*args)
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 26cd088c4..bc45cd91f 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -258,13 +258,13 @@ K.options = {
 	fullscreenShortcut : false,
 	bodyClass : 'ke-content',
 	indentChar : '\t',
-	cssPath : '',
+	cssPath : K.basePath +'plugins/code/previewcode.css',
 	cssData : '',
 	minWidth : 650,
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : [ 'emoticons',
+	items : ['code', 'emoticons',
 		'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
 		'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
 		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media',"more"
@@ -4986,7 +4986,7 @@ KEditor.prototype = {
         htmlList.unshift('<div style="display:block" id="define"/>')
         htmlList.push('</div>')
         var htmlListFull = [];
-        var fullItems =  [
+        var fullItems =  ['code',
             'emoticons',
             'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
             'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
@@ -5069,6 +5069,7 @@ KEditor.prototype = {
 					}
 					self.updateState();
 					self.addBookmark();
+                    prettyPrint("",self.edit.doc.body);
 					if (self.options.afterChange) {
 						self.options.afterChange.call(self);
 					}
@@ -5550,6 +5551,7 @@ _plugin('core', function(K) {
 	self.afterSetHtml(function() {
 		if (self.options.afterChange) {
 			self.options.afterChange.call(self);
+
 		}
 	});
 	self.afterCreate(function() {
diff --git a/public/assets/kindeditor/plugins/code/code.js b/public/assets/kindeditor/plugins/code/code.js
index 85e42259b..760f20bc7 100644
--- a/public/assets/kindeditor/plugins/code/code.js
+++ b/public/assets/kindeditor/plugins/code/code.js
@@ -23,10 +23,9 @@ KindEditor.plugin('code', function(K) {
 				'<option value="php">PHP</option>',
 				'<option value="pl">Perl</option>',
 				'<option value="py">Python</option>',
-				'<option value="rb">Ruby</option>',
 				'<option value="java">Java</option>',
 				'<option value="vb">ASP/VB</option>',
-				'<option value="cpp">C/C++</option>',
+				'<option value="c">C/C++</option>',
 				'<option value="cs">C#</option>',
 				'<option value="xml">XML</option>',
 				'<option value="bsh">Shell</option>',
@@ -46,7 +45,7 @@ KindEditor.plugin('code', function(K) {
 						var type = K('.ke-code-type', dialog.div).val(),
 							code = textarea.val(),
 							cls = type === '' ? '' :  ' lang-' + type,
-							html = '<pre class="prettyprint' + cls + '">\n' + K.escape(code) + '</pre> ';
+							html = '<pre class="prettyprint linenums ' + cls + '">\n' + K.escape(code) + '</pre> ';
 						if (K.trim(code) === '') {
 							alert(lang.pleaseInput);
 							textarea[0].focus();
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
new file mode 100644
index 000000000..ce3084a7c
--- /dev/null
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -0,0 +1,76 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+/* SPAN elements with the classes below are added by prettyprint. */
+.pln { color: #000 }  /* plain text */
+
+@media screen {
+    .str { color: #080 }  /* string content */
+    .kwd { color: #008 }  /* a keyword */
+    .com { color: #800 }  /* a comment */
+    .typ { color: #606 }  /* a type name */
+    .lit { color: #066 }  /* a literal value */
+    /* punctuation, lisp open bracket, lisp close bracket */
+    .pun, .opn, .clo { color: #660 }
+    .tag { color: #008 }  /* a markup tag name */
+    .atn { color: #606 }  /* a markup attribute name */
+    .atv { color: #080 }  /* a markup attribute value */
+    .dec, .var { color: #606 }  /* a declaration; a variable name */
+    .fun { color: red }  /* a function name */
+}
+
+/* Use higher contrast and text-weight for printable form. */
+@media print, projection {
+    .str { color: #060 }
+    .kwd { color: #006; font-weight: bold }
+    .com { color: #600; font-style: italic }
+    .typ { color: #404; font-weight: bold }
+    .lit { color: #044 }
+    .pun, .opn, .clo { color: #440 }
+    .tag { color: #006; font-weight: bold }
+    .atn { color: #404 }
+    .atv { color: #060 }
+}
+
+/* Put a border around prettyprinted code snippets. */
+pre.prettyprint { padding: 2px;
+    border-left:1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    border-right: 1px solid #ccc,
+border-top: 1px solid #ccc }
+
+pre li,ul,ol {
+    list-style-type: none;
+}
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */
+li.L0,
+li.L1,
+li.L2,
+li.L3,
+li.L5,
+li.L6,
+li.L7,
+li.L8 { list-style-type: none }
+/* Alternate shading for lines */
+li.L1,
+li.L3,
+li.L5,
+li.L7,
+li.L9 { background: #eee }
+
+.prettyprint *{font-family:'courier new',monospace;}
+/*.prettyprint .com { color: #93a1a1; }*/
+/*.prettyprint .lit { color: #AE81FF; }*/
+/*.prettyprint .pun,*/
+/*.prettyprint .opn,*/
+/*.prettyprint .clo { color: #F8F8F2; }*/
+/*.prettyprint .fun { color: #dc322f; }*/
+/*.prettyprint .str,*/
+/*.prettyprint .atv { color: #E6DB74; }*/
+/*.prettyprint .kwd,*/
+/*.prettyprint .tag { color: #F92659; }*/
+/*.prettyprint .typ,*/
+/*.prettyprint .atn,*/
+/*.prettyprint .dec,*/
+/*.prettyprint .var { color: #A6E22E; }*/
+/*.prettyprint .pln { color: #66D9EF; }*/
diff --git a/public/javascripts/prettify.js b/public/javascripts/prettify.js
new file mode 100644
index 000000000..10c9fb73d
--- /dev/null
+++ b/public/javascripts/prettify.js
@@ -0,0 +1,1655 @@
+// Copyright (C) 2006 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+/**
+ * @fileoverview
+ * some functions for browser-side pretty printing of code contained in html.
+ *
+ * <p>
+ * For a fairly comprehensive set of languages see the
+ * <a href="http://google-code-prettify.googlecode.com/svn/trunk/README.html#langs">README</a>
+ * file that came with this source.  At a minimum, the lexer should work on a
+ * number of languages including C and friends, Java, Python, Bash, SQL, HTML,
+ * XML, CSS, Javascript, and Makefiles.  It works passably on Ruby, PHP and Awk
+ * and a subset of Perl, but, because of commenting conventions, doesn't work on
+ * Smalltalk, Lisp-like, or CAML-like languages without an explicit lang class.
+ * <p>
+ * Usage: <ol>
+ * <li> include this source file in an html page via
+ *   {@code <script type="text/javascript" src="/path/to/prettify.js"></script>}
+ * <li> define style rules.  See the example page for examples.
+ * <li> mark the {@code <pre>} and {@code <code>} tags in your source with
+ *    {@code class=prettyprint.}
+ *    You can also use the (html deprecated) {@code <xmp>} tag, but the pretty
+ *    printer needs to do more substantial DOM manipulations to support that, so
+ *    some css styles may not be preserved.
+ * </ol>
+ * That's it.  I wanted to keep the API as simple as possible, so there's no
+ * need to specify which language the code is in, but if you wish, you can add
+ * another class to the {@code <pre>} or {@code <code>} element to specify the
+ * language, as in {@code <pre class="prettyprint lang-java">}.  Any class that
+ * starts with "lang-" followed by a file extension, specifies the file type.
+ * See the "lang-*.js" files in this directory for code that implements
+ * per-language file handlers.
+ * <p>
+ * Change log:<br>
+ * cbeust, 2006/08/22
+ * <blockquote>
+ *   Java annotations (start with "@") are now captured as literals ("lit")
+ * </blockquote>
+ * @requires console
+ */
+
+// JSLint declarations
+/*global console, document, navigator, setTimeout, window, define */
+
+/** @define {boolean} */
+var IN_GLOBAL_SCOPE = true;
+
+/**
+ * Split {@code prettyPrint} into multiple timeouts so as not to interfere with
+ * UI events.
+ * If set to {@code false}, {@code prettyPrint()} is synchronous.
+ */
+window['PR_SHOULD_USE_CONTINUATION'] = true;
+
+/**
+ * Pretty print a chunk of code.
+ * @param {string} sourceCodeHtml The HTML to pretty print.
+ * @param {string} opt_langExtension The language name to use.
+ *     Typically, a filename extension like 'cpp' or 'java'.
+ * @param {number|boolean} opt_numberLines True to number lines,
+ *     or the 1-indexed number of the first line in sourceCodeHtml.
+ * @return {string} code as html, but prettier
+ */
+var prettyPrintOne;
+/**
+ * Find all the {@code <pre>} and {@code <code>} tags in the DOM with
+ * {@code class=prettyprint} and prettify them.
+ *
+ * @param {Function} opt_whenDone called when prettifying is done.
+ * @param {HTMLElement|HTMLDocument} opt_root an element or document
+ *   containing all the elements to pretty print.
+ *   Defaults to {@code document.body}.
+ */
+var prettyPrint;
+
+
+(function () {
+  var win = window;
+  // Keyword lists for various languages.
+  // We use things that coerce to strings to make them compact when minified
+  // and to defeat aggressive optimizers that fold large string constants.
+  var FLOW_CONTROL_KEYWORDS = ["break,continue,do,else,for,if,return,while"];
+  var C_KEYWORDS = [FLOW_CONTROL_KEYWORDS,"auto,case,char,const,default," + 
+      "double,enum,extern,float,goto,inline,int,long,register,short,signed," +
+      "sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];
+  var COMMON_KEYWORDS = [C_KEYWORDS,"catch,class,delete,false,import," +
+      "new,operator,private,protected,public,this,throw,true,try,typeof"];
+  var CPP_KEYWORDS = [COMMON_KEYWORDS,"alignof,align_union,asm,axiom,bool," +
+      "concept,concept_map,const_cast,constexpr,decltype,delegate," +
+      "dynamic_cast,explicit,export,friend,generic,late_check," +
+      "mutable,namespace,nullptr,property,reinterpret_cast,static_assert," +
+      "static_cast,template,typeid,typename,using,virtual,where"];
+  var JAVA_KEYWORDS = [COMMON_KEYWORDS,
+      "abstract,assert,boolean,byte,extends,final,finally,implements,import," +
+      "instanceof,interface,null,native,package,strictfp,super,synchronized," +
+      "throws,transient"];
+  var CSHARP_KEYWORDS = [JAVA_KEYWORDS,
+      "as,base,by,checked,decimal,delegate,descending,dynamic,event," +
+      "fixed,foreach,from,group,implicit,in,internal,into,is,let," +
+      "lock,object,out,override,orderby,params,partial,readonly,ref,sbyte," +
+      "sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort," +
+      "var,virtual,where"];
+  var COFFEE_KEYWORDS = "all,and,by,catch,class,else,extends,false,finally," +
+      "for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," +
+      "throw,true,try,unless,until,when,while,yes";
+  var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS,
+      "debugger,eval,export,function,get,null,set,undefined,var,with," +
+      "Infinity,NaN"];
+  var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," +
+      "goto,if,import,last,local,my,next,no,our,print,package,redo,require," +
+      "sub,undef,unless,until,use,wantarray,while,BEGIN,END";
+  var PYTHON_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "and,as,assert,class,def,del," +
+      "elif,except,exec,finally,from,global,import,in,is,lambda," +
+      "nonlocal,not,or,pass,print,raise,try,with,yield," +
+      "False,True,None"];
+  var RUBY_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "alias,and,begin,case,class," +
+      "def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo," +
+      "rescue,retry,self,super,then,true,undef,unless,until,when,yield," +
+      "BEGIN,END"];
+   var RUST_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "as,assert,const,copy,drop," +
+      "enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv," +
+      "pub,pure,ref,self,static,struct,true,trait,type,unsafe,use"];
+  var SH_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "case,done,elif,esac,eval,fi," +
+      "function,in,local,set,then,until"];
+  var ALL_KEYWORDS = [
+      CPP_KEYWORDS, CSHARP_KEYWORDS, JSCRIPT_KEYWORDS, PERL_KEYWORDS,
+      PYTHON_KEYWORDS, RUBY_KEYWORDS, SH_KEYWORDS];
+  var C_TYPES = /^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;
+
+  // token style names.  correspond to css classes
+  /**
+   * token style for a string literal
+   * @const
+   */
+  var PR_STRING = 'str';
+  /**
+   * token style for a keyword
+   * @const
+   */
+  var PR_KEYWORD = 'kwd';
+  /**
+   * token style for a comment
+   * @const
+   */
+  var PR_COMMENT = 'com';
+  /**
+   * token style for a type
+   * @const
+   */
+  var PR_TYPE = 'typ';
+  /**
+   * token style for a literal value.  e.g. 1, null, true.
+   * @const
+   */
+  var PR_LITERAL = 'lit';
+  /**
+   * token style for a punctuation string.
+   * @const
+   */
+  var PR_PUNCTUATION = 'pun';
+  /**
+   * token style for plain text.
+   * @const
+   */
+  var PR_PLAIN = 'pln';
+
+  /**
+   * token style for an sgml tag.
+   * @const
+   */
+  var PR_TAG = 'tag';
+  /**
+   * token style for a markup declaration such as a DOCTYPE.
+   * @const
+   */
+  var PR_DECLARATION = 'dec';
+  /**
+   * token style for embedded source.
+   * @const
+   */
+  var PR_SOURCE = 'src';
+  /**
+   * token style for an sgml attribute name.
+   * @const
+   */
+  var PR_ATTRIB_NAME = 'atn';
+  /**
+   * token style for an sgml attribute value.
+   * @const
+   */
+  var PR_ATTRIB_VALUE = 'atv';
+
+  /**
+   * A class that indicates a section of markup that is not code, e.g. to allow
+   * embedding of line numbers within code listings.
+   * @const
+   */
+  var PR_NOCODE = 'nocode';
+
+  
+  
+  /**
+   * A set of tokens that can precede a regular expression literal in
+   * javascript
+   * http://web.archive.org/web/20070717142515/http://www.mozilla.org/js/language/js20/rationale/syntax.html
+   * has the full list, but I've removed ones that might be problematic when
+   * seen in languages that don't support regular expression literals.
+   *
+   * <p>Specifically, I've removed any keywords that can't precede a regexp
+   * literal in a syntactically legal javascript program, and I've removed the
+   * "in" keyword since it's not a keyword in many languages, and might be used
+   * as a count of inches.
+   *
+   * <p>The link above does not accurately describe EcmaScript rules since
+   * it fails to distinguish between (a=++/b/i) and (a++/b/i) but it works
+   * very well in practice.
+   *
+   * @private
+   * @const
+   */
+  var REGEXP_PRECEDER_PATTERN = '(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*';
+  
+  // CAVEAT: this does not properly handle the case where a regular
+  // expression immediately follows another since a regular expression may
+  // have flags for case-sensitivity and the like.  Having regexp tokens
+  // adjacent is not valid in any language I'm aware of, so I'm punting.
+  // TODO: maybe style special characters inside a regexp as punctuation.
+
+  /**
+   * Given a group of {@link RegExp}s, returns a {@code RegExp} that globally
+   * matches the union of the sets of strings matched by the input RegExp.
+   * Since it matches globally, if the input strings have a start-of-input
+   * anchor (/^.../), it is ignored for the purposes of unioning.
+   * @param {Array.<RegExp>} regexs non multiline, non-global regexs.
+   * @return {RegExp} a global regex.
+   */
+  function combinePrefixPatterns(regexs) {
+    var capturedGroupIndex = 0;
+  
+    var needToFoldCase = false;
+    var ignoreCase = false;
+    for (var i = 0, n = regexs.length; i < n; ++i) {
+      var regex = regexs[i];
+      if (regex.ignoreCase) {
+        ignoreCase = true;
+      } else if (/[a-z]/i.test(regex.source.replace(
+                     /\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi, ''))) {
+        needToFoldCase = true;
+        ignoreCase = false;
+        break;
+      }
+    }
+  
+    var escapeCharToCodeUnit = {
+      'b': 8,
+      't': 9,
+      'n': 0xa,
+      'v': 0xb,
+      'f': 0xc,
+      'r': 0xd
+    };
+  
+    function decodeEscape(charsetPart) {
+      var cc0 = charsetPart.charCodeAt(0);
+      if (cc0 !== 92 /* \\ */) {
+        return cc0;
+      }
+      var c1 = charsetPart.charAt(1);
+      cc0 = escapeCharToCodeUnit[c1];
+      if (cc0) {
+        return cc0;
+      } else if ('0' <= c1 && c1 <= '7') {
+        return parseInt(charsetPart.substring(1), 8);
+      } else if (c1 === 'u' || c1 === 'x') {
+        return parseInt(charsetPart.substring(2), 16);
+      } else {
+        return charsetPart.charCodeAt(1);
+      }
+    }
+  
+    function encodeEscape(charCode) {
+      if (charCode < 0x20) {
+        return (charCode < 0x10 ? '\\x0' : '\\x') + charCode.toString(16);
+      }
+      var ch = String.fromCharCode(charCode);
+      return (ch === '\\' || ch === '-' || ch === ']' || ch === '^')
+          ? "\\" + ch : ch;
+    }
+  
+    function caseFoldCharset(charSet) {
+      var charsetParts = charSet.substring(1, charSet.length - 1).match(
+          new RegExp(
+              '\\\\u[0-9A-Fa-f]{4}'
+              + '|\\\\x[0-9A-Fa-f]{2}'
+              + '|\\\\[0-3][0-7]{0,2}'
+              + '|\\\\[0-7]{1,2}'
+              + '|\\\\[\\s\\S]'
+              + '|-'
+              + '|[^-\\\\]',
+              'g'));
+      var ranges = [];
+      var inverse = charsetParts[0] === '^';
+  
+      var out = ['['];
+      if (inverse) { out.push('^'); }
+  
+      for (var i = inverse ? 1 : 0, n = charsetParts.length; i < n; ++i) {
+        var p = charsetParts[i];
+        if (/\\[bdsw]/i.test(p)) {  // Don't muck with named groups.
+          out.push(p);
+        } else {
+          var start = decodeEscape(p);
+          var end;
+          if (i + 2 < n && '-' === charsetParts[i + 1]) {
+            end = decodeEscape(charsetParts[i + 2]);
+            i += 2;
+          } else {
+            end = start;
+          }
+          ranges.push([start, end]);
+          // If the range might intersect letters, then expand it.
+          // This case handling is too simplistic.
+          // It does not deal with non-latin case folding.
+          // It works for latin source code identifiers though.
+          if (!(end < 65 || start > 122)) {
+            if (!(end < 65 || start > 90)) {
+              ranges.push([Math.max(65, start) | 32, Math.min(end, 90) | 32]);
+            }
+            if (!(end < 97 || start > 122)) {
+              ranges.push([Math.max(97, start) & ~32, Math.min(end, 122) & ~32]);
+            }
+          }
+        }
+      }
+  
+      // [[1, 10], [3, 4], [8, 12], [14, 14], [16, 16], [17, 17]]
+      // -> [[1, 12], [14, 14], [16, 17]]
+      ranges.sort(function (a, b) { return (a[0] - b[0]) || (b[1]  - a[1]); });
+      var consolidatedRanges = [];
+      var lastRange = [];
+      for (var i = 0; i < ranges.length; ++i) {
+        var range = ranges[i];
+        if (range[0] <= lastRange[1] + 1) {
+          lastRange[1] = Math.max(lastRange[1], range[1]);
+        } else {
+          consolidatedRanges.push(lastRange = range);
+        }
+      }
+  
+      for (var i = 0; i < consolidatedRanges.length; ++i) {
+        var range = consolidatedRanges[i];
+        out.push(encodeEscape(range[0]));
+        if (range[1] > range[0]) {
+          if (range[1] + 1 > range[0]) { out.push('-'); }
+          out.push(encodeEscape(range[1]));
+        }
+      }
+      out.push(']');
+      return out.join('');
+    }
+  
+    function allowAnywhereFoldCaseAndRenumberGroups(regex) {
+      // Split into character sets, escape sequences, punctuation strings
+      // like ('(', '(?:', ')', '^'), and runs of characters that do not
+      // include any of the above.
+      var parts = regex.source.match(
+          new RegExp(
+              '(?:'
+              + '\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]'  // a character set
+              + '|\\\\u[A-Fa-f0-9]{4}'  // a unicode escape
+              + '|\\\\x[A-Fa-f0-9]{2}'  // a hex escape
+              + '|\\\\[0-9]+'  // a back-reference or octal escape
+              + '|\\\\[^ux0-9]'  // other escape sequence
+              + '|\\(\\?[:!=]'  // start of a non-capturing group
+              + '|[\\(\\)\\^]'  // start/end of a group, or line start
+              + '|[^\\x5B\\x5C\\(\\)\\^]+'  // run of other characters
+              + ')',
+              'g'));
+      var n = parts.length;
+  
+      // Maps captured group numbers to the number they will occupy in
+      // the output or to -1 if that has not been determined, or to
+      // undefined if they need not be capturing in the output.
+      var capturedGroups = [];
+  
+      // Walk over and identify back references to build the capturedGroups
+      // mapping.
+      for (var i = 0, groupIndex = 0; i < n; ++i) {
+        var p = parts[i];
+        if (p === '(') {
+          // groups are 1-indexed, so max group index is count of '('
+          ++groupIndex;
+        } else if ('\\' === p.charAt(0)) {
+          var decimalValue = +p.substring(1);
+          if (decimalValue) {
+            if (decimalValue <= groupIndex) {
+              capturedGroups[decimalValue] = -1;
+            } else {
+              // Replace with an unambiguous escape sequence so that
+              // an octal escape sequence does not turn into a backreference
+              // to a capturing group from an earlier regex.
+              parts[i] = encodeEscape(decimalValue);
+            }
+          }
+        }
+      }
+  
+      // Renumber groups and reduce capturing groups to non-capturing groups
+      // where possible.
+      for (var i = 1; i < capturedGroups.length; ++i) {
+        if (-1 === capturedGroups[i]) {
+          capturedGroups[i] = ++capturedGroupIndex;
+        }
+      }
+      for (var i = 0, groupIndex = 0; i < n; ++i) {
+        var p = parts[i];
+        if (p === '(') {
+          ++groupIndex;
+          if (!capturedGroups[groupIndex]) {
+            parts[i] = '(?:';
+          }
+        } else if ('\\' === p.charAt(0)) {
+          var decimalValue = +p.substring(1);
+          if (decimalValue && decimalValue <= groupIndex) {
+            parts[i] = '\\' + capturedGroups[decimalValue];
+          }
+        }
+      }
+  
+      // Remove any prefix anchors so that the output will match anywhere.
+      // ^^ really does mean an anchored match though.
+      for (var i = 0; i < n; ++i) {
+        if ('^' === parts[i] && '^' !== parts[i + 1]) { parts[i] = ''; }
+      }
+  
+      // Expand letters to groups to handle mixing of case-sensitive and
+      // case-insensitive patterns if necessary.
+      if (regex.ignoreCase && needToFoldCase) {
+        for (var i = 0; i < n; ++i) {
+          var p = parts[i];
+          var ch0 = p.charAt(0);
+          if (p.length >= 2 && ch0 === '[') {
+            parts[i] = caseFoldCharset(p);
+          } else if (ch0 !== '\\') {
+            // TODO: handle letters in numeric escapes.
+            parts[i] = p.replace(
+                /[a-zA-Z]/g,
+                function (ch) {
+                  var cc = ch.charCodeAt(0);
+                  return '[' + String.fromCharCode(cc & ~32, cc | 32) + ']';
+                });
+          }
+        }
+      }
+  
+      return parts.join('');
+    }
+  
+    var rewritten = [];
+    for (var i = 0, n = regexs.length; i < n; ++i) {
+      var regex = regexs[i];
+      if (regex.global || regex.multiline) { throw new Error('' + regex); }
+      rewritten.push(
+          '(?:' + allowAnywhereFoldCaseAndRenumberGroups(regex) + ')');
+    }
+  
+    return new RegExp(rewritten.join('|'), ignoreCase ? 'gi' : 'g');
+  }
+
+  /**
+   * Split markup into a string of source code and an array mapping ranges in
+   * that string to the text nodes in which they appear.
+   *
+   * <p>
+   * The HTML DOM structure:</p>
+   * <pre>
+   * (Element   "p"
+   *   (Element "b"
+   *     (Text  "print "))       ; #1
+   *   (Text    "'Hello '")      ; #2
+   *   (Element "br")            ; #3
+   *   (Text    "  + 'World';")) ; #4
+   * </pre>
+   * <p>
+   * corresponds to the HTML
+   * {@code <p><b>print </b>'Hello '<br>  + 'World';</p>}.</p>
+   *
+   * <p>
+   * It will produce the output:</p>
+   * <pre>
+   * {
+   *   sourceCode: "print 'Hello '\n  + 'World';",
+   *   //                     1          2
+   *   //           012345678901234 5678901234567
+   *   spans: [0, #1, 6, #2, 14, #3, 15, #4]
+   * }
+   * </pre>
+   * <p>
+   * where #1 is a reference to the {@code "print "} text node above, and so
+   * on for the other text nodes.
+   * </p>
+   *
+   * <p>
+   * The {@code} spans array is an array of pairs.  Even elements are the start
+   * indices of substrings, and odd elements are the text nodes (or BR elements)
+   * that contain the text for those substrings.
+   * Substrings continue until the next index or the end of the source.
+   * </p>
+   *
+   * @param {Node} node an HTML DOM subtree containing source-code.
+   * @param {boolean} isPreformatted true if white-space in text nodes should
+   *    be considered significant.
+   * @return {Object} source code and the text nodes in which they occur.
+   */
+  function extractSourceSpans(node, isPreformatted) {
+    var nocode = /(?:^|\s)nocode(?:\s|$)/;
+  
+    var chunks = [];
+    var length = 0;
+    var spans = [];
+    var k = 0;
+  
+    function walk(node) {
+      var type = node.nodeType;
+      if (type == 1) {  // Element
+        if (nocode.test(node.className)) { return; }
+        for (var child = node.firstChild; child; child = child.nextSibling) {
+          walk(child);
+        }
+        var nodeName = node.nodeName.toLowerCase();
+        if ('br' === nodeName || 'li' === nodeName) {
+          chunks[k] = '\n';
+          spans[k << 1] = length++;
+          spans[(k++ << 1) | 1] = node;
+        }
+      } else if (type == 3 || type == 4) {  // Text
+        var text = node.nodeValue;
+        if (text.length) {
+          if (!isPreformatted) {
+            text = text.replace(/[ \t\r\n]+/g, ' ');
+          } else {
+            text = text.replace(/\r\n?/g, '\n');  // Normalize newlines.
+          }
+          // TODO: handle tabs here?
+          chunks[k] = text;
+          spans[k << 1] = length;
+          length += text.length;
+          spans[(k++ << 1) | 1] = node;
+        }
+      }
+    }
+  
+    walk(node);
+  
+    return {
+      sourceCode: chunks.join('').replace(/\n$/, ''),
+      spans: spans
+    };
+  }
+
+  /**
+   * Apply the given language handler to sourceCode and add the resulting
+   * decorations to out.
+   * @param {number} basePos the index of sourceCode within the chunk of source
+   *    whose decorations are already present on out.
+   */
+  function appendDecorations(basePos, sourceCode, langHandler, out) {
+    if (!sourceCode) { return; }
+    var job = {
+      sourceCode: sourceCode,
+      basePos: basePos
+    };
+    langHandler(job);
+    out.push.apply(out, job.decorations);
+  }
+
+  var notWs = /\S/;
+
+  /**
+   * Given an element, if it contains only one child element and any text nodes
+   * it contains contain only space characters, return the sole child element.
+   * Otherwise returns undefined.
+   * <p>
+   * This is meant to return the CODE element in {@code <pre><code ...>} when
+   * there is a single child element that contains all the non-space textual
+   * content, but not to return anything where there are multiple child elements
+   * as in {@code <pre><code>...</code><code>...</code></pre>} or when there
+   * is textual content.
+   */
+  function childContentWrapper(element) {
+    var wrapper = undefined;
+    for (var c = element.firstChild; c; c = c.nextSibling) {
+      var type = c.nodeType;
+      wrapper = (type === 1)  // Element Node
+          ? (wrapper ? element : c)
+          : (type === 3)  // Text Node
+          ? (notWs.test(c.nodeValue) ? element : wrapper)
+          : wrapper;
+    }
+    return wrapper === element ? undefined : wrapper;
+  }
+
+  /** Given triples of [style, pattern, context] returns a lexing function,
+    * The lexing function interprets the patterns to find token boundaries and
+    * returns a decoration list of the form
+    * [index_0, style_0, index_1, style_1, ..., index_n, style_n]
+    * where index_n is an index into the sourceCode, and style_n is a style
+    * constant like PR_PLAIN.  index_n-1 <= index_n, and style_n-1 applies to
+    * all characters in sourceCode[index_n-1:index_n].
+    *
+    * The stylePatterns is a list whose elements have the form
+    * [style : string, pattern : RegExp, DEPRECATED, shortcut : string].
+    *
+    * Style is a style constant like PR_PLAIN, or can be a string of the
+    * form 'lang-FOO', where FOO is a language extension describing the
+    * language of the portion of the token in $1 after pattern executes.
+    * E.g., if style is 'lang-lisp', and group 1 contains the text
+    * '(hello (world))', then that portion of the token will be passed to the
+    * registered lisp handler for formatting.
+    * The text before and after group 1 will be restyled using this decorator
+    * so decorators should take care that this doesn't result in infinite
+    * recursion.  For example, the HTML lexer rule for SCRIPT elements looks
+    * something like ['lang-js', /<[s]cript>(.+?)<\/script>/].  This may match
+    * '<script>foo()<\/script>', which would cause the current decorator to
+    * be called with '<script>' which would not match the same rule since
+    * group 1 must not be empty, so it would be instead styled as PR_TAG by
+    * the generic tag rule.  The handler registered for the 'js' extension would
+    * then be called with 'foo()', and finally, the current decorator would
+    * be called with '<\/script>' which would not match the original rule and
+    * so the generic tag rule would identify it as a tag.
+    *
+    * Pattern must only match prefixes, and if it matches a prefix, then that
+    * match is considered a token with the same style.
+    *
+    * Context is applied to the last non-whitespace, non-comment token
+    * recognized.
+    *
+    * Shortcut is an optional string of characters, any of which, if the first
+    * character, gurantee that this pattern and only this pattern matches.
+    *
+    * @param {Array} shortcutStylePatterns patterns that always start with
+    *   a known character.  Must have a shortcut string.
+    * @param {Array} fallthroughStylePatterns patterns that will be tried in
+    *   order if the shortcut ones fail.  May have shortcuts.
+    *
+    * @return {function (Object)} a
+    *   function that takes source code and returns a list of decorations.
+    */
+  function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) {
+    var shortcuts = {};
+    var tokenizer;
+    (function () {
+      var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns);
+      var allRegexs = [];
+      var regexKeys = {};
+      for (var i = 0, n = allPatterns.length; i < n; ++i) {
+        var patternParts = allPatterns[i];
+        var shortcutChars = patternParts[3];
+        if (shortcutChars) {
+          for (var c = shortcutChars.length; --c >= 0;) {
+            shortcuts[shortcutChars.charAt(c)] = patternParts;
+          }
+        }
+        var regex = patternParts[1];
+        var k = '' + regex;
+        if (!regexKeys.hasOwnProperty(k)) {
+          allRegexs.push(regex);
+          regexKeys[k] = null;
+        }
+      }
+      allRegexs.push(/[\0-\uffff]/);
+      tokenizer = combinePrefixPatterns(allRegexs);
+    })();
+
+    var nPatterns = fallthroughStylePatterns.length;
+
+    /**
+     * Lexes job.sourceCode and produces an output array job.decorations of
+     * style classes preceded by the position at which they start in
+     * job.sourceCode in order.
+     *
+     * @param {Object} job an object like <pre>{
+     *    sourceCode: {string} sourceText plain text,
+     *    basePos: {int} position of job.sourceCode in the larger chunk of
+     *        sourceCode.
+     * }</pre>
+     */
+    var decorate = function (job) {
+      var sourceCode = job.sourceCode, basePos = job.basePos;
+      /** Even entries are positions in source in ascending order.  Odd enties
+        * are style markers (e.g., PR_COMMENT) that run from that position until
+        * the end.
+        * @type {Array.<number|string>}
+        */
+      var decorations = [basePos, PR_PLAIN];
+      var pos = 0;  // index into sourceCode
+      var tokens = sourceCode.match(tokenizer) || [];
+      var styleCache = {};
+
+      for (var ti = 0, nTokens = tokens.length; ti < nTokens; ++ti) {
+        var token = tokens[ti];
+        var style = styleCache[token];
+        var match = void 0;
+
+        var isEmbedded;
+        if (typeof style === 'string') {
+          isEmbedded = false;
+        } else {
+          var patternParts = shortcuts[token.charAt(0)];
+          if (patternParts) {
+            match = token.match(patternParts[1]);
+            style = patternParts[0];
+          } else {
+            for (var i = 0; i < nPatterns; ++i) {
+              patternParts = fallthroughStylePatterns[i];
+              match = token.match(patternParts[1]);
+              if (match) {
+                style = patternParts[0];
+                break;
+              }
+            }
+
+            if (!match) {  // make sure that we make progress
+              style = PR_PLAIN;
+            }
+          }
+
+          isEmbedded = style.length >= 5 && 'lang-' === style.substring(0, 5);
+          if (isEmbedded && !(match && typeof match[1] === 'string')) {
+            isEmbedded = false;
+            style = PR_SOURCE;
+          }
+
+          if (!isEmbedded) { styleCache[token] = style; }
+        }
+
+        var tokenStart = pos;
+        pos += token.length;
+
+        if (!isEmbedded) {
+          decorations.push(basePos + tokenStart, style);
+        } else {  // Treat group 1 as an embedded block of source code.
+          var embeddedSource = match[1];
+          var embeddedSourceStart = token.indexOf(embeddedSource);
+          var embeddedSourceEnd = embeddedSourceStart + embeddedSource.length;
+          if (match[2]) {
+            // If embeddedSource can be blank, then it would match at the
+            // beginning which would cause us to infinitely recurse on the
+            // entire token, so we catch the right context in match[2].
+            embeddedSourceEnd = token.length - match[2].length;
+            embeddedSourceStart = embeddedSourceEnd - embeddedSource.length;
+          }
+          var lang = style.substring(5);
+          // Decorate the left of the embedded source
+          appendDecorations(
+              basePos + tokenStart,
+              token.substring(0, embeddedSourceStart),
+              decorate, decorations);
+          // Decorate the embedded source
+          appendDecorations(
+              basePos + tokenStart + embeddedSourceStart,
+              embeddedSource,
+              langHandlerForExtension(lang, embeddedSource),
+              decorations);
+          // Decorate the right of the embedded section
+          appendDecorations(
+              basePos + tokenStart + embeddedSourceEnd,
+              token.substring(embeddedSourceEnd),
+              decorate, decorations);
+        }
+      }
+      job.decorations = decorations;
+    };
+    return decorate;
+  }
+
+  /** returns a function that produces a list of decorations from source text.
+    *
+    * This code treats ", ', and ` as string delimiters, and \ as a string
+    * escape.  It does not recognize perl's qq() style strings.
+    * It has no special handling for double delimiter escapes as in basic, or
+    * the tripled delimiters used in python, but should work on those regardless
+    * although in those cases a single string literal may be broken up into
+    * multiple adjacent string literals.
+    *
+    * It recognizes C, C++, and shell style comments.
+    *
+    * @param {Object} options a set of optional parameters.
+    * @return {function (Object)} a function that examines the source code
+    *     in the input job and builds the decoration list.
+    */
+  function sourceDecorator(options) {
+    var shortcutStylePatterns = [], fallthroughStylePatterns = [];
+    if (options['tripleQuotedStrings']) {
+      // '''multi-line-string''', 'single-line-string', and double-quoted
+      shortcutStylePatterns.push(
+          [PR_STRING,  /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,
+           null, '\'"']);
+    } else if (options['multiLineStrings']) {
+      // 'multi-line-string', "multi-line-string"
+      shortcutStylePatterns.push(
+          [PR_STRING,  /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,
+           null, '\'"`']);
+    } else {
+      // 'single-line-string', "single-line-string"
+      shortcutStylePatterns.push(
+          [PR_STRING,
+           /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,
+           null, '"\'']);
+    }
+    if (options['verbatimStrings']) {
+      // verbatim-string-literal production from the C# grammar.  See issue 93.
+      fallthroughStylePatterns.push(
+          [PR_STRING, /^@\"(?:[^\"]|\"\")*(?:\"|$)/, null]);
+    }
+    var hc = options['hashComments'];
+    if (hc) {
+      if (options['cStyleComments']) {
+        if (hc > 1) {  // multiline hash comments
+          shortcutStylePatterns.push(
+              [PR_COMMENT, /^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/, null, '#']);
+        } else {
+          // Stop C preprocessor declarations at an unclosed open comment
+          shortcutStylePatterns.push(
+              [PR_COMMENT, /^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,
+               null, '#']);
+        }
+        // #include <stdio.h>
+        fallthroughStylePatterns.push(
+            [PR_STRING,
+             /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,
+             null]);
+      } else {
+        shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']);
+      }
+    }
+    if (options['cStyleComments']) {
+      fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]);
+      fallthroughStylePatterns.push(
+          [PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]);
+    }
+    var regexLiterals = options['regexLiterals'];
+    if (regexLiterals) {
+      /**
+       * @const
+       */
+      var regexExcls = regexLiterals > 1
+        ? ''  // Multiline regex literals
+        : '\n\r';
+      /**
+       * @const
+       */
+      var regexAny = regexExcls ? '.' : '[\\S\\s]';
+      /**
+       * @const
+       */
+      var REGEX_LITERAL = (
+          // A regular expression literal starts with a slash that is
+          // not followed by * or / so that it is not confused with
+          // comments.
+          '/(?=[^/*' + regexExcls + '])'
+          // and then contains any number of raw characters,
+          + '(?:[^/\\x5B\\x5C' + regexExcls + ']'
+          // escape sequences (\x5C),
+          +    '|\\x5C' + regexAny
+          // or non-nesting character sets (\x5B\x5D);
+          +    '|\\x5B(?:[^\\x5C\\x5D' + regexExcls + ']'
+          +             '|\\x5C' + regexAny + ')*(?:\\x5D|$))+'
+          // finally closed by a /.
+          + '/');
+      fallthroughStylePatterns.push(
+          ['lang-regex',
+           RegExp('^' + REGEXP_PRECEDER_PATTERN + '(' + REGEX_LITERAL + ')')
+           ]);
+    }
+
+    var types = options['types'];
+    if (types) {
+      fallthroughStylePatterns.push([PR_TYPE, types]);
+    }
+
+    var keywords = ("" + options['keywords']).replace(/^ | $/g, '');
+    if (keywords.length) {
+      fallthroughStylePatterns.push(
+          [PR_KEYWORD,
+           new RegExp('^(?:' + keywords.replace(/[\s,]+/g, '|') + ')\\b'),
+           null]);
+    }
+
+    shortcutStylePatterns.push([PR_PLAIN,       /^\s+/, null, ' \r\n\t\xA0']);
+
+    var punctuation =
+      // The Bash man page says
+
+      // A word is a sequence of characters considered as a single
+      // unit by GRUB. Words are separated by metacharacters,
+      // which are the following plus space, tab, and newline: { }
+      // | & $ ; < >
+      // ...
+      
+      // A word beginning with # causes that word and all remaining
+      // characters on that line to be ignored.
+
+      // which means that only a '#' after /(?:^|[{}|&$;<>\s])/ starts a
+      // comment but empirically
+      // $ echo {#}
+      // {#}
+      // $ echo \$#
+      // $#
+      // $ echo }#
+      // }#
+
+      // so /(?:^|[|&;<>\s])/ is more appropriate.
+
+      // http://gcc.gnu.org/onlinedocs/gcc-2.95.3/cpp_1.html#SEC3
+      // suggests that this definition is compatible with a
+      // default mode that tries to use a single token definition
+      // to recognize both bash/python style comments and C
+      // preprocessor directives.
+
+      // This definition of punctuation does not include # in the list of
+      // follow-on exclusions, so # will not be broken before if preceeded
+      // by a punctuation character.  We could try to exclude # after
+      // [|&;<>] but that doesn't seem to cause many major problems.
+      // If that does turn out to be a problem, we should change the below
+      // when hc is truthy to include # in the run of punctuation characters
+      // only when not followint [|&;<>].
+      '^.[^\\s\\w.$@\'"`/\\\\]*';
+    if (options['regexLiterals']) {
+      punctuation += '(?!\s*\/)';
+    }
+
+    fallthroughStylePatterns.push(
+        // TODO(mikesamuel): recognize non-latin letters and numerals in idents
+        [PR_LITERAL,     /^@[a-z_$][a-z_$@0-9]*/i, null],
+        [PR_TYPE,        /^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/, null],
+        [PR_PLAIN,       /^[a-z_$][a-z_$@0-9]*/i, null],
+        [PR_LITERAL,
+         new RegExp(
+             '^(?:'
+             // A hex number
+             + '0x[a-f0-9]+'
+             // or an octal or decimal number,
+             + '|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)'
+             // possibly in scientific notation
+             + '(?:e[+\\-]?\\d+)?'
+             + ')'
+             // with an optional modifier like UL for unsigned long
+             + '[a-z]*', 'i'),
+         null, '0123456789'],
+        // Don't treat escaped quotes in bash as starting strings.
+        // See issue 144.
+        [PR_PLAIN,       /^\\[\s\S]?/, null],
+        [PR_PUNCTUATION, new RegExp(punctuation), null]);
+
+    return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns);
+  }
+
+  var decorateSource = sourceDecorator({
+        'keywords': ALL_KEYWORDS,
+        'hashComments': true,
+        'cStyleComments': true,
+        'multiLineStrings': true,
+        'regexLiterals': true
+      });
+
+  /**
+   * Given a DOM subtree, wraps it in a list, and puts each line into its own
+   * list item.
+   *
+   * @param {Node} node modified in place.  Its content is pulled into an
+   *     HTMLOListElement, and each line is moved into a separate list item.
+   *     This requires cloning elements, so the input might not have unique
+   *     IDs after numbering.
+   * @param {boolean} isPreformatted true iff white-space in text nodes should
+   *     be treated as significant.
+   */
+  function numberLines(node, opt_startLineNum, isPreformatted) {
+    var nocode = /(?:^|\s)nocode(?:\s|$)/;
+    var lineBreak = /\r\n?|\n/;
+  
+    var document = node.ownerDocument;
+  
+    var li = document.createElement('li');
+    while (node.firstChild) {
+      li.appendChild(node.firstChild);
+    }
+    // An array of lines.  We split below, so this is initialized to one
+    // un-split line.
+    var listItems = [li];
+  
+    function walk(node) {
+      var type = node.nodeType;
+      if (type == 1 && !nocode.test(node.className)) {  // Element
+        if ('br' === node.nodeName) {
+          breakAfter(node);
+          // Discard the <BR> since it is now flush against a </LI>.
+          if (node.parentNode) {
+            node.parentNode.removeChild(node);
+          }
+        } else {
+          for (var child = node.firstChild; child; child = child.nextSibling) {
+            walk(child);
+          }
+        }
+      } else if ((type == 3 || type == 4) && isPreformatted) {  // Text
+        var text = node.nodeValue;
+        var match = text.match(lineBreak);
+        if (match) {
+          var firstLine = text.substring(0, match.index);
+          node.nodeValue = firstLine;
+          var tail = text.substring(match.index + match[0].length);
+          if (tail) {
+            var parent = node.parentNode;
+            parent.insertBefore(
+              document.createTextNode(tail), node.nextSibling);
+          }
+          breakAfter(node);
+          if (!firstLine) {
+            // Don't leave blank text nodes in the DOM.
+            node.parentNode.removeChild(node);
+          }
+        }
+      }
+    }
+  
+    // Split a line after the given node.
+    function breakAfter(lineEndNode) {
+      // If there's nothing to the right, then we can skip ending the line
+      // here, and move root-wards since splitting just before an end-tag
+      // would require us to create a bunch of empty copies.
+      while (!lineEndNode.nextSibling) {
+        lineEndNode = lineEndNode.parentNode;
+        if (!lineEndNode) { return; }
+      }
+  
+      function breakLeftOf(limit, copy) {
+        // Clone shallowly if this node needs to be on both sides of the break.
+        var rightSide = copy ? limit.cloneNode(false) : limit;
+        var parent = limit.parentNode;
+        if (parent) {
+          // We clone the parent chain.
+          // This helps us resurrect important styling elements that cross lines.
+          // E.g. in <i>Foo<br>Bar</i>
+          // should be rewritten to <li><i>Foo</i></li><li><i>Bar</i></li>.
+          var parentClone = breakLeftOf(parent, 1);
+          // Move the clone and everything to the right of the original
+          // onto the cloned parent.
+          var next = limit.nextSibling;
+          parentClone.appendChild(rightSide);
+          for (var sibling = next; sibling; sibling = next) {
+            next = sibling.nextSibling;
+            parentClone.appendChild(sibling);
+          }
+        }
+        return rightSide;
+      }
+  
+      var copiedListItem = breakLeftOf(lineEndNode.nextSibling, 0);
+  
+      // Walk the parent chain until we reach an unattached LI.
+      for (var parent;
+           // Check nodeType since IE invents document fragments.
+           (parent = copiedListItem.parentNode) && parent.nodeType === 1;) {
+        copiedListItem = parent;
+      }
+      // Put it on the list of lines for later processing.
+      listItems.push(copiedListItem);
+    }
+  
+    // Split lines while there are lines left to split.
+    for (var i = 0;  // Number of lines that have been split so far.
+         i < listItems.length;  // length updated by breakAfter calls.
+         ++i) {
+      walk(listItems[i]);
+    }
+  
+    // Make sure numeric indices show correctly.
+    if (opt_startLineNum === (opt_startLineNum|0)) {
+      listItems[0].setAttribute('value', opt_startLineNum);
+    }
+  
+    var ol = document.createElement('ol');
+    ol.className = 'linenums';
+    var offset = Math.max(0, ((opt_startLineNum - 1 /* zero index */)) | 0) || 0;
+    for (var i = 0, n = listItems.length; i < n; ++i) {
+      li = listItems[i];
+      // Stick a class on the LIs so that stylesheets can
+      // color odd/even rows, or any other row pattern that
+      // is co-prime with 10.
+      li.className = 'L' + ((i + offset) % 10);
+      if (!li.firstChild) {
+        li.appendChild(document.createTextNode('\xA0'));
+      }
+      ol.appendChild(li);
+    }
+  
+    node.appendChild(ol);
+  }
+  /**
+   * Breaks {@code job.sourceCode} around style boundaries in
+   * {@code job.decorations} and modifies {@code job.sourceNode} in place.
+   * @param {Object} job like <pre>{
+   *    sourceCode: {string} source as plain text,
+   *    sourceNode: {HTMLElement} the element containing the source,
+   *    spans: {Array.<number|Node>} alternating span start indices into source
+   *       and the text node or element (e.g. {@code <BR>}) corresponding to that
+   *       span.
+   *    decorations: {Array.<number|string} an array of style classes preceded
+   *       by the position at which they start in job.sourceCode in order
+   * }</pre>
+   * @private
+   */
+  function recombineTagsAndDecorations(job) {
+    var isIE8OrEarlier = /\bMSIE\s(\d+)/.exec(navigator.userAgent);
+    isIE8OrEarlier = isIE8OrEarlier && +isIE8OrEarlier[1] <= 8;
+    var newlineRe = /\n/g;
+  
+    var source = job.sourceCode;
+    var sourceLength = source.length;
+    // Index into source after the last code-unit recombined.
+    var sourceIndex = 0;
+  
+    var spans = job.spans;
+    var nSpans = spans.length;
+    // Index into spans after the last span which ends at or before sourceIndex.
+    var spanIndex = 0;
+  
+    var decorations = job.decorations;
+    var nDecorations = decorations.length;
+    // Index into decorations after the last decoration which ends at or before
+    // sourceIndex.
+    var decorationIndex = 0;
+  
+    // Remove all zero-length decorations.
+    decorations[nDecorations] = sourceLength;
+    var decPos, i;
+    for (i = decPos = 0; i < nDecorations;) {
+      if (decorations[i] !== decorations[i + 2]) {
+        decorations[decPos++] = decorations[i++];
+        decorations[decPos++] = decorations[i++];
+      } else {
+        i += 2;
+      }
+    }
+    nDecorations = decPos;
+  
+    // Simplify decorations.
+    for (i = decPos = 0; i < nDecorations;) {
+      var startPos = decorations[i];
+      // Conflate all adjacent decorations that use the same style.
+      var startDec = decorations[i + 1];
+      var end = i + 2;
+      while (end + 2 <= nDecorations && decorations[end + 1] === startDec) {
+        end += 2;
+      }
+      decorations[decPos++] = startPos;
+      decorations[decPos++] = startDec;
+      i = end;
+    }
+  
+    nDecorations = decorations.length = decPos;
+  
+    var sourceNode = job.sourceNode;
+    var oldDisplay;
+    if (sourceNode) {
+      oldDisplay = sourceNode.style.display;
+      sourceNode.style.display = 'none';
+    }
+    try {
+      var decoration = null;
+      while (spanIndex < nSpans) {
+        var spanStart = spans[spanIndex];
+        var spanEnd = spans[spanIndex + 2] || sourceLength;
+  
+        var decEnd = decorations[decorationIndex + 2] || sourceLength;
+  
+        var end = Math.min(spanEnd, decEnd);
+  
+        var textNode = spans[spanIndex + 1];
+        var styledText;
+        if (textNode.nodeType !== 1  // Don't muck with <BR>s or <LI>s
+            // Don't introduce spans around empty text nodes.
+            && (styledText = source.substring(sourceIndex, end))) {
+          // This may seem bizarre, and it is.  Emitting LF on IE causes the
+          // code to display with spaces instead of line breaks.
+          // Emitting Windows standard issue linebreaks (CRLF) causes a blank
+          // space to appear at the beginning of every line but the first.
+          // Emitting an old Mac OS 9 line separator makes everything spiffy.
+          if (isIE8OrEarlier) {
+            styledText = styledText.replace(newlineRe, '\r');
+          }
+          textNode.nodeValue = styledText;
+          var document = textNode.ownerDocument;
+          var span = document.createElement('span');
+          span.className = decorations[decorationIndex + 1];
+          var parentNode = textNode.parentNode;
+          parentNode.replaceChild(span, textNode);
+          span.appendChild(textNode);
+          if (sourceIndex < spanEnd) {  // Split off a text node.
+            spans[spanIndex + 1] = textNode
+                // TODO: Possibly optimize by using '' if there's no flicker.
+                = document.createTextNode(source.substring(end, spanEnd));
+            parentNode.insertBefore(textNode, span.nextSibling);
+          }
+        }
+  
+        sourceIndex = end;
+  
+        if (sourceIndex >= spanEnd) {
+          spanIndex += 2;
+        }
+        if (sourceIndex >= decEnd) {
+          decorationIndex += 2;
+        }
+      }
+    } finally {
+      if (sourceNode) {
+        sourceNode.style.display = oldDisplay;
+      }
+    }
+  }
+
+  /** Maps language-specific file extensions to handlers. */
+  var langHandlerRegistry = {};
+  /** Register a language handler for the given file extensions.
+    * @param {function (Object)} handler a function from source code to a list
+    *      of decorations.  Takes a single argument job which describes the
+    *      state of the computation.   The single parameter has the form
+    *      {@code {
+    *        sourceCode: {string} as plain text.
+    *        decorations: {Array.<number|string>} an array of style classes
+    *                     preceded by the position at which they start in
+    *                     job.sourceCode in order.
+    *                     The language handler should assigned this field.
+    *        basePos: {int} the position of source in the larger source chunk.
+    *                 All positions in the output decorations array are relative
+    *                 to the larger source chunk.
+    *      } }
+    * @param {Array.<string>} fileExtensions
+    */
+  function registerLangHandler(handler, fileExtensions) {
+    for (var i = fileExtensions.length; --i >= 0;) {
+      var ext = fileExtensions[i];
+      if (!langHandlerRegistry.hasOwnProperty(ext)) {
+        langHandlerRegistry[ext] = handler;
+      } else if (win['console']) {
+        console['warn']('cannot override language handler %s', ext);
+      }
+    }
+  }
+  function langHandlerForExtension(extension, source) {
+    if (!(extension && langHandlerRegistry.hasOwnProperty(extension))) {
+      // Treat it as markup if the first non whitespace character is a < and
+      // the last non-whitespace character is a >.
+      extension = /^\s*</.test(source)
+          ? 'default-markup'
+          : 'default-code';
+    }
+    return langHandlerRegistry[extension];
+  }
+  registerLangHandler(decorateSource, ['default-code']);
+  registerLangHandler(
+      createSimpleLexer(
+          [],
+          [
+           [PR_PLAIN,       /^[^<?]+/],
+           [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/],
+           [PR_COMMENT,     /^<\!--[\s\S]*?(?:-\->|$)/],
+           // Unescaped content in an unknown language
+           ['lang-',        /^<\?([\s\S]+?)(?:\?>|$)/],
+           ['lang-',        /^<%([\s\S]+?)(?:%>|$)/],
+           [PR_PUNCTUATION, /^(?:<[%?]|[%?]>)/],
+           ['lang-',        /^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],
+           // Unescaped content in javascript.  (Or possibly vbscript).
+           ['lang-js',      /^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],
+           // Contains unescaped stylesheet content
+           ['lang-css',     /^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],
+           ['lang-in.tag',  /^(<\/?[a-z][^<>]*>)/i]
+          ]),
+      ['default-markup', 'htm', 'html', 'mxml', 'xhtml', 'xml', 'xsl']);
+  registerLangHandler(
+      createSimpleLexer(
+          [
+           [PR_PLAIN,        /^[\s]+/, null, ' \t\r\n'],
+           [PR_ATTRIB_VALUE, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, '\"\'']
+           ],
+          [
+           [PR_TAG,          /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],
+           [PR_ATTRIB_NAME,  /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],
+           ['lang-uq.val',   /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],
+           [PR_PUNCTUATION,  /^[=<>\/]+/],
+           ['lang-js',       /^on\w+\s*=\s*\"([^\"]+)\"/i],
+           ['lang-js',       /^on\w+\s*=\s*\'([^\']+)\'/i],
+           ['lang-js',       /^on\w+\s*=\s*([^\"\'>\s]+)/i],
+           ['lang-css',      /^style\s*=\s*\"([^\"]+)\"/i],
+           ['lang-css',      /^style\s*=\s*\'([^\']+)\'/i],
+           ['lang-css',      /^style\s*=\s*([^\"\'>\s]+)/i]
+           ]),
+      ['in.tag']);
+  registerLangHandler(
+      createSimpleLexer([], [[PR_ATTRIB_VALUE, /^[\s\S]+/]]), ['uq.val']);
+  registerLangHandler(sourceDecorator({
+          'keywords': CPP_KEYWORDS,
+          'hashComments': true,
+          'cStyleComments': true,
+          'types': C_TYPES
+        }), ['c', 'cc', 'cpp', 'cxx', 'cyc', 'm']);
+  registerLangHandler(sourceDecorator({
+          'keywords': 'null,true,false'
+        }), ['json']);
+  registerLangHandler(sourceDecorator({
+          'keywords': CSHARP_KEYWORDS,
+          'hashComments': true,
+          'cStyleComments': true,
+          'verbatimStrings': true,
+          'types': C_TYPES
+        }), ['cs']);
+  registerLangHandler(sourceDecorator({
+          'keywords': JAVA_KEYWORDS,
+          'cStyleComments': true
+        }), ['java']);
+  registerLangHandler(sourceDecorator({
+          'keywords': SH_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true
+        }), ['bash', 'bsh', 'csh', 'sh']);
+  registerLangHandler(sourceDecorator({
+          'keywords': PYTHON_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'tripleQuotedStrings': true
+        }), ['cv', 'py', 'python']);
+  registerLangHandler(sourceDecorator({
+          'keywords': PERL_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'regexLiterals': 2  // multiline regex literals
+        }), ['perl', 'pl', 'pm']);
+  registerLangHandler(sourceDecorator({
+          'keywords': RUBY_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'regexLiterals': true
+        }), ['rb', 'ruby']);
+  registerLangHandler(sourceDecorator({
+          'keywords': JSCRIPT_KEYWORDS,
+          'cStyleComments': true,
+          'regexLiterals': true
+        }), ['javascript', 'js']);
+  registerLangHandler(sourceDecorator({
+          'keywords': COFFEE_KEYWORDS,
+          'hashComments': 3,  // ### style block comments
+          'cStyleComments': true,
+          'multilineStrings': true,
+          'tripleQuotedStrings': true,
+          'regexLiterals': true
+        }), ['coffee']);
+  registerLangHandler(sourceDecorator({
+          'keywords': RUST_KEYWORDS,
+          'cStyleComments': true,
+          'multilineStrings': true
+        }), ['rc', 'rs', 'rust']);
+  registerLangHandler(
+      createSimpleLexer([], [[PR_STRING, /^[\s\S]+/]]), ['regex']);
+
+  function applyDecorator(job) {
+    var opt_langExtension = job.langExtension;
+
+    try {
+      // Extract tags, and convert the source code to plain text.
+      var sourceAndSpans = extractSourceSpans(job.sourceNode, job.pre);
+      /** Plain text. @type {string} */
+      var source = sourceAndSpans.sourceCode;
+      job.sourceCode = source;
+      job.spans = sourceAndSpans.spans;
+      job.basePos = 0;
+
+      // Apply the appropriate language handler
+      langHandlerForExtension(opt_langExtension, source)(job);
+
+      // Integrate the decorations and tags back into the source code,
+      // modifying the sourceNode in place.
+      recombineTagsAndDecorations(job);
+    } catch (e) {
+      if (win['console']) {
+        console['log'](e && e['stack'] || e);
+      }
+    }
+  }
+
+  /**
+   * Pretty print a chunk of code.
+   * @param sourceCodeHtml {string} The HTML to pretty print.
+   * @param opt_langExtension {string} The language name to use.
+   *     Typically, a filename extension like 'cpp' or 'java'.
+   * @param opt_numberLines {number|boolean} True to number lines,
+   *     or the 1-indexed number of the first line in sourceCodeHtml.
+   */
+  function $prettyPrintOne(sourceCodeHtml, opt_langExtension, opt_numberLines) {
+    var container = document.createElement('div');
+    // This could cause images to load and onload listeners to fire.
+    // E.g. <img onerror="alert(1337)" src="nosuchimage.png">.
+    // We assume that the inner HTML is from a trusted source.
+    // The pre-tag is required for IE8 which strips newlines from innerHTML
+    // when it is injected into a <pre> tag.
+    // http://stackoverflow.com/questions/451486/pre-tag-loses-line-breaks-when-setting-innerhtml-in-ie
+    // http://stackoverflow.com/questions/195363/inserting-a-newline-into-a-pre-tag-ie-javascript
+    container.innerHTML = '<pre>' + sourceCodeHtml + '</pre>';
+    container = container.firstChild;
+    if (opt_numberLines) {
+      numberLines(container, opt_numberLines, true);
+    }
+
+    var job = {
+      langExtension: opt_langExtension,
+      numberLines: opt_numberLines,
+      sourceNode: container,
+      pre: 1
+    };
+    applyDecorator(job);
+    return container.innerHTML;
+  }
+
+   /**
+    * Find all the {@code <pre>} and {@code <code>} tags in the DOM with
+    * {@code class=prettyprint} and prettify them.
+    *
+    * @param {Function} opt_whenDone called when prettifying is done.
+    * @param {HTMLElement|HTMLDocument} opt_root an element or document
+    *   containing all the elements to pretty print.
+    *   Defaults to {@code document.body}.
+    */
+  function $prettyPrint(opt_whenDone, opt_root) {
+    var root = opt_root || document.body;
+    var doc = root.ownerDocument || document;
+    function byTagName(tn) { return root.getElementsByTagName(tn); }
+    // fetch a list of nodes to rewrite
+    var codeSegments = [byTagName('pre'), byTagName('code'), byTagName('xmp')];
+    var elements = [];
+    for (var i = 0; i < codeSegments.length; ++i) {
+      for (var j = 0, n = codeSegments[i].length; j < n; ++j) {
+        elements.push(codeSegments[i][j]);
+      }
+    }
+    codeSegments = null;
+
+    var clock = Date;
+    if (!clock['now']) {
+      clock = { 'now': function () { return +(new Date); } };
+    }
+
+    // The loop is broken into a series of continuations to make sure that we
+    // don't make the browser unresponsive when rewriting a large page.
+    var k = 0;
+    var prettyPrintingJob;
+
+    var langExtensionRe = /\blang(?:uage)?-([\w.]+)(?!\S)/;
+    var prettyPrintRe = /\bprettyprint\b/;
+    var prettyPrintedRe = /\bprettyprinted\b/;
+    var preformattedTagNameRe = /pre|xmp/i;
+    var codeRe = /^code$/i;
+    var preCodeXmpRe = /^(?:pre|code|xmp)$/i;
+    var EMPTY = {};
+
+    function doWork() {
+      var endTime = (win['PR_SHOULD_USE_CONTINUATION'] ?
+                     clock['now']() + 250 /* ms */ :
+                     Infinity);
+      for (; k < elements.length && clock['now']() < endTime; k++) {
+        var cs = elements[k];
+
+        // Look for a preceding comment like
+        // <?prettify lang="..." linenums="..."?>
+        var attrs = EMPTY;
+        {
+          for (var preceder = cs; (preceder = preceder.previousSibling);) {
+            var nt = preceder.nodeType;
+            // <?foo?> is parsed by HTML 5 to a comment node (8)
+            // like <!--?foo?-->, but in XML is a processing instruction
+            var value = (nt === 7 || nt === 8) && preceder.nodeValue;
+            if (value
+                ? !/^\??prettify\b/.test(value)
+                : (nt !== 3 || /\S/.test(preceder.nodeValue))) {
+              // Skip over white-space text nodes but not others.
+              break;
+            }
+            if (value) {
+              attrs = {};
+              value.replace(
+                  /\b(\w+)=([\w:.%+-]+)/g,
+                function (_, name, value) { attrs[name] = value; });
+              break;
+            }
+          }
+        }
+
+        var className = cs.className;
+        if ((attrs !== EMPTY || prettyPrintRe.test(className))
+            // Don't redo this if we've already done it.
+            // This allows recalling pretty print to just prettyprint elements
+            // that have been added to the page since last call.
+            && !prettyPrintedRe.test(className)) {
+
+          // make sure this is not nested in an already prettified element
+          var nested = false;
+          for (var p = cs.parentNode; p; p = p.parentNode) {
+            var tn = p.tagName;
+            if (preCodeXmpRe.test(tn)
+                && p.className && prettyPrintRe.test(p.className)) {
+              nested = true;
+              break;
+            }
+          }
+          if (!nested) {
+            // Mark done.  If we fail to prettyprint for whatever reason,
+            // we shouldn't try again.
+            cs.className += ' prettyprinted';
+
+            // If the classes includes a language extensions, use it.
+            // Language extensions can be specified like
+            //     <pre class="prettyprint lang-cpp">
+            // the language extension "cpp" is used to find a language handler
+            // as passed to PR.registerLangHandler.
+            // HTML5 recommends that a language be specified using "language-"
+            // as the prefix instead.  Google Code Prettify supports both.
+            // http://dev.w3.org/html5/spec-author-view/the-code-element.html
+            var langExtension = attrs['lang'];
+            if (!langExtension) {
+              langExtension = className.match(langExtensionRe);
+              // Support <pre class="prettyprint"><code class="language-c">
+              var wrapper;
+              if (!langExtension && (wrapper = childContentWrapper(cs))
+                  && codeRe.test(wrapper.tagName)) {
+                langExtension = wrapper.className.match(langExtensionRe);
+              }
+
+              if (langExtension) { langExtension = langExtension[1]; }
+            }
+
+            var preformatted;
+            if (preformattedTagNameRe.test(cs.tagName)) {
+              preformatted = 1;
+            } else {
+              var currentStyle = cs['currentStyle'];
+              var defaultView = doc.defaultView;
+              var whitespace = (
+                  currentStyle
+                  ? currentStyle['whiteSpace']
+                  : (defaultView
+                     && defaultView.getComputedStyle)
+                  ? defaultView.getComputedStyle(cs, null)
+                  .getPropertyValue('white-space')
+                  : 0);
+              preformatted = whitespace
+                  && 'pre' === whitespace.substring(0, 3);
+            }
+
+            // Look for a class like linenums or linenums:<n> where <n> is the
+            // 1-indexed number of the first line.
+            var lineNums = attrs['linenums'];
+            if (!(lineNums = lineNums === 'true' || +lineNums)) {
+              lineNums = className.match(/\blinenums\b(?::(\d+))?/);
+              lineNums =
+                lineNums
+                ? lineNums[1] && lineNums[1].length
+                  ? +lineNums[1] : true
+                : false;
+            }
+            if (lineNums) { numberLines(cs, lineNums, preformatted); }
+
+            // do the pretty printing
+            prettyPrintingJob = {
+              langExtension: langExtension,
+              sourceNode: cs,
+              numberLines: lineNums,
+              pre: preformatted
+            };
+            applyDecorator(prettyPrintingJob);
+          }
+        }
+      }
+      if (k < elements.length) {
+        // finish up in a continuation
+        setTimeout(doWork, 250);
+      } else if ('function' === typeof opt_whenDone) {
+        opt_whenDone();
+      }
+    }
+
+    doWork();
+  }
+
+  /**
+   * Contains functions for creating and registering new language handlers.
+   * @type {Object}
+   */
+  var PR = win['PR'] = {
+        'createSimpleLexer': createSimpleLexer,
+        'registerLangHandler': registerLangHandler,
+        'sourceDecorator': sourceDecorator,
+        'PR_ATTRIB_NAME': PR_ATTRIB_NAME,
+        'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE,
+        'PR_COMMENT': PR_COMMENT,
+        'PR_DECLARATION': PR_DECLARATION,
+        'PR_KEYWORD': PR_KEYWORD,
+        'PR_LITERAL': PR_LITERAL,
+        'PR_NOCODE': PR_NOCODE,
+        'PR_PLAIN': PR_PLAIN,
+        'PR_PUNCTUATION': PR_PUNCTUATION,
+        'PR_SOURCE': PR_SOURCE,
+        'PR_STRING': PR_STRING,
+        'PR_TAG': PR_TAG,
+        'PR_TYPE': PR_TYPE,
+        'prettyPrintOne':
+           IN_GLOBAL_SCOPE
+             ? (win['prettyPrintOne'] = $prettyPrintOne)
+             : (prettyPrintOne = $prettyPrintOne),
+        'prettyPrint': prettyPrint =
+           IN_GLOBAL_SCOPE
+             ? (win['prettyPrint'] = $prettyPrint)
+             : (prettyPrint = $prettyPrint)
+      };
+
+  // Make PR available via the Asynchronous Module Definition (AMD) API.
+  // Per https://github.com/amdjs/amdjs-api/wiki/AMD:
+  // The Asynchronous Module Definition (AMD) API specifies a
+  // mechanism for defining modules such that the module and its
+  // dependencies can be asynchronously loaded.
+  // ...
+  // To allow a clear indicator that a global define function (as
+  // needed for script src browser loading) conforms to the AMD API,
+  // any global define function SHOULD have a property called "amd"
+  // whose value is an object. This helps avoid conflict with any
+  // other existing JavaScript code that could have defined a define()
+  // function that does not conform to the AMD API.
+  if (typeof define === "function" && define['amd']) {
+    define("google-code-prettify", [], function () {
+      return PR; 
+    });
+  }
+})();
diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css
new file mode 100644
index 000000000..ffd4802fb
--- /dev/null
+++ b/public/stylesheets/prettify.css
@@ -0,0 +1,77 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+/* SPAN elements with the classes below are added by prettyprint. */
+.pln { color: #000 }  /* plain text */
+
+@media screen {
+  .str { color: #080 }  /* string content */
+  .kwd { color: #008 }  /* a keyword */
+  .com { color: #800 }  /* a comment */
+  .typ { color: #606 }  /* a type name */
+  .lit { color: #066 }  /* a literal value */
+  /* punctuation, lisp open bracket, lisp close bracket */
+  .pun, .opn, .clo { color: #660 }
+  .tag { color: #008 }  /* a markup tag name */
+  .atn { color: #606 }  /* a markup attribute name */
+  .atv { color: #080 }  /* a markup attribute value */
+  .dec, .var { color: #606 }  /* a declaration; a variable name */
+  .fun { color: red }  /* a function name */
+}
+
+/* Use higher contrast and text-weight for printable form. */
+@media print, projection {
+  .str { color: #060 }
+  .kwd { color: #006; font-weight: bold }
+  .com { color: #600; font-style: italic }
+  .typ { color: #404; font-weight: bold }
+  .lit { color: #044 }
+  .pun, .opn, .clo { color: #440 }
+  .tag { color: #006; font-weight: bold }
+  .atn { color: #404 }
+  .atv { color: #060 }
+}
+
+/* Put a border around prettyprinted code snippets. */
+pre.prettyprint { padding: 2px;
+    border-left:30px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    border-right: 1px solid #ccc,
+    border-top: 1px solid #ccc }
+
+pre li,ul,ol {
+    list-style-type: decimal;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 3px } /* IE indents via margin-left */
+li.L0,
+li.L1,
+li.L2,
+li.L3,
+li.L5,
+li.L6,
+li.L7,
+li.L8 { list-style-type: decimal; }
+/* Alternate shading for lines */
+li.L1,
+li.L3,
+li.L5,
+li.L7,
+li.L9 { background: #eee }
+
+.prettyprint *{font-family:'courier new',monospace;}
+/*.prettyprint .com { color: #93a1a1; }*/
+/*.prettyprint .lit { color: #AE81FF; }*/
+/*.prettyprint .pun,*/
+/*.prettyprint .opn,*/
+/*.prettyprint .clo { color: #F8F8F2; }*/
+/*.prettyprint .fun { color: #dc322f; }*/
+/*.prettyprint .str,*/
+/*.prettyprint .atv { color: #E6DB74; }*/
+/*.prettyprint .kwd,*/
+/*.prettyprint .tag { color: #F92659; }*/
+/*.prettyprint .typ,*/
+/*.prettyprint .atn,*/
+/*.prettyprint .dec,*/
+/*.prettyprint .var { color: #A6E22E; }*/
+/*.prettyprint .pln { color: #66D9EF; }*/

From 06fea1bf1dabbf7110932ac7e381d0ef978cf501 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 10 Sep 2015 15:47:51 +0800
Subject: [PATCH 048/101] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 36392c7ac..c59930742 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -53,7 +53,7 @@
           </li>
           <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
           <li class="homepageNewsContent fl">
-            <%= link_to usm.content, {:controller => 'system_messages', :action => 'index'},
+            <%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
                         :class =>"newsGrey",
                         :title => "#{usm.content.html_safe}" %></li>
           <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
@@ -323,7 +323,7 @@
                     </li>
                     <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
                     <li class="homepageNewsContent fl">
-                      <%= link_to ma.content, {:controller => 'system_messages', :action => 'index'},
+                      <%= link_to ma.content.html_safe, {:controller => 'system_messages', :action => 'index'},
                                   :class =>"newsGrey",
                                   :title => "#{ma.content.html_safe}" %></li>
                     <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>

From 80e38287dd38d1ed221f39d29baafc64eb4e25dc Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 10 Sep 2015 16:38:45 +0800
Subject: [PATCH 049/101] =?UTF-8?q?=E6=89=80=E6=9C=89baselayout=E9=83=BD?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5prttefy.css=20.js=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base.html.erb           |  4 ++--
 app/views/layouts/base_courses.html.erb   |  4 ++--
 app/views/layouts/base_forums.html.erb    |  4 ++--
 app/views/layouts/base_memos.html.erb     |  4 ++--
 app/views/layouts/base_tags.html.erb      |  3 ++-
 app/views/layouts/base_users.html.erb     |  4 ++--
 app/views/layouts/base_users_new.html.erb |  4 ++--
 app/views/layouts/course_base.html.erb    |  4 ++--
 app/views/layouts/new_base.html.erb       |  4 ++--
 app/views/layouts/new_base_user.html.erb  |  4 ++--
 app/views/layouts/static_base.html.erb    |  4 ++--
 app/views/layouts/users_base.html.erb     |  4 ++--
 app/views/users/_resources_list.html.erb  |  2 +-
 db/schema.rb                              | 10 ++++++++++
 public/stylesheets/new_user.css           |  8 ++++----
 15 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index ae44bf0ac..fbc545607 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -8,11 +8,11 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "jquery.leanModal.min" %>
-<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
+<%= javascript_include_tag 'seems_rateable/jRating','prettify', 'seems_rateable/rateable'%>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c2f159f28..7841ead91 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -17,8 +17,8 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses','header'%>
-  <%= javascript_include_tag "course","header","attachments" %>
+  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2','prettify', 'courses','header'%>
+  <%= javascript_include_tag "course","header","attachments",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 7cd0022ea..c68e917f5 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -7,10 +7,10 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
-    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'prettify' %>
 		<%= heads_for_theme %>
 
 		<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index 2831d642e..02cdf4485 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -7,12 +7,12 @@
 	<meta name="keywords" content="issue,bug,tracker" />
 	<%= csrf_meta_tag %>
 	<%= favicon %>
-	<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+	<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
 	<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 	<%= javascript_heads %>
 	<%= heads_for_theme %>
 	<%= call_hook :view_layouts_base_html_head %>
-	<%= javascript_include_tag "ckeditor/ckeditor.js" %>
+	<%= javascript_include_tag "ckeditor/ckeditor.js",'prettify' %>
 	<!-- page specific tags -->
 	<%= yield :header_tags -%>
   <%= stylesheet_link_tag 'base','header', :media => 'all'%>
diff --git a/app/views/layouts/base_tags.html.erb b/app/views/layouts/base_tags.html.erb
index 3fd00e042..7fb129cb2 100644
--- a/app/views/layouts/base_tags.html.erb
+++ b/app/views/layouts/base_tags.html.erb
@@ -12,8 +12,9 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_include_tag 'prettify' %>
 <%= javascript_heads %>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 5686c9a1b..f0a433205 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -13,10 +13,10 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
-
+      <%= javascript_include_tag 'prettify' %>
 		<%= heads_for_theme %>
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index e4fe188d2..91357d09a 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -14,10 +14,10 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new',prettify,'users', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
-<%= javascript_include_tag "avatars"%>
+<%= javascript_include_tag "avatars",'prettify'%>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <%= yield :header_tags -%>
diff --git a/app/views/layouts/course_base.html.erb b/app/views/layouts/course_base.html.erb
index 24a784cd5..35ae21fd0 100644
--- a/app/views/layouts/course_base.html.erb
+++ b/app/views/layouts/course_base.html.erb
@@ -12,10 +12,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag "jquery.leanModal.min",'prettify' %>
   <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb
index db93ee495..98eea13bf 100644
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@@ -13,8 +13,8 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header'%>
-  <%= javascript_include_tag "course","header" %>
+  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify'%>
+  <%= javascript_include_tag "course","header",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index ae8fd774e..419931936 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -7,10 +7,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','users',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','prettify','users',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "bootstrap","avatars","new_user"%>
+  <%= javascript_include_tag "bootstrap","avatars","new_user",'prettify'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
diff --git a/app/views/layouts/static_base.html.erb b/app/views/layouts/static_base.html.erb
index b81b0755d..15dd9145b 100644
--- a/app/views/layouts/static_base.html.erb
+++ b/app/views/layouts/static_base.html.erb
@@ -7,10 +7,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag "jquery.leanModal.min",'prettify' %>
   <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb
index e356c0560..0caa5e39b 100644
--- a/app/views/layouts/users_base.html.erb
+++ b/app/views/layouts/users_base.html.erb
@@ -7,10 +7,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "jquery.leanModal.min" %>
+  <%= javascript_include_tag "jquery.leanModal.min" ,'prettify'%>
   <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index ab49fd9d6..f134e8f42 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,7 +11,7 @@
           </li>
           <li class="resourcesListName fl">
             <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
-            <%= link_to truncate(attach.filename,:length=>18), download_named_attachment_path(attach.id, attach.filename),
+            <%= link_to truncate(attach.filename,:length=>30), download_named_attachment_path(attach.id, attach.filename),
                         :title => attach.filename,:class=>'resourcesBlack'%>
           </li>
           <li class="resourcesListSize fl"><%= number_to_human_size(attach.filesize) %></li>
diff --git a/db/schema.rb b/db/schema.rb
index 9c0f8e373..96b243891 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -764,6 +764,16 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
+  create_table "journal_details_copy", :force => true do |t|
+    t.integer "journal_id",               :default => 0,  :null => false
+    t.string  "property",   :limit => 30, :default => "", :null => false
+    t.string  "prop_key",   :limit => 30, :default => "", :null => false
+    t.text    "old_value"
+    t.text    "value"
+  end
+
+  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
+
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0515da364..9cfebf8b3 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -313,10 +313,10 @@ a.uploadText {color:#ffffff; font-size:14px;}
 /*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
 /*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
 /*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
-.resourcesListName {width:180px; height:40px; line-height:40px; text-align:left;}
-.resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
-.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:160px; height:40px; line-height:40px; text-align:center;}
+.resourcesListName {width:340px; height:40px; line-height:40px; text-align:left;}
+.resourcesListSize {width:85px; height:40px; line-height:40px; text-align:center;}
+.resourcesListType {width:85px; height:40px; line-height:40px; text-align:center;}
+.resourcesListUploader {width:85px; height:40px; line-height:40px; text-align:center;}
 .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
 /*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
 a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}

From 93b179c95893952342fbf9f4fe81f14d15fde491 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 10 Sep 2015 17:11:16 +0800
Subject: [PATCH 050/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 251 ++++++++----------
 app/controllers/users_controller.rb           |  13 +
 app/views/homework_common/edit.html.erb       |  43 ++-
 app/views/users/_user_homework_form.html.erb  |  16 +-
 public/stylesheets/new_user.css               |   1 +
 5 files changed, 158 insertions(+), 166 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 2e9925916..862e6c80e 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -3,6 +3,7 @@ class HomeworkCommonController < ApplicationController
   require 'json'
   require "base64"
   layout "base_courses"
+  include StudentWorkHelper
   before_filter :find_course, :only => [:index,:new,:create,:next_step]
   before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
   before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
@@ -18,151 +19,125 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  #新建作业，在个人作业列表创建作业
   def new
-    @homework_type = "1"
-
-    @homework = HomeworkCommon.new
-    @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 2
-    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-
-    if @homework_type == "1"
-      #匿评作业相关属性
-      @homework_detail_manual = HomeworkDetailManual.new
-      @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 2
-      @homework_detail_manual.evaluation_num = 3
-      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-      @homework.homework_detail_manual = @homework_detail_manual
-    elsif @homework_type == "2"
-      #编程作业相关属性
-      @homework_detail_programing = HomeworkDetailPrograming.new
-      @homework.homework_detail_programing = @homework_detail_programing
-    end
-    respond_to do |format|
-      format.html
-    end
-  end
-
-  #新建作业下一步
-  def next_step
-    @homework_type = params[:homework_common_type]
-
-    @homework = HomeworkCommon.new
-    @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 2
-    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-
-    if @homework_type == "1"
-      #匿评作业相关属性
-      @homework_detail_manual = HomeworkDetailManual.new
-      @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 2
-      @homework_detail_manual.evaluation_num = 3
-      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-      @homework.homework_detail_manual = @homework_detail_manual
-    elsif @homework_type == "2"
-      #编程作业相关属性
-      @homework_detail_programing = HomeworkDetailPrograming.new
-      @homework.homework_detail_programing = @homework_detail_programing
-    end
-
-
-    respond_to do |format|
-      format.html
-    end
+    render_404
+    # @homework_type = "1"
+    #
+    # @homework = HomeworkCommon.new
+    # @homework.safe_attributes = params[:homework_common]
+    # @homework.late_penalty = 2
+    # @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    # @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+    #
+    # if @homework_type == "1"
+    #   #匿评作业相关属性
+    #   @homework_detail_manual = HomeworkDetailManual.new
+    #   @homework_detail_manual.ta_proportion = 0.6
+    #   @homework_detail_manual.absence_penalty = 2
+    #   @homework_detail_manual.evaluation_num = 3
+    #   @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
+    #   @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    #   @homework.homework_detail_manual = @homework_detail_manual
+    # elsif @homework_type == "2"
+    #   #编程作业相关属性
+    #   @homework_detail_programing = HomeworkDetailPrograming.new
+    #   @homework.homework_detail_programing = @homework_detail_programing
+    # end
+    # respond_to do |format|
+    #   format.html
+    # end
   end
 
+  #新建作业，在个人作业列表创建作业
   def create
-    if params[:homework_common]
-      homework = HomeworkCommon.new
-      homework.name = params[:homework_common][:name]
-      homework.description = params[:homework_common][:description]
-      homework.end_time = params[:homework_common][:end_time]
-      homework.publish_time = params[:homework_common][:publish_time]
-      homework.homework_type = params[:homework_common][:homework_type]
-      homework.late_penalty = params[:late_penalty]
-      homework.user_id = User.current.id
-      homework.course_id = @course.id
-
-      homework.save_attachments(params[:attachments])
-      render_attachment_warning_if_needed(homework)
-
-      if homework.homework_type == 2
-        homework_detail_programing = HomeworkDetailPrograming.new
-        homework_detail_programing.language = params[:language]
-        homework_detail_programing.standard_code = params[:standard_code]
-        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-        question = {title:homework.name,content:homework.description}
-        question[:input] = []
-        question[:output] = []
-        if params[:input] && params[:output] && params[:result]
-          params[:input].each do |k,v|
-            if params[:output].include? k
-              homework_test = HomeworkTest.new
-              homework_test.input = v
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-              homework.homework_tests << homework_test
-              question[:input] << homework_test.input
-              question[:output] << homework_test.output
-            end
-          end
-        end
-
-        # uri = URI('http://192.168.80.21:8080/api/questions.json')
-        # body = question.to_json
-        # res = Net::HTTP.new(uri.host, uri.port).start do |client|
-        #   request                 = Net::HTTP::Post.new(uri.path)
-        #   request.body            = body
-        #   request["Content-Type"] = "application/json"
-        #   client.request(request)
-        # end
-        # result = JSON.parse(res.body)
-        # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
-
-        homework.homework_detail_programing = homework_detail_programing
-      else
-        #匿评作业相关属性
-        homework_detail_manual = HomeworkDetailManual.new
-        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-        homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_start = params[:evaluation_start]
-        homework_detail_manual.evaluation_end = params[:evaluation_end]
-        homework_detail_manual.evaluation_num = params[:evaluation_num]
-        homework_detail_manual.absence_penalty = params[:absence_penalty]
-        homework.homework_detail_manual = homework_detail_manual
-      end
-
-      if homework.save
-        homework_detail_programing.save if homework_detail_programing
-        homework_detail_manual.save if homework_detail_manual
-        respond_to do |format|
-          format.html {
-            flash[:notice] = l(:notice_successful_create)
-            redirect_to homework_common_index_path(:course => @course.id)
-          }
-        end
-        return
-      end
-    end
-
-    respond_to do |format|
-      format.html {
-        flash[:notice] = l(:notice_failed_create)
-        redirect_to new_homework_common_path(:course => @course.id)
-      }
-    end
+    redirect_to user_homeworks_user_path(User.current.id)
+    # if params[:homework_common]
+    #   homework = HomeworkCommon.new
+    #   homework.name = params[:homework_common][:name]
+    #   homework.description = params[:homework_common][:description]
+    #   homework.end_time = params[:homework_common][:end_time]
+    #   homework.publish_time = params[:homework_common][:publish_time]
+    #   homework.homework_type = params[:homework_common][:homework_type]
+    #   homework.late_penalty = params[:late_penalty]
+    #   homework.user_id = User.current.id
+    #   homework.course_id = @course.id
+    #
+    #   homework.save_attachments(params[:attachments])
+    #   render_attachment_warning_if_needed(homework)
+    #
+    #   if homework.homework_type == 2
+    #     homework_detail_programing = HomeworkDetailPrograming.new
+    #     homework_detail_programing.language = params[:language]
+    #     homework_detail_programing.standard_code = params[:standard_code]
+    #     homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+    #     question = {title:homework.name,content:homework.description}
+    #     question[:input] = []
+    #     question[:output] = []
+    #     if params[:input] && params[:output] && params[:result]
+    #       params[:input].each do |k,v|
+    #         if params[:output].include? k
+    #           homework_test = HomeworkTest.new
+    #           homework_test.input = v
+    #           homework_test.output = params[:output][k]
+    #           homework_test.result = params[:result][k]
+    #           homework_test.error_msg = params[:error_msg]
+    #           homework.homework_tests << homework_test
+    #           question[:input] << homework_test.input
+    #           question[:output] << homework_test.output
+    #         end
+    #       end
+    #     end
+    #
+    #     # uri = URI('http://192.168.80.21:8080/api/questions.json')
+    #     # body = question.to_json
+    #     # res = Net::HTTP.new(uri.host, uri.port).start do |client|
+    #     #   request                 = Net::HTTP::Post.new(uri.path)
+    #     #   request.body            = body
+    #     #   request["Content-Type"] = "application/json"
+    #     #   client.request(request)
+    #     # end
+    #     # result = JSON.parse(res.body)
+    #     # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
+    #
+    #     homework.homework_detail_programing = homework_detail_programing
+    #   else
+    #     #匿评作业相关属性
+    #     homework_detail_manual = HomeworkDetailManual.new
+    #     homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+    #     homework_detail_manual.comment_status = 1
+    #     homework_detail_manual.evaluation_start = params[:evaluation_start]
+    #     homework_detail_manual.evaluation_end = params[:evaluation_end]
+    #     homework_detail_manual.evaluation_num = params[:evaluation_num]
+    #     homework_detail_manual.absence_penalty = params[:absence_penalty]
+    #     homework.homework_detail_manual = homework_detail_manual
+    #   end
+    #
+    #   if homework.save
+    #     homework_detail_programing.save if homework_detail_programing
+    #     homework_detail_manual.save if homework_detail_manual
+    #     respond_to do |format|
+    #       format.html {
+    #         flash[:notice] = l(:notice_successful_create)
+    #         redirect_to homework_common_index_path(:course => @course.id)
+    #       }
+    #     end
+    #     return
+    #   end
+    # end
+    #
+    # respond_to do |format|
+    #   format.html {
+    #     flash[:notice] = l(:notice_failed_create)
+    #     redirect_to new_homework_common_path(:course => @course.id)
+    #   }
+    # end
   end
 
   def edit
+    @user = User.current
     respond_to do |format|
-      format.html
+      format.html{render :layout => 'new_base_user'}
     end
   end
 
@@ -284,7 +259,7 @@ class HomeworkCommonController < ApplicationController
   def destroy
     if @homework.destroy
       respond_to do |format|
-        format.html {redirect_to homework_common_index_path(:course => @course.id)}
+        format.html {redirect_to user_homeworks_user_path(User.current.id)}
       end
     end
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9b2d49f2d..088271e86 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -367,6 +367,19 @@ class UsersController < ApplicationController
     end
   end
 
+  #修改编程作业
+  def edit_user_commit_homework
+    if User.current.logged?
+
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
+      end
+    else
+      render_403
+    end
+  end
+
   def user_commit_homework
     homework = HomeworkCommon.find(params[:homework])
     student_work = homework.student_works.where(user_id: User.current.id).first
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index 5b65b5982..d6815a00a 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -1,24 +1,23 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%= error_messages_for 'homework_common' %>
-
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_course_homework_edit)%>
-  </h2>
+<script type="text/javascript">
+    function reset_homework(){
+        $("#homework_name").val("");
+        $("#homework_end_time").val("");
+        $("#course_id").val($("#option_select").val());
+        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
+        homework_description_editor.html("");
+        $("#homework_editor").toggle();
+    }
+</script>
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">编辑作业</div>
 </div>
-<div class="hwork_new">
-  <%if @homework.homework_type == 2%>
-      <%= form_for @homework do |f| %>
-          <%= render :partial => 'homework_common/homework_detail_programing_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-  <% else %>
-      <%= form_for @homework do |f| %>
-          <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
-          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-  <% end%>
-</div><!--hwork_new end-->
 <div class="cl"></div>
+
+<!-- 老师身份才可以发布作业 -->
+<div class="HomeWork mb10">
+  <%= form_for @homework do |f| %>
+      <div id="HomeWorkCon">
+        <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
+      </div>
+  <% end%>
+</div><!----HomeWork end-->
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 949fb7f83..dfb48ef95 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -11,17 +11,16 @@
   <div class="cl"></div>
 
   <div class=" mt10">
-    <%= link_to "导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true%>
+    <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
     <div class="calendar_div fl">
-      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly"  >
+      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
-
     </div>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>
   <div class="cl"></div>
-  <div id="homework_editor" style="display: none">
+  <div id="homework_editor" style="display: <%= edit_mode ? 'block':'none'%>">
     <div class="mt10">
       <% if edit_mode %>
           <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %>
@@ -40,14 +39,19 @@
     <div class="cl"></div>
 
     <div id="homework_attachments">
-      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>true} %>
+      <!-- 编辑作业 && 作业类型为匿评作业   时没有编程选项-->
+      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type == 1)} %>
     </div>
 
 
     <div class="mt5">
       <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
       <span class="fr mr10 mt3">或</span>
-      <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+      <% if edit_mode %>
+          <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
+      <% else %>
+          <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+      <% end %>
       <div class="cl"></div>
     </div>
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a37123d76..1a868a903 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -576,6 +576,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyInput2 {width:588px; height:45px; max-width:588px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:0px auto 10px auto;}
 .homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:60px;}
 .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
+.homepagePostSetting ul li:hover ul {display:block;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}

From e5e3eeca2c562d071f7345b982aaca1ddd2f9a7a Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 10 Sep 2015 17:30:01 +0800
Subject: [PATCH 051/101] =?UTF-8?q?kindeditor=20=20icon=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index bc45cd91f..e8c28f678 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -264,10 +264,10 @@ K.options = {
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : ['code', 'emoticons',
-		'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
-		'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media',"more"
+	items : ['code', 'emoticons','fontname',
+        'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+		'formatblock', 'fontsize', '|','indent', 'outdent',
+		 '|','imagedirectupload','table',   'media', 'preview',"more"
 	],
 	noDisableItems : ['source', 'fullscreen'],
 	colorTable : [
@@ -4987,16 +4987,16 @@ KEditor.prototype = {
         htmlList.push('</div>')
         var htmlListFull = [];
         var fullItems =  ['code',
-            'emoticons',
-            'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
-            'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media', "less",
+            'emoticons','fontname',
+            'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter',  'insertorderedlist', 'insertunorderedlist', '|',
+            'formatblock', 'fontsize', '|', 'indent', 'outdent',
+              '|','imagedirectupload','table',   'media', 'preview', "less",
                 '/',
-             'undo', 'redo', '|', 'preview', 'print', 'template',
-            'justifyfull', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
-            'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/  'fontname',
+            'italic', 'underline',  'undo', 'redo', '|',  'removeformat',
+            'justifyright','justifyfull', 'source','plainpaste', 'wordpaste',  'subscript',
+            'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/
             'strikethrough', 'lineheight', 'hr', 'pagebreak',
-            'anchor' , 'link','unlink'
+            'link','unlink', 'print'
         ]
         K.each(fullItems, function(i, name) {
             if (name == '|') {

From 92a3d78dcc73d9863cd69b4773613bc3308cc3ee Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 10 Sep 2015 17:37:25 +0800
Subject: [PATCH 052/101] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E5=AE=9A=E6=97=B6=E5=8F=91=E9=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb               |  2 ++
 app/tasks/homework_endtime_task.rb | 23 +++++++++++++++++++++++
 lib/tasks/email.rake               |  8 --------
 lib/tasks/homework_endtime.rake    | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 app/tasks/homework_endtime_task.rb
 create mode 100644 lib/tasks/homework_endtime.rake

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a25aff6bb..4fe2478d2 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -34,8 +34,10 @@ class Mailer < ActionMailer::Base
     end
     def method_missing(name, *args, &block)
       if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
+        # with delayed_job
         @target.delay.send(name, *args, &block)
       else
+        # without delayed_job
         @target.send(name, *args, &block).deliver
       end
     end
diff --git a/app/tasks/homework_endtime_task.rb b/app/tasks/homework_endtime_task.rb
new file mode 100644
index 000000000..9b3d6e2ef
--- /dev/null
+++ b/app/tasks/homework_endtime_task.rb
@@ -0,0 +1,23 @@
+#coding=utf-8
+#
+
+class HomeworkEndtimeTask
+  def massage_for_endtime
+    desc "send a message for Job deadline"
+    task :message => :environment do
+      current_day = Date.today.day
+      homework_commons = HomeworkCommon.where("end_time >?",Date.today)
+      homework_commons.each do |homework_common|
+        if homework_common.end_time.day - Date.today < 2 && homework_common.end_time.year == Date.year
+          homework_common.course.student.each do |s|
+            homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :course_message_id => homework_common.id, :course_message_type => "HomeworkEndtime")
+          end
+        end
+      end
+    end
+    handle_asynchronously :massage_for_endtime, :run_at => HomeworkEndtimeTask.new { 1.minutes.from_now }
+  end
+
+  homwork_endtime = HomeworkEndtimeTask.new
+  homwork_endtime.massage_for_endtime
+end
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index f805d1382..5126d7a69 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -202,13 +202,5 @@ END_DESC
         Mailer.run.send_for_user_activities(user, Date.today, 1)
       end
     end
-
-    desc "send a message for Job deadline"
-    task :message => :environment do
-      users = User.where(mail_notification: 'day')
-      users.each do |user|
-        Mailer.run.send_for_user_activities(user, Date.today, 1)
-      end
-    end
   end
 end
diff --git a/lib/tasks/homework_endtime.rake b/lib/tasks/homework_endtime.rake
new file mode 100644
index 000000000..9c7f54d75
--- /dev/null
+++ b/lib/tasks/homework_endtime.rake
@@ -0,0 +1,16 @@
+#coding=utf-8
+
+namespace :homework_endtime do
+  desc "send a message for Job deadline"
+  task :message => :environment do
+    current_day = Date.today.day
+    homework_commons = HomeworkCommon.where("end_time >?",Date.today)
+    homework_commons.each do |homework_common|
+      if homework_common.end_time.day - Date.today.day < 2 && homework_common.end_time.year == Date.today.year
+        homework_common.course.student.each do |s|
+          homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :status => true)
+        end
+      end
+    end
+  end
+end

From 2beb85561ab61ffdf20dceafac1ea34470529e5d Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 09:08:05 +0800
Subject: [PATCH 053/101] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=85=A8=E9=80=89=E6=8C=89=E9=92=AE=E5=92=8C?=
 =?UTF-8?q?=E5=B7=B2=E9=80=89=E6=8B=A9=E8=B5=84=E6=BA=90=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_resource_create.js.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index f7ae832d1..2d6c4f4d8 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -2,4 +2,6 @@
 closeModal();
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 //这里不能将翻页的更新
-$("#res_all_count").html(parseInt($("#res_all_count").html())+1);
\ No newline at end of file
+$("#res_all_count").html(parseInt($("#res_all_count").html())+1);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
\ No newline at end of file

From 66636efda9cf76da85b9562057b74c9a9fa45f75 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 09:15:54 +0800
Subject: [PATCH 054/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 133 ++++--------------
 app/views/users/_user_homework_form.html.erb  |   6 +-
 2 files changed, 31 insertions(+), 108 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 862e6c80e..b60b12d36 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -142,116 +142,37 @@ class HomeworkCommonController < ApplicationController
   end
 
   def update
-    @homework.name = params[:homework_common][:name]
-    @homework.description = params[:homework_common][:description]
-    @homework.end_time = params[:homework_common][:end_time]
-    @homework.publish_time = params[:homework_common][:publish_time]
-    @homework.homework_type = params[:homework_common][:homework_type] if params[:homework_common][:homework_type]
-    unless @homework.late_penalty == params[:late_penalty]
-      @homework.student_works.where("created_at > '#{@homework.end_time} 23:59:59'").each do |student_work|
-        student_work.late_penalty = params[:late_penalty]
-        student_work.save
-      end
-      @homework.late_penalty = params[:late_penalty]
-    end
-    # @homework.course_id = @course.id
+    if params[:homework_common]
+      @homework.name = params[:homework_common][:name]
+      @homework.description = params[:homework_common][:description]
+      @homework.end_time = params[:homework_common][:end_time] || Time.now
+      @homework.course_id = params[:course_id]
 
-    #匿评作业相关属性
-    if @homework.homework_type == 1 && @homework_detail_manual
-      @homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-      @homework_detail_manual.evaluation_start = params[:evaluation_start]
-      @homework_detail_manual.evaluation_end = params[:evaluation_end]
-      @homework_detail_manual.evaluation_num = params[:evaluation_num]
-      unless @homework_detail_manual.absence_penalty == params[:absence_penalty]
-        if @homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值
-          work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
-          @homework.student_works.each do |student_work|
-            absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
-            student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
-            student_work.save
-          end
-        end
-        @homework_detail_manual.absence_penalty = params[:absence_penalty]
-      end
-    elsif @homework.homework_type == 0 #普通作业，缺评扣分为0分，每个作品的缺评扣分改为0分，防止某些作业在结束匿评之后改为普通作业
-      @homework.student_works.where("absence_penalty != 0").each do |student_work|
-        student_work.late_penalty = 0
-        student_work.save
-      end
-      @homework_detail_manual.absence_penalty = 0 if @homework_detail_manual
-    end
-
-    if @homework.homework_type == 2 && @homework_detail_programing #编程作业
-      @homework_detail_programing.language = params[:language]
-      @homework_detail_programing.standard_code = params[:standard_code]
-      @homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-      homework_tests = @homework.homework_tests
-      #需要删除的测试
-      ids = homework_tests.map(&:id) - params[:input].keys.map(&:to_i)
-      ids.each do |id|
-        homework_test = HomeworkTest.find id
-        homework_test.destroy if homework_test
-      end
-      if params[:input] && params[:output] && params[:result]
-        params[:input].each do |k,v|
-          if params[:output].include? k
-            homework_test = HomeworkTest.find_by_id k
-            if homework_test #已存在的测试，修改
-              homework_test.input = v
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-            else #不存在的测试，增加
-              homework_test = HomeworkTest.new
-              homework_test.input = v
-              homework_test.output = params[:output][k]
-              homework_test.result = params[:result][k]
-              homework_test.error_msg = params[:error_msg]
-              homework_test.homework_common = @homework
-            end
-            homework_test.save
-          end
-        end
-      end
+      @homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(@homework)
 
-      #发送修改作业的请求
-      question = {title:@homework.name,content:@homework.description}
-      question[:input] = []
-      question[:output] = []
-      @homework.homework_tests.each do |test|
-        question[:input] << test.input
-        question[:output] << test.output
+      #编程作业相关属性
+      if @homework.homework_type == 2
+        # homework_detail_programing = HomeworkDetailPrograming.new
+        # homework.homework_detail_programing = homework_detail_programing
+        # homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+        # homework_detail_programing.language = params[:language_type].to_i
+        #
+        # inputs = params[:program][:input]
+        # if Array === inputs
+        #   inputs.each_with_index do |val, i|
+        #     homework.homework_tests << HomeworkTest.new(
+        #         input: val,
+        #         output: params[:program][:output][i]
+        #     )
+        #   end
+        # end
       end
-      # uri = URI("http://192.168.80.21:8080/api/questions/#{@homework_detail_programing.question_id}.json")
-      # body = question.to_json
-      # res = Net::HTTP.new(uri.host, uri.port).start do |client|
-      #   request                 = Net::HTTP::Put.new(uri.path)
-      #   request.body            = body
-      #   request["Content-Type"] = "application/json"
-      #   client.request(request)
-      # end
-      # result = JSON.parse(res.body)
-    end
-
-    @homework.save_attachments(params[:attachments])
-    render_attachment_warning_if_needed(@homework)
 
-    if @homework.save
-      @homework_detail_manual.save if @homework_detail_manual
-      @homework_detail_programing.save if @homework_detail_programing
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_successful_edit)
-          redirect_to homework_common_index_path(:course => @course.id)
-        }
-      end
-      return
-    else
-      respond_to do |format|
-        format.html {
-          flash[:notice] = l(:notice_failed_edit)
-          redirect_to edit_homework_common_path(@homework)
-        }
+      if @homework.save
+        @homework_detail_manual.save if @homework_detail_manual
+        @homework_detail_programing.save if @homework_detail_programing
+        redirect_to user_homeworks_user_path(User.current.id)
       end
     end
   end
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index dfb48ef95..988c95643 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -45,11 +45,13 @@
 
 
     <div class="mt5">
-      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
-      <span class="fr mr10 mt3">或</span>
       <% if edit_mode %>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common');">确定</a>
+          <span class="fr mr10 mt3">或</span>
           <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
       <% else %>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
+          <span class="fr mr10 mt3">或</span>
           <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
       <% end %>
       <div class="cl"></div>

From 948a6c9138ebb13047468aa2fd92343ba55b44ad Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 09:20:43 +0800
Subject: [PATCH 055/101] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E8=8A=82=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index c337bb672..8676c6fb1 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -27,7 +27,7 @@
 </div>
 
 <div class="homepageContentContainer">
-  <div class="homepageRightBannerImg"></div>
+  <!--div class="homepageRightBannerImg"></div-->
   <div class="cl"></div>
   <div class="homepageContent">
     <div class="homepageLeft" id="LSide">

From a94521f2e15bf0b73d3c543c62709bd9fae7d2e8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 09:36:44 +0800
Subject: [PATCH 056/101] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 1 +
 app/helpers/homework_common_helper.rb         | 1 +
 app/views/users/_user_homework_form.html.erb  | 2 +-
 public/javascripts/new_user.js                | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index b60b12d36..a3b981b22 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -3,6 +3,7 @@ class HomeworkCommonController < ApplicationController
   require 'json'
   require "base64"
   layout "base_courses"
+
   include StudentWorkHelper
   before_filter :find_course, :only => [:index,:new,:create,:next_step]
   before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb
index 43f815250..a03c4ccd7 100644
--- a/app/helpers/homework_common_helper.rb
+++ b/app/helpers/homework_common_helper.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+include UsersHelper
 module HomeworkCommonHelper
   #迟交扣分下拉框
   def late_penalty_option
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 988c95643..b4118bd2a 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -46,7 +46,7 @@
 
     <div class="mt5">
       <% if edit_mode %>
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common');">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
           <span class="fr mr10 mt3">或</span>
           <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
       <% else %>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 8362217a7..eb50c2762 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -71,6 +71,7 @@ function submit_homework(id)
         $("#course_id").focus();
     }
     else{
+
         homework_description_editor.sync();
         $("#"+id).submit();
     }

From cc3990de444239bde1d363043b2d624fed4fdfb3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 09:45:28 +0800
Subject: [PATCH 057/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=B6=88=E6=81=AF=E5=90=8E=E8=B7=B3=E8=BD=AC=E8=B7=AF?=
 =?UTF-8?q?=E5=8A=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/system_messages_controller.rb |  2 +-
 app/tasks/homework_endtime_task.rb            | 23 -------------------
 config/routes.rb                              |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 app/tasks/homework_endtime_task.rb

diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb
index 588e13c5e..ae49b58a8 100644
--- a/app/controllers/system_messages_controller.rb
+++ b/app/controllers/system_messages_controller.rb
@@ -42,7 +42,7 @@ class SystemMessagesController < ApplicationController
     @system_messages.user_id = User.current.id
     respond_to do |format|
       if @system_messages.save
-        format.html {redirect_to system_messages_url(@project)}
+        format.html {redirect_to user_message_path(User.current, :type => "system_message")}
         flash[:notice] = l(:notice_successful_message)
       end
     end
diff --git a/app/tasks/homework_endtime_task.rb b/app/tasks/homework_endtime_task.rb
deleted file mode 100644
index 9b3d6e2ef..000000000
--- a/app/tasks/homework_endtime_task.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#coding=utf-8
-#
-
-class HomeworkEndtimeTask
-  def massage_for_endtime
-    desc "send a message for Job deadline"
-    task :message => :environment do
-      current_day = Date.today.day
-      homework_commons = HomeworkCommon.where("end_time >?",Date.today)
-      homework_commons.each do |homework_common|
-        if homework_common.end_time.day - Date.today < 2 && homework_common.end_time.year == Date.year
-          homework_common.course.student.each do |s|
-            homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :course_message_id => homework_common.id, :course_message_type => "HomeworkEndtime")
-          end
-        end
-      end
-    end
-    handle_asynchronously :massage_for_endtime, :run_at => HomeworkEndtimeTask.new { 1.minutes.from_now }
-  end
-
-  homwork_endtime = HomeworkEndtimeTask.new
-  homwork_endtime.massage_for_endtime
-end
diff --git a/config/routes.rb b/config/routes.rb
index 2a0e1a492..1df7b0d2f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -265,7 +265,6 @@ RedmineApp::Application.routes.draw do
     collection do
       post 'create', :as => 'system_messages'
       get 'index', :as => 'index'
-      get 'show', :as => 'show'
     end
   end
   # match 'system_messages/index', to: 'system_messages#index', :via => :get, :as => 'system_messages'

From 9e61ceefa9c6e7669006fac71f1971432113efb9 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Sep 2015 09:48:16 +0800
Subject: [PATCH 058/101] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/system_message.rb           |  1 +
 app/views/admin/messages.html.erb      | 25 ++++++++++++++++++++++++-
 app/views/users/user_messages.html.erb | 16 ++++++++++++++--
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/app/models/system_message.rb b/app/models/system_message.rb
index 4802ba252..83e1ef615 100644
--- a/app/models/system_message.rb
+++ b/app/models/system_message.rb
@@ -1,4 +1,5 @@
 class SystemMessage < ActiveRecord::Base
   attr_accessible :content, :id, :user_id
   belongs_to :user
+  validates_length_of :content, maximum: 255
 end
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 10f20e2a0..03fa80e75 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -3,7 +3,7 @@
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
-  <%= form_for(@admin_messages) do |f| %>
+  <%= form_for(@admin_messages, :html => {:id =>'system_message', :multipart => true}) do |f| %>
       <div class="field">
         <%= f.kindeditor :content, :edit_id => 'system_message',
                          :width => '87%',
@@ -11,9 +11,32 @@
                          :no_label => true
         %>
       </div>
+      <div>
+        <p id="content_notice_span" class="ml55"></p>
+      </div>
       <div class="actions">
         <%= f.submit l(:label_submit),:class => "small", :onclick => "system_message.sync;" %>
       </div>
   <% end %>
 </div>
+<script>
+  function system_message_length(obj)
+  {
+      if (obj.length == 0) {
+          $("#content_notice_span").text("���ݲ���Ϊ��");
+          $("#content_notice_span").css('color', '#ff0000');
+          $("#content_notice_span").focus();
+      }
+      else if (obj.length > 255) {
+          $("#content_notice_span").text("���ݹ���������255���ַ�");
+          $("#content_notice_span").css('color', '#ff0000');
+          $("#content_notice_span").focus();
+      }
+      else {
+          $("#content_notice_span").text("��д��ȷ");
+          $("#content_notice_span").css('color', '#008000');
+          $("#system_message").submit();
+      }
+  }
+</script>
 
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index c59930742..fdfa1eaf7 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -55,7 +55,13 @@
           <li class="homepageNewsContent fl">
             <%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
                         :class =>"newsGrey",
-                        :title => "#{usm.content.html_safe}" %></li>
+                        :onmouseover =>"message_titile_show($(this),event);",
+                        :onmouseout => "message_titile_hide($(this));"
+          %>
+          </li>
+          <div style="display:none;" class="message_title">
+            <%= ma.content.html_safe%>
+          </div>
           <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
         </ul>
     <% end %>
@@ -325,7 +331,13 @@
                     <li class="homepageNewsContent fl">
                       <%= link_to ma.content.html_safe, {:controller => 'system_messages', :action => 'index'},
                                   :class =>"newsGrey",
-                                  :title => "#{ma.content.html_safe}" %></li>
+                                  :onmouseover =>"message_titile_show($(this),event);",
+                                  :onmouseout => "message_titile_hide($(this));"
+                   %>
+                    </li>
+                    <div style="display:none;" class="message_title">
+                      <%= ma.content.html_safe%>
+                    </div>
                     <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                   </ul>
                   <% end %>

From 4ea20b707cee1b81eb070ab31c8063127449a75e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 09:53:18 +0800
Subject: [PATCH 059/101] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=B1=BB=E5=9E=8B=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/users_helper.rb            | 25 +++++++++++++++++++++++++
 app/views/users/user_messages.html.erb |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index c806f3493..1ae6fbfb6 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -52,6 +52,31 @@ module UsersHelper
     end
   end
 
+  def title_for_message type
+    case type
+      when nil
+        '消息'
+      when 'unviewed'
+        '未读消息'
+      when 'apply'
+        '用户申请'
+      when 'system_message'
+        '系统消息'
+      when 'homework'
+        '作业消息'
+      when 'course_message'
+        '课程讨论'
+      when 'course_news'
+        '课程通知'
+      when 'issue'
+        '项目任务'
+      when 'forum'
+        '贴吧帖子'
+      when 'user_feedback'
+        '用户留言'
+    end
+  end
+
   # 统计未读消息数
   def unviewed_message(user)
     course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index c59930742..5df911db6 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -1,5 +1,5 @@
 <div class="homepageRightBanner">
-    <div class="NewsBannerName">消息</div>
+    <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
     <ul class="resourcesSelect">
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
         <ul class="newsType">

From 30ebe9b2d53469b1404f14828f7149a341497171 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 09:59:34 +0800
Subject: [PATCH 060/101] =?UTF-8?q?1=E3=80=81=E7=BC=96=E7=A8=8B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=8F=AF=E4=BB=A5=E5=BC=80=E5=90=AF=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=202=E3=80=81=E5=8F=96=E6=B6=88=E6=89=A3=E5=88=86=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=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/helpers/application_helper.rb        | 36 +++++++++++++-----------
 app/views/homework_common/index.html.erb | 14 ++++-----
 app/views/student_work/index.html.erb    | 14 ++++-----
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4c78c03df..a1663c76b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2297,25 +2297,27 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment homework
-    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
-      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-        link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
-      elsif homework.student_works.count >= 2 #作业份数大于2
-        case homework.homework_detail_manual.comment_status
-          when 1
-            link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
-          when 2
-            link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
-          when 3
-            link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
-        end
-      else
-        link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
+    # if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
+    #
+    # elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
+    #   link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
+    # else
+    #   link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+    # end
+
+    if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+      link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
+    elsif homework.student_works.count >= 2 #作业份数大于2
+      case homework.homework_detail_manual.comment_status
+        when 1
+          link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
+        when 2
+          link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
+        when 3
+          link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
       end
-    elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
-      link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
     else
-      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+      link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
     end
     link
   end
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index bbf4aa343..694069b44 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -98,17 +98,17 @@
             <div class="cl"></div>
         <% end%>
 
-        <div class="mt5">
+        <!--div class="mt5">
           <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
           <div class="fl mb5 c_red">
-            <% if homework.homework_type == 1%>
-                <%= scoring_rules homework.late_penalty,homework.id,@is_teacher,homework.homework_detail_manual.absence_penalty%>
-            <% else%>
-                <%= scoring_rules homework.late_penalty,homework.id,@is_teacher%>
-            <% end%>
+            <%# if homework.homework_type == 1%>
+                <%#= scoring_rules homework.late_penalty,homework.id,@is_teacher,homework.homework_detail_manual.absence_penalty%>
+            <%# else%>
+                <%#= scoring_rules homework.late_penalty,homework.id,@is_teacher%>
+            <%# end%>
           </div>
         </div>
-        <div class="cl"></div>
+        <div class="cl"></div-->
 
         <span class="fl"><%= l(:label_end_time)%>：<%= homework.end_time%></span>
         <% if betweentime(homework.end_time) < 0 %>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 776af3b3e..e8fa33902 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -185,18 +185,18 @@
         </div>
         <div class="cl"></div>
 
-        <div class="mt5">
+        <!--div class="mt5">
           <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
           <div class="fl mb5 c_red">
-            <% if @homework.homework_type == 1%>
-                <%= scoring_rules @homework.late_penalty,@homework.id,@is_teacher,@homework.homework_detail_manual.absence_penalty%>
-            <% else%>
-                <%= scoring_rules @homework.late_penalty,@homework.id,@is_teacher%>
-            <% end%>
+            <%# if @homework.homework_type == 1%>
+                <%#= scoring_rules @homework.late_penalty,@homework.id,@is_teacher,@homework.homework_detail_manual.absence_penalty%>
+            <%# else%>
+                <%#= scoring_rules @homework.late_penalty,@homework.id,@is_teacher%>
+            <%# end%>
           </div>
         </div>
 
-        <div class="cl"></div>
+        <div class="cl"></div-->
         <span class="fl">截止时间：<%= @homework.end_time%></span>
         <div >
           <% if betweentime(@homework.end_time) < 0 %>

From 7db774eedb8c57b769731aae3a5ec252fee49cdb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 10:19:45 +0800
Subject: [PATCH 061/101] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8C=BF=E8=AF=84=E7=9B=B8=E5=85=B3=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=B8=BA=E4=BD=9C=E4=B8=9A=E5=BF=85=E9=A1=BB=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 088271e86..d332af793 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -408,17 +408,17 @@ class UsersController < ApplicationController
         homework.save_attachments(params[:attachments])
         render_attachment_warning_if_needed(homework)
 
-        #匿评作业相关属性
-        if homework.homework_type == 1
-          homework_detail_manual = HomeworkDetailManual.new
-          homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-          homework_detail_manual.comment_status = 1
-          homework_detail_manual.evaluation_start = Time.now
-          homework_detail_manual.evaluation_end = Time.now
-          homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-          homework_detail_manual.absence_penalty = 2
-          homework.homework_detail_manual = homework_detail_manual
-        else
+        homework_detail_manual = HomeworkDetailManual.new
+        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+        homework_detail_manual.comment_status = 1
+        homework_detail_manual.evaluation_start = Time.now
+        homework_detail_manual.evaluation_end = Time.now
+        homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+        homework_detail_manual.absence_penalty = 2
+        homework.homework_detail_manual = homework_detail_manual
+
+        #编程作业相关属性
+        if homework.homework_type == 2
           homework_detail_programing = HomeworkDetailPrograming.new
           homework.homework_detail_programing = homework_detail_programing
           homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6

From 36e9c20e59c2faf4e34307053123bada3225e9ba Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Sep 2015 10:30:01 +0800
Subject: [PATCH 062/101] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/messages.html.erb      | 23 +++++++++++++++++------
 app/views/users/user_messages.html.erb |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 03fa80e75..9f7784c67 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -1,9 +1,10 @@
+# encoding: utf-8
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <h3 style="float: left">
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
-  <%= form_for(@admin_messages, :html => {:id =>'system_message', :multipart => true}) do |f| %>
+  <%= form_for(@admin_messages, :html => {:id =>'system_message_form', :multipart => true}) do |f| %>
       <div class="field">
         <%= f.kindeditor :content, :edit_id => 'system_message',
                          :width => '87%',
@@ -20,23 +21,33 @@
   <% end %>
 </div>
 <script>
-  function system_message_length(obj)
+  function system_message_length()
   {
+      var obj = $("#system_message").value;
       if (obj.length == 0) {
-          $("#content_notice_span").text("���ݲ���Ϊ��");
+          $("#content_notice_span").text("内容不能为空");
           $("#content_notice_span").css('color', '#ff0000');
           $("#content_notice_span").focus();
+          return false;
       }
       else if (obj.length > 255) {
-          $("#content_notice_span").text("���ݹ���������255���ַ�");
+          $("#content_notice_span").text("内容过长，超过255个字符");
           $("#content_notice_span").css('color', '#ff0000');
           $("#content_notice_span").focus();
+          return false;
       }
       else {
-          $("#content_notice_span").text("��д��ȷ");
+          $("#content_notice_span").text("填写正确");
           $("#content_notice_span").css('color', '#008000');
-          $("#system_message").submit();
+          return true;
       }
   }
+        function submit_message()
+        {
+            if (system_message_length())
+            {
+                $("#system_message_form").submit();
+            }
+        }
 </script>
 
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index fdfa1eaf7..03e9f487d 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -60,7 +60,7 @@
           %>
           </li>
           <div style="display:none;" class="message_title">
-            <%= ma.content.html_safe%>
+            <%= usm.content.html_safe%>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
         </ul>

From dfed4885de1fbb8e1eafc4d18d7a1f07df717a17 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 10:36:16 +0800
Subject: [PATCH 063/101] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E4=B9=8B=E5=90=8E=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index b3aaf5ece..f375496d1 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -3,7 +3,7 @@
       $("#homework_name").val("");
       $("#homework_end_time").val("");
       $("#course_id").val($("#option_select").val());
-      $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
+      $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
       homework_description_editor.html("");
       $("#homework_editor").toggle();
   }

From 527ff41d4305eb83b060f715ff5cee04ae641d19 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 10:44:10 +0800
Subject: [PATCH 064/101] =?UTF-8?q?1=E3=80=81=E7=BC=96=E7=A8=8B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=BC=80=E5=90=AF=E5=8C=BF=E8=AF=84=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=202=E3=80=81=E5=8C=BF=E8=AF=84=E5=BC=B9=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/new.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 556f054f1..85c23f300 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -1,17 +1,20 @@
 <!-- 此界面只用来新建匿评作业作品 -->
 <script type="text/javascript">
-  <%if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status != 1%>
+  <%if @homework.homework_detail_manual.comment_status != 1%>
     $(function(){
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
         showModal('ajax-modal', '360px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().css("top","30%").css("left","40%");
         $('#ajax-modal').parent().addClass("anonymos_work");
 //        alert("当前作业已开启匿评，您提交作品后将不会收到任何匿评作品，您的作品也不会被其他用户匿评，如需获得最终成绩，请您联系主讲老师对您的作品单独进行评分");
     });
   <% end%>
+
+  //匿评弹框取消按钮
+  function clickCanel(){hideModal("#popbox02");}
 </script>
 
 <div class="homepageRightBanner mb10">

From f4c19c0fb0224ec09f8171ea9fb2559549316afc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 10:50:16 +0800
Subject: [PATCH 065/101] =?UTF-8?q?1=E3=80=81homework.js=20=20=20on?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAlive=202=E3=80=81=E5=AF=BC=E5=85=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=BC=96=E7=A8=8B=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_select_homework.js.erb |  2 +-
 public/javascripts/homework.js              | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index a18fdacc8..acffd2506 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -3,6 +3,6 @@ hideModal('#coursesChoosePopup');
 $("#homework_name").val("<%= @homework.name%>");
 $("#homework_end_time").val("<%= @homework.end_time%>");
 $("#course_id").val("<%= @homework.course_id%>");
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework })%>");
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
 $("#homework_editor").show();
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index c136029bf..773a2c209 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -58,10 +58,10 @@ $(function(){
         );
     };
 
-    $('#test-program-btn').on('click', test_program);
+    $('#test-program-btn').live('click', test_program);
 
 
-    $('#commit-program-work-btn').on('click', function(){
+    $('#commit-program-work-btn').live('click', function(){
         if(!valid_form()){
             return;
         }
@@ -89,7 +89,7 @@ $(function(){
         $(".HomeWorkCon form").submit();
     });
 
-    $('form.edit_student_work').on('keydown', '#program-src', function(){
+    $('form.edit_student_work').live('keydown', '#program-src', function(){
         tested = false;
     });
 
@@ -104,12 +104,12 @@ $(function(){
 
     $('input.date-input').datepicker(datepickerOptions);
 
-    $('a.pic_date').on('click', function(){
+    $('a.pic_date').live('click', function(){
         $(this).parent().prev().first().focus();
     })
     
 
-    $('a.ProBtn').on('click', function(){
+    $('a.ProBtn').live('click', function(){
         $("#BluePopupBox").dialog({
             modal: true,
             dialogClass: 'BluePopupBox',
@@ -117,12 +117,12 @@ $(function(){
         });
         $(".ui-dialog-titlebar").hide();
 
-        $("a.CloseBtn").on('click', function(){
+        $("a.CloseBtn").live('click', function(){
             $("#BluePopupBox" ).dialog("close");
         });
         $('#textarea_input_test').focus();
 
-        $("#BluePopupBox a.BlueCirBtn").on('click', function(){
+        $("#BluePopupBox a.BlueCirBtn").live('click', function(){
             var test_numbers = 0;
             var valid = true;  
             var input = null;
@@ -162,12 +162,12 @@ $(function(){
         });
     });
 
-    $("#BluePopupBox").on('click', 'a.icon_add', function(){
+    $("#BluePopupBox").live('click', 'a.icon_add', function(){
         var html = bt('t:test-answer-list', null);
         $(this).parent('.mt10').after(html);
 
     });
-    $("#BluePopupBox").on('click', 'a.icon_remove', function(){
+    $("#BluePopupBox").live('click', 'a.icon_remove', function(){
         $(this).parent('.mt10').remove();
     });
 });
\ No newline at end of file

From 8848b3975e2bf6a111b26b827fae8b571de9a07f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 10:52:13 +0800
Subject: [PATCH 066/101] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84kindeditor=E5=A4=AA=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kindeditor/plugins/autoheight/autoheight.js       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/plugins/autoheight/autoheight.js b/public/assets/kindeditor/plugins/autoheight/autoheight.js
index 546578bfa..3c25fe49e 100644
--- a/public/assets/kindeditor/plugins/autoheight/autoheight.js
+++ b/public/assets/kindeditor/plugins/autoheight/autoheight.js
@@ -27,7 +27,9 @@ KindEditor.plugin('autoheight', function(K) {
 		var edit = self.edit;
 		var body = edit.doc.body;
 		edit.iframe.height(minHeight);
-		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+		self.resize(null, Math.max(
+            (K.IE ? body.scrollHeight : body.offsetHeight)
+                + 76, minHeight));
 	}
 
 	function init() {
@@ -35,7 +37,12 @@ KindEditor.plugin('autoheight', function(K) {
 
 		self.edit.afterChange(resetHeight);
 		hideScroll();
-		resetHeight();
+        var edit = self.edit;
+        var body = edit.doc.body;
+        edit.iframe.height(minHeight);
+        self.resize(null, Math.max(
+                ((K.IE ? body.scrollHeight : body.offsetHeight) > 500 ? 500 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
+                + 76, minHeight));
 	}
 
 	if (self.isCreated) {

From bb3fc9752832027c2355cca961e2c7cba4ffeec3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 11:02:40 +0800
Subject: [PATCH 067/101] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=EF=BC=9A?=
 =?UTF-8?q?=201=E3=80=81=E6=97=B6=E9=97=B4=E5=8C=BA=E6=AE=B5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA24=E5=B0=8F=E6=97=B6=202=E3=80=81=E5=8F=AA?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=80=E6=AC=A1=E6=B6=88=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/homework_endtime.rake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/homework_endtime.rake b/lib/tasks/homework_endtime.rake
index 9c7f54d75..9fef281a3 100644
--- a/lib/tasks/homework_endtime.rake
+++ b/lib/tasks/homework_endtime.rake
@@ -4,11 +4,13 @@ namespace :homework_endtime do
   desc "send a message for Job deadline"
   task :message => :environment do
     current_day = Date.today.day
-    homework_commons = HomeworkCommon.where("end_time >?",Date.today)
+    homework_commons = HomeworkCommon.where("end_time >=?",Date.today)
     homework_commons.each do |homework_common|
-      if homework_common.end_time.day - Date.today.day < 2 && homework_common.end_time.year == Date.today.year
-        homework_common.course.student.each do |s|
-          homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :status => true)
+      if CourseMessage.where("course_message_type =? and course_message_id =? and status =?", "HomeworkCommon", homework_common.id, 1).first.nil?
+        if homework_common.end_time.day - Date.today.day < 2 && homework_common.end_time.year == Date.today.year
+          homework_common.course.student.each do |s|
+            homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :status => true)
+          end
         end
       end
     end

From cd36965cd12af08846a73f0e6eb60bb043306fb7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 11:31:59 +0800
Subject: [PATCH 068/101] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=95=B0=E6=8D=AE=E8=A1=A5=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb |  15 +--
 ...0150911031029_about_programing_homework.rb |  25 +++++
 db/schema.rb                                  | 103 ++++++++++--------
 3 files changed, 86 insertions(+), 57 deletions(-)
 create mode 100644 db/migrate/20150911031029_about_programing_homework.rb

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index a3b981b22..d4c02860e 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -154,20 +154,7 @@ class HomeworkCommonController < ApplicationController
 
       #编程作业相关属性
       if @homework.homework_type == 2
-        # homework_detail_programing = HomeworkDetailPrograming.new
-        # homework.homework_detail_programing = homework_detail_programing
-        # homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-        # homework_detail_programing.language = params[:language_type].to_i
-        #
-        # inputs = params[:program][:input]
-        # if Array === inputs
-        #   inputs.each_with_index do |val, i|
-        #     homework.homework_tests << HomeworkTest.new(
-        #         input: val,
-        #         output: params[:program][:output][i]
-        #     )
-        #   end
-        # end
+
       end
 
       if @homework.save
diff --git a/db/migrate/20150911031029_about_programing_homework.rb b/db/migrate/20150911031029_about_programing_homework.rb
new file mode 100644
index 000000000..50786834b
--- /dev/null
+++ b/db/migrate/20150911031029_about_programing_homework.rb
@@ -0,0 +1,25 @@
+class AboutProgramingHomework < ActiveRecord::Migration
+  def up
+    HomeworkCommon.where(:homework_type => 2).each do |homework|
+      unless homework.homework_detail_manual
+        homework_detail_manual = HomeworkDetailManual.new
+        homework_detail_manual.ta_proportion =  0.6
+        homework_detail_manual.comment_status = 1
+        homework_detail_manual.evaluation_start = homework.created_at
+        homework_detail_manual.evaluation_end = homework.created_at
+        homework_detail_manual.evaluation_num =  3
+        homework_detail_manual.absence_penalty = 2
+        homework_detail_manual.homework_common_id = homework.id
+        homework_detail_manual.save
+      end
+    end
+  end
+
+  def down
+    HomeworkCommon.where(:homework_type => 2).each do |homework|
+      if homework.homework_detail_manual
+        homework.homework_detail_manual.destroy
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 96b243891..008e13129 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 => 20150907152238) do
+ActiveRecord::Schema.define(:version => 20150911031029) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -236,6 +236,13 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.boolean  "tracker_in_review_dialog", :default => false
   end
 
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "code_reviews", :force => true do |t|
     t.integer  "project_id"
     t.integer  "change_id"
@@ -469,6 +476,13 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -483,23 +497,26 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    t.string   "TraceInfo"
-    t.string   "Method"
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
     t.string   "File"
-    t.string   "IPLine"
-    t.string   "Review"
-    t.string   "Category"
-    t.string   "Defect"
-    t.string   "PreConditions"
-    t.string   "StartLine"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
     t.integer  "project_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -764,16 +781,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
@@ -909,7 +916,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
@@ -1166,18 +1172,18 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                               :null => false
-    t.text     "content",                               :null => false
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",      :default => 0
+    t.integer  "replies_count",                          :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",               :default => false
-    t.boolean  "sticky",             :default => false
-    t.boolean  "is_quote",           :default => false
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.integer  "viewed_count_crawl", :default => 0
-    t.integer  "viewed_count_local", :default => 0
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -1202,6 +1208,19 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1
@@ -1253,10 +1272,11 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
     t.integer  "project_id"
     t.integer  "user_id"
+    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1419,8 +1439,8 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.integer  "zip_code"
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
-    t.integer  "identity"
     t.string   "technical_title"
+    t.integer  "identity"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1488,9 +1508,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
-    t.integer  "level"
-    t.integer  "file"
-    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|

From 1855adb0371710ddbbecc752ec3c79284bd6cf03 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Sep 2015 11:40:07 +0800
Subject: [PATCH 069/101] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=8D=E8=83=BD=E8=AE=BF=E9=97=AE=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index db972941e..a7f1589a6 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -468,13 +468,17 @@ class CoursesController < ApplicationController
   end
 
   def new
-    @course_type = params[:course_type] ||= params[:course]
-    @issue_custom_fields = IssueCustomField.sorted.all
-    @trackers = Tracker.sorted.all
-    @course = Course.new
-    @course.safe_attributes = params[:course]
-    # month = Time.now.month
-    render :layout => 'new_base'
+    if User.current.login?
+      @course_type = params[:course_type] ||= params[:course]
+      @issue_custom_fields = IssueCustomField.sorted.all
+      @trackers = Tracker.sorted.all
+      @course = Course.new
+      @course.safe_attributes = params[:course]
+      # month = Time.now.month
+      render :layout => 'new_base'
+    else
+      redirect_to signin_url
+    end
   end
 
   def desc_sort_course_by_avtivity(activity_count, courses)

From 2da3454bc50ad0462b7454a95064822ac121195e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Sep 2015 11:41:31 +0800
Subject: [PATCH 070/101] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 7841ead91..d6d5581e6 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -77,7 +77,7 @@
           <% if is_teacher%>
               <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, {:controller => 'courses', :action => 'settings', :id => @course}, :class => "pr_join_a" %>
               <%= set_course_time @course%>
-              <%= link_to "<span class='pr_copy'></span>#{l(:button_copy)}".html_safe, copy_course_course_path(@course.id), :class => "pr_join_a" %>
+              <%#= link_to "<span class='pr_copy'></span>#{l(:button_copy)}".html_safe, copy_course_course_path(@course.id), :class => "pr_join_a" %>
           <% else%>
               <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
           <% end%>

From 487f46bb3277c4e89fdec3acf63463995d610134 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 11:46:12 +0800
Subject: [PATCH 071/101] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=90=8E=E5=A4=A7=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/save_user_avatar.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/my/save_user_avatar.js.erb b/app/views/my/save_user_avatar.js.erb
index 03608a768..1e24a4a7c 100644
--- a/app/views/my/save_user_avatar.js.erb
+++ b/app/views/my/save_user_avatar.js.erb
@@ -1,3 +1,3 @@
-$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:90px;height:90px;overflow:hidden",:alt=>"头像") %>');
+$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:78px;height:78px;overflow:hidden",:alt=>"头像") %>');
 $("#nh_user_logo").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_logo',:width =>"40",:height => "40",:alt=>"头像") %>');
 hideModal();
\ No newline at end of file

From c0437ae99236af1b140b4c93e6a4d1805d9c5137 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 14:41:23 +0800
Subject: [PATCH 072/101] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8F=90=E9=86=92=E7=95=8C=E9=9D=A2=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                     |  3 ++-
 app/views/users/user_messages.html.erb | 21 +++++++++++++++++++--
 public/stylesheets/new_user.css        |  3 +++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 8b5951687..63811cd58 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -269,7 +269,8 @@ class User < Principal
     forge_count = ForgeMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
     user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
     user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+    system_messages_count = SystemMessage.where("created_at >?", User.current.onclick_time.onclick_time).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count
   end
 
   # 查询指派给我的缺陷记录
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index ec2e4b748..b70eabd5c 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -6,8 +6,6 @@
           <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
           <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
           <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
-          <%# 系统消息 %>
-          <li><%= link_to "系统消息", user_message_path(User.current, :type => 'system_message'), :class => "resourcesGrey" %></li>
           <%# 课程相关消息 %>
           <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
           <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
@@ -26,6 +24,8 @@
           <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
           <%# 系统贴吧 %>
           <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
+          <%# 系统消息 %>
+          <li><%= link_to "系统消息", user_message_path(User.current, :type => 'system_message'), :class => "resourcesGrey" %></li>
         </ul>
       </li>
     </ul>
@@ -104,6 +104,23 @@
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
+                <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
+                    <ul class="homepageNewsList fl">
+                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
+                        <% if ma.viewed == 0 %>
+                          <li class="homepageHomeworkContent fl">
+                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.course_message.name}" %>
+                          </li>
+                          <li  class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
+                        <% else %>
+                          <li class="homepageNewsContent fl">
+                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.course_message.name}" %>
+                          </li>
+                        <% end %>
+                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                    </ul>
+                <% end %>
                 <% if ma.course_message_type == "Poll" %>
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index f8000f674..a233b6577 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -514,6 +514,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsType {width:110px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
 .homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageHomeworkContent {width:245px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}

From 3044b07df7dd4629f547231a3425790aa8b7cbbd Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Sep 2015 14:43:04 +0800
Subject: [PATCH 073/101] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 52 ++++++++++++++------------
 public/stylesheets/new_user.css        |  2 +
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 03e9f487d..e506b4a81 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -42,29 +42,33 @@
         </div>
     <% end %>
     <%# 系统消息 %>
-    <% @user_system_messages.each do |usm| %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);">
-              <div class="navHomepageLogo fl">
-                <%=image_tag("/images/logo.png",width:"30px", height: "30px",class: "mt3") %>
-              </div>
-            </a>
-          </li>
-          <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
-          <li class="homepageNewsContent fl">
-            <%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
-                        :class =>"newsGrey",
-                        :onmouseover =>"message_titile_show($(this),event);",
-                        :onmouseout => "message_titile_hide($(this));"
-          %>
-          </li>
-          <div style="display:none;" class="message_title">
-            <%= usm.content.html_safe%>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
+      <% if params[:type] != 'system_message' %>
+          <% @user_system_messages.each do |usm| %>
+              <ul class="homepageNewsList fl">
+                <li class="homepageNewsPortrait fl">
+                  <a href="javascript:void(0);">
+                    <div class="navHomepageLogo fl">
+                      <%= image_tag("/images/logo.png", width: "30px", height: "30px", class: "mt3") %>
+                    </div>
+                  </a>
+                </li>
+                <li class="homepageNewsPubType fl">
+                  <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
+                </li>
+                <li class="homepageNewsContent fl">
+                  <%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
+                              :class => "newsGrey",
+                              :onmouseover => "message_titile_show($(this),event);",
+                              :onmouseout => "message_titile_hide($(this));"
+                  %>
+                </li>
+                <div style="display:none;" class="message_title">
+                  <%= usm.content.html_safe %>
+                </div>
+                <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
+              </ul>
+          <% end %>
+      <% end %>
     <%# 课程消息 %>
     <% unless @message_alls.nil? %>
         <% @message_alls.each do |ma| %>
@@ -330,7 +334,7 @@
                     <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
                     <li class="homepageNewsContent fl">
                       <%= link_to ma.content.html_safe, {:controller => 'system_messages', :action => 'index'},
-                                  :class =>"newsGrey",
+                                  :class => "#{params[:type]=="unviewed" ? "newsBlack" : "newsRed"}",
                                   :onmouseover =>"message_titile_show($(this),event);",
                                   :onmouseout => "message_titile_hide($(this));"
                    %>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index f8000f674..37af8ccea 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -519,6 +519,8 @@ a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
 a.newsGrey {color:#4b4b4b;}
 a.newsGrey:hover {color:#000000;}
+a.newsRed {color:red;}
+a.newsRed:hovor {color:#888888;}
 a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
 a.replyGrey1 {color:#888888;}

From 17b4b31449b2fc1bb28de0ef42b6072bfac319ad Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 14:44:50 +0800
Subject: [PATCH 074/101] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E5=9B=9E=E5=A4=8D=20textarea?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_message.html.erb  | 2 +-
 app/views/users/_course_news.html.erb     | 2 +-
 app/views/users/_project_issue.html.erb   | 2 +-
 app/views/users/_project_message.html.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index eee272fe6..1587cbfb1 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -72,7 +72,7 @@
         <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="quote[quote]" value="">
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
             <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index d2213c743..857ae3697 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -44,7 +44,7 @@
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
             <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 04f541d77..e0e093f2d 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -82,7 +82,7 @@
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
             <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 5fc10e48c..2c0dfeec0 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -58,7 +58,7 @@
         <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="quote[quote]" value="">
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
             <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>

From 3bfdff81baa688511f7dab5c4d18ce8b50b472ac Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 14:53:42 +0800
Subject: [PATCH 075/101] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_form.html.erb              | 8 --------
 app/views/projects/settings/_new_edit.html.erb | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 1e3f4b620..4df254fd0 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -12,14 +12,6 @@
 <p style="padding-right: 20px;">
   <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:0px;" %>
 </p><!--by young-->
-<p>
-  <%#= f.text_field :enterprise_name, :size => 60, :style => "width:490px;" %>
-  <label for="project_description">
-    <%= l(:field_enterprise_name)%>
-    <span class="required">&nbsp;&nbsp;</span>
-  </label>
-  <%= select_tag :organization_id,options_for_select(project_organizations_id_option,@project.organization_id),{}  %>
-</p>
 <p style="display: none" >
   <%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH,
                                           value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %>
diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb
index a8998ece5..8de9b8229 100644
--- a/app/views/projects/settings/_new_edit.html.erb
+++ b/app/views/projects/settings/_new_edit.html.erb
@@ -19,11 +19,6 @@
           <textarea class="w543" id="project_description" name="project[description]" rows="8" placeholder="最多3000个汉字(或6000个英文字符)"><%= @project.description%></textarea>
           <div class="cl"></div>
         </li>
-        <li  >
-          <label class="label02">&nbsp;组织&nbsp;&nbsp;：</label>
-          <%= select_tag :organization_id,options_for_select(project_organizations_id_option,@project.organization_id),{}  %>
-        </li>
-        <div class="cl"></div>
         <li >
           <label class="label02">公开&nbsp;&nbsp;：</label>
           <input id="project_is_public" name="project[is_public]" type="checkbox" <%= @project.is_public ? "checked" : ""%>>

From e9f9dd44b9f602e7d582277f56fdfa68bf809284 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 11 Sep 2015 14:59:30 +0800
Subject: [PATCH 076/101] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E6=90=9E=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 14 +++
 app/models/homework_common.rb                 |  2 +-
 app/views/users/_user_homework_form.html.erb  | 61 ++++++++----
 public/javascripts/homework.js                | 99 ++++++++++---------
 4 files changed, 106 insertions(+), 70 deletions(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index d4c02860e..71782ee28 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -154,7 +154,21 @@ class HomeworkCommonController < ApplicationController
 
       #编程作业相关属性
       if @homework.homework_type == 2
+          @homework.homework_detail_programing ||= HomeworkDetailPrograming.new
+          @homework_detail_programing = @homework.homework_detail_programing
+          @homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+          @homework_detail_programing.language = params[:language_type].to_i
 
+          @homework.homework_tests.delete_all
+          inputs = params[:program][:input]
+          if Array === inputs
+            inputs.each_with_index do |val, i|
+              @homework.homework_tests << HomeworkTest.new(
+                  input: val,
+                  output: params[:program][:output][i]
+              )
+            end
+          end
       end
 
       if @homework.save
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 0bff38558..c1e5666ac 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -60,6 +60,6 @@ class HomeworkCommon < ActiveRecord::Base
     self.homework_type == 2 && self.homework_detail_programing
   end
 
-  delegate :language_name, :to => :homework_detail_programing
+  delegate :language_name, :language, :to => :homework_detail_programing
 
 end
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index b4118bd2a..d221e50c8 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -1,6 +1,11 @@
 <% content_for :header_tags do %>
     <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
     <%= javascript_include_tag 'homework','baiduTemplate' %>
+    <script type="text/javascript">
+      $(function(){
+        $("#BluePopupBox a.BlueCirBtn").click();
+      });
+    </script>
 <% end %>
 
 <div class="HomeWorkCon">
@@ -57,7 +62,7 @@
       <div class="cl"></div>
     </div>
 
-    <input type="hidden" name="homework_type" value="1">
+    <input type="hidden" name="homework_type" value="<%= edit_mode ? homework.homework_type : 1 %>">
 
   </div>
 </div>
@@ -83,28 +88,42 @@
 </script>
 
   
-    <div class="BluePopupBox" id="BluePopupBox" style="display:none">
-      <a href="javascript:void(0);" class="CloseBtn" title="关闭弹框"></a>
-        <h2 class="BluePopuph2 fl">编程作业的测试集设置</h2>
-        <div class="cl"></div>
-        <div class="HomeWorkCon">
-          <div class="mt15">
-              <select class="InputBox W120 language_type"  >
-                    <option value="1" selected>C语言</option>
-                    <option value="2">C++</option>
-                  </select>
-            </div>
+<div class="BluePopupBox" id="BluePopupBox" style="display:none">
+  <a href="javascript:void(0);" class="CloseBtn" title="关闭弹框"></a>
+    <h2 class="BluePopuph2 fl">编程作业的测试集设置</h2>
+    <div class="cl"></div>
+    <div class="HomeWorkCon">
+      <div class="mt15">
+          <select class="InputBox W120 language_type"  >
+                <%= options_for_select({"C语言"=>1, "C++"=>2}, (edit_mode && homework.is_program_homework?) ? homework.language : 1) %>
+              </select>
+        </div>
+        
+
+        <% if edit_mode && homework.is_program_homework? %>
+          <% homework.homework_tests.each_with_index do |test, index| %>
             <div class="mt10">
-              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
+              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"><%= test.input %></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"><%= test.output %></textarea>
               <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-                <div class="cl"></div>
-            </div>
-           
-            <div class="mt10">
-                <a href="javascript:void(0);" class="BlueCirBtn fr">确&nbsp;&nbsp;定</a>
-                <div class="cl"></div>
+              <% if index != 0 %>
+              <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
+              <% end %>
+              <div class="cl"></div>
             </div>
+          <% end %>
+        <% else %>
+          <div class="mt10">
+            <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
+            <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
+            <div class="cl"></div>
+          </div>
+        <% end %>
+        
+        <div class="mt10">
+            <a href="javascript:void(0);" class="BlueCirBtn fr">确&nbsp;&nbsp;定</a>
+            <div class="cl"></div>
+        </div>
 
-        </div><!----HomeWorkCon end-->
+    </div><!----HomeWorkCon end-->
 
-    </div><!----BluePopupBox end-->
+</div><!----BluePopupBox end-->
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 773a2c209..e07b6b979 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -58,10 +58,10 @@ $(function(){
         );
     };
 
-    $('#test-program-btn').live('click', test_program);
+    $('#test-program-btn').on('click', test_program);
 
 
-    $('#commit-program-work-btn').live('click', function(){
+    $('#commit-program-work-btn').on('click', function(){
         if(!valid_form()){
             return;
         }
@@ -89,11 +89,10 @@ $(function(){
         $(".HomeWorkCon form").submit();
     });
 
-    $('form.edit_student_work').live('keydown', '#program-src', function(){
+    $('form.edit_student_work').on('keydown', '#program-src', function(){
         tested = false;
     });
 
-
 //发布作业
 
     $('#program-src').focus(function(){
@@ -104,70 +103,74 @@ $(function(){
 
     $('input.date-input').datepicker(datepickerOptions);
 
-    $('a.pic_date').live('click', function(){
+    $('a.pic_date').on('click', function(){
         $(this).parent().prev().first().focus();
     })
     
 
-    $('a.ProBtn').live('click', function(){
-        $("#BluePopupBox").dialog({
+    $("#BluePopupBox").dialog({
             modal: true,
+            autoOpen: false,
             dialogClass: 'BluePopupBox',
             minWidth: 753
-        });
-        $(".ui-dialog-titlebar").hide();
+    });
 
-        $("a.CloseBtn").live('click', function(){
+    $('a.ProBtn').on('click', function(){
+        $("#BluePopupBox").dialog("open");
+        $(".ui-dialog-titlebar").hide();
+        $("a.CloseBtn").on('click', function(){
             $("#BluePopupBox" ).dialog("close");
         });
         $('#textarea_input_test').focus();
+    });
 
-        $("#BluePopupBox a.BlueCirBtn").live('click', function(){
-            var test_numbers = 0;
-            var valid = true;  
-            var input = null;
-            var output = null;
-            var input_groups = [];
-            $.each($('#BluePopupBox textarea.InputBox'), function(i, val){
-                if ($(val).val().length<=0) {
-                    $(val)[0].focus();
-                    valid =false;
-                    return false;
-                }
-                if (test_numbers %2==0) {
-                    input = $(val).val();
-                } else {
-                    output = $(val).val();
-                    input_groups.push({input: input, output: output});
-                }
-                test_numbers += 1;
-            });
-
-            var language =  $('select.language_type').val() == 1 ? 'C语言' : 'C++语言';
-
-            if (valid) {
-                $("input[name=homework_type]").val(2);
-                $('span.program_detail_info').text('('+language+'，'+test_numbers/2+'组测试)');
-                //保存js值
-                var data = {
-                    language_type: $('select.language_type').val(),
-                    input_groups: input_groups
-                };
-                //构建到form中
-                $('.program-input').remove();
-                var html=bt('t:program-input-list',data);
-                $("input[name=homework_type]").after(html);
-                $("#BluePopupBox" ).dialog( "close" );    
+    $("#BluePopupBox a.BlueCirBtn").on('click', function(){
+        var test_numbers = 0;
+        var valid = true;  
+        var input = null;
+        var output = null;
+        var input_groups = [];
+        $.each($('#BluePopupBox textarea.InputBox'), function(i, val){
+            if ($(val).val().length<=0) {
+                $(val)[0].focus();
+                valid =false;
+                return false;
             }
+            if (test_numbers %2==0) {
+                input = $(val).val();
+            } else {
+                output = $(val).val();
+                input_groups.push({input: input, output: output});
+            }
+            test_numbers += 1;
         });
+
+        var language =  $('select.language_type').val() == 1 ? 'C语言' : 'C++语言';
+
+        if (valid) {
+            $("input[name=homework_type]").val(2);
+            $('span.program_detail_info').text('('+language+'，'+test_numbers/2+'组测试)');
+            //保存js值
+            var data = {
+                language_type: $('select.language_type').val(),
+                input_groups: input_groups
+            };
+            //构建到form中
+            $('.program-input').remove();
+            var html=bt('t:program-input-list',data);
+            $("input[name=homework_type]").after(html);
+            if($( "#BluePopupBox" ).dialog( "isOpen" )){
+                $("#BluePopupBox").dialog( "close" );    
+            }
+        }
     });
 
-    $("#BluePopupBox").live('click', 'a.icon_add', function(){
+    $("#BluePopupBox").on('click', 'a.icon_add', function(){
         var html = bt('t:test-answer-list', null);
         $(this).parent('.mt10').after(html);
 
     });
-    $("#BluePopupBox").live('click', 'a.icon_remove', function(){
+    $("#BluePopupBox").on('click', 'a.icon_remove', function(){
         $(this).parent('.mt10').remove();
     });
 });
\ No newline at end of file

From 96405d7c0c4a735c1145c392a2df791c3029275f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 15:38:58 +0800
Subject: [PATCH 077/101] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E7=BC=96=E7=A8=8B=E6=8C=89=E9=92=AE=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/homework.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index e07b6b979..9a5d6aa37 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -115,7 +115,7 @@ $(function(){
             minWidth: 753
     });
 
-    $('a.ProBtn').on('click', function(){
+    $('a.ProBtn').live('click', function(){
         $("#BluePopupBox").dialog("open");
         $(".ui-dialog-titlebar").hide();
         $("a.CloseBtn").on('click', function(){

From 8c0f9d24f8e5f630852997ecfc35da0f3e884168 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 15:39:46 +0800
Subject: [PATCH 078/101] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=B2=A1=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=20=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/system_messages_controller.rb |  7 ++++
 app/models/system_message.rb                  |  2 +
 app/views/admin/messages.html.erb             | 40 ++-----------------
 app/views/users/user_messages.html.erb        |  6 +--
 config/locales/admins/zh.yml                  |  2 +
 public/stylesheets/new_user.css               |  2 +
 6 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb
index ae49b58a8..7b1fa33f8 100644
--- a/app/controllers/system_messages_controller.rb
+++ b/app/controllers/system_messages_controller.rb
@@ -44,6 +44,13 @@ class SystemMessagesController < ApplicationController
       if @system_messages.save
         format.html {redirect_to user_message_path(User.current, :type => "system_message")}
         flash[:notice] = l(:notice_successful_message)
+      else
+        if params[:system_message][:content].empty?
+          flash[:error] = l(:label_content_blank_fail)
+        else
+          flash[:error] = l(:label_admin_message_fail)
+        end
+        format.html {redirect_to admin_messages_path}
       end
     end
   end
diff --git a/app/models/system_message.rb b/app/models/system_message.rb
index 83e1ef615..92a989cb3 100644
--- a/app/models/system_message.rb
+++ b/app/models/system_message.rb
@@ -1,5 +1,7 @@
 class SystemMessage < ActiveRecord::Base
   attr_accessible :content, :id, :user_id
   belongs_to :user
+
+  validates :content, presence: true
   validates_length_of :content, maximum: 255
 end
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 9f7784c67..918b09174 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -4,50 +4,16 @@
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
-  <%= form_for(@admin_messages, :html => {:id =>'system_message_form', :multipart => true}) do |f| %>
+  <%= form_for(@admin_messages) do |f| %>
       <div class="field">
-        <%= f.kindeditor :content, :edit_id => 'system_message',
-                         :width => '87%',
-                         :resizeType => '0',
-                         :no_label => true
-        %>
+        <%= f.kindeditor :content, :edit_id => 'system_message', :width => '87%', :resizeType => '0', :no_label => true %>
       </div>
       <div>
         <p id="content_notice_span" class="ml55"></p>
       </div>
       <div class="actions">
-        <%= f.submit l(:label_submit),:class => "small", :onclick => "system_message.sync;" %>
+        <%= f.submit l(:label_submit),:class => "small" %>
       </div>
   <% end %>
 </div>
-<script>
-  function system_message_length()
-  {
-      var obj = $("#system_message").value;
-      if (obj.length == 0) {
-          $("#content_notice_span").text("内容不能为空");
-          $("#content_notice_span").css('color', '#ff0000');
-          $("#content_notice_span").focus();
-          return false;
-      }
-      else if (obj.length > 255) {
-          $("#content_notice_span").text("内容过长，超过255个字符");
-          $("#content_notice_span").css('color', '#ff0000');
-          $("#content_notice_span").focus();
-          return false;
-      }
-      else {
-          $("#content_notice_span").text("填写正确");
-          $("#content_notice_span").css('color', '#008000');
-          return true;
-      }
-  }
-        function submit_message()
-        {
-            if (system_message_length())
-            {
-                $("#system_message_form").submit();
-            }
-        }
-</script>
 
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index cb75132f0..e01cd3d09 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -57,12 +57,12 @@
                 </li>
                 <li class="homepageNewsContent fl">
                   <%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
-                              :class => "newsGrey",
+                              :class => "newsRed",
                               :onmouseover => "message_titile_show($(this),event);",
                               :onmouseout => "message_titile_hide($(this));"
                   %>
                 </li>
-                <div style="display:none;" class="message_title">
+                <div style="display:none;" class="message_title_red">
                   <%= usm.content.html_safe %>
                 </div>
                 <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
@@ -356,7 +356,7 @@
                                   :onmouseout => "message_titile_hide($(this));"
                    %>
                     </li>
-                    <div style="display:none;" class="message_title">
+                    <div style="display:none;" class="message_title_red">
                       <%= ma.content.html_safe%>
                     </div>
                     <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
diff --git a/config/locales/admins/zh.yml b/config/locales/admins/zh.yml
index 49abcfc8d..5d857efae 100644
--- a/config/locales/admins/zh.yml
+++ b/config/locales/admins/zh.yml
@@ -15,4 +15,6 @@ zh:
   label_registration_automatic_activation: 自动激活帐号
 
   label_system_message: 系统消息
+  label_admin_message_fail: 消息内容过长！
+  label_content_blank_fail: 消息内容不能为空！
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index acdb247d7..61809d742 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -931,6 +931,8 @@ img.ui-datepicker-trigger {
     margin-bottom: 3px;
 }
 .message_title{border: 1px solid #D4D4D4;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #E8E8E8;}
+.message_title_red{border: 1px solid #D4D4D4;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #E8E8E8;color: red}
+
 .description{display: none !important;}
 .ispublic-label{display: none !important;}
 .is_public_checkbox{display: none !important;}

From 6209250e6d6d0218e5630f3e6ad55ee8361e9665 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 15:45:25 +0800
Subject: [PATCH 079/101] =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/messages.html.erb  | 1 +
 public/stylesheets/application.css | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 918b09174..bd804a225 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -8,6 +8,7 @@
       <div class="field">
         <%= f.kindeditor :content, :edit_id => 'system_message', :width => '87%', :resizeType => '0', :no_label => true %>
       </div>
+      <div class="admin_message_warn">（消息内容不超过255个字符！）</div>
       <div>
         <p id="content_notice_span" class="ml55"></p>
       </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ed274a61e..8fdb26ffc 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2807,4 +2807,6 @@ img.school_avatar {
     width: 100px;
     height: 100px;
     max-width: none;
-}
\ No newline at end of file
+}
+
+.admin_message_warn{font-size: 12px;color: red;}
\ No newline at end of file

From 3da6593720aaf976dba19b879c9cc261a9bf52e5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 15:55:51 +0800
Subject: [PATCH 080/101] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=AB=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E2=80=9C=E5=85=A8=E9=83=A8=E8=AE=BE=E4=B8=BA=E5=B7=B2=E8=AF=BB?=
 =?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_messages.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index e01cd3d09..26b606f49 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -36,7 +36,7 @@
     <% if params[:type].nil? || params[:type] == "unviewed" %>
         <div class="newsReadSetting">
           有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读
-          <% unless unviewed_message(@user) == 0 %>
+          <% unless (unviewed_message(@user) == 0 || User.current != @user) %>
               <a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
           <% end %>
         </div>

From 67dcb025aab17f635cc575c64a8dc799cd08d797 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Sep 2015 16:05:02 +0800
Subject: [PATCH 081/101] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/system_message.rb      |  4 +-
 app/views/admin/messages.html.erb | 64 ++++++++++++++-----------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/app/models/system_message.rb b/app/models/system_message.rb
index 83e1ef615..daab37868 100644
--- a/app/models/system_message.rb
+++ b/app/models/system_message.rb
@@ -1,5 +1,7 @@
 class SystemMessage < ActiveRecord::Base
   attr_accessible :content, :id, :user_id
   belongs_to :user
-  validates_length_of :content, maximum: 255
+
+  validates :content, presence: true
+  validates_length_of :content, maximum:255
 end
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 9f7784c67..10169f30b 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -1,53 +1,47 @@
-# encoding: utf-8
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <h3 style="float: left">
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
-  <%= form_for(@admin_messages, :html => {:id =>'system_message_form', :multipart => true}) do |f| %>
+  <%= form_for(@admin_messages, :html => {:id =>'system_message-form'}) do |f| %>
       <div class="field">
-        <%= f.kindeditor :content, :edit_id => 'system_message',
-                         :width => '87%',
-                         :resizeType => '0',
-                         :no_label => true
-        %>
+        <%= f.kindeditor :content,:width=>'87%',:editor_id=>'system_message_editor' %>
+        <p id="content_notice_span" class="ml55"></p>
       </div>
       <div>
         <p id="content_notice_span" class="ml55"></p>
       </div>
       <div class="actions">
-        <%= f.submit l(:label_submit),:class => "small", :onclick => "system_message.sync;" %>
+        <%= link_to l(:label_submit), "javascript:void(0)",:class => "small", :onclick => "system_message_editor.sync();submit_message();" %>
       </div>
   <% end %>
 </div>
 <script>
-  function system_message_length()
-  {
-      var obj = $("#system_message").value;
-      if (obj.length == 0) {
-          $("#content_notice_span").text("内容不能为空");
-          $("#content_notice_span").css('color', '#ff0000');
-          $("#content_notice_span").focus();
-          return false;
-      }
-      else if (obj.length > 255) {
-          $("#content_notice_span").text("内容过长，超过255个字符");
-          $("#content_notice_span").css('color', '#ff0000');
-          $("#content_notice_span").focus();
-          return false;
-      }
-      else {
-          $("#content_notice_span").text("填写正确");
-          $("#content_notice_span").css('color', '#008000');
-          return true;
-      }
-  }
-        function submit_message()
-        {
-            if (system_message_length())
-            {
-                $("#system_message_form").submit();
-            }
+    function system_message_length() {
+        var obj = system_message_editor.html();
+        if (obj.length == 0) {
+            $("#content_notice_span").text("内容不能为空");
+            $("#content_notice_span").css('color', '#ff0000');
+            $("#content_notice_span").focus();
+            return false;
+        }
+        else if (obj.length > 255) {
+            $("#content_notice_span").text("内容过长，超过255个字符");
+            $("#content_notice_span").css('color', '#ff0000');
+            $("#content_notice_span").focus();
+            return false;
+        }
+        else {
+            $("#content_notice_span").text("填写正确");
+            $("#content_notice_span").css('color', '#008000');
+            return true;
+        }
+    }
+    function submit_message() {
+
+        if (system_message_length()) {
+            $("#system_message-form").submit();
         }
+    }
 </script>
 

From 37f235c2ab57185b742be2ce3b1b5651d75faa55 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 16:22:35 +0800
Subject: [PATCH 082/101] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 15 ++++++++
 app/views/users/_user_homework_form.html.erb  | 38 +------------------
 .../users/_user_programing_attr.html.erb      | 36 ++++++++++++++++++
 app/views/users/user_select_homework.js.erb   |  2 +
 public/javascripts/homework.js                |  2 +-
 5 files changed, 55 insertions(+), 38 deletions(-)
 create mode 100644 app/views/users/_user_programing_attr.html.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f1608515f..dcea9e276 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -329,11 +329,13 @@ class UsersController < ApplicationController
   #导入作业，确定按钮
   def user_select_homework
     homework = HomeworkCommon.find_by_id params[:checkMenu]
+    homework_detail_programing = homework.homework_detail_programing
     @homework = HomeworkCommon.new
     if homework
       @homework.name = homework.name
       @homework.description = homework.description
       @homework.end_time = homework.end_time
+      @homework.homework_type = homework.homework_type
       @homework.course_id = homework.course_id
       homework.attachments.each do |attachment|
         att = attachment.copy
@@ -343,6 +345,19 @@ class UsersController < ApplicationController
         att.save
         @homework.attachments << att
       end
+
+      if homework_detail_programing
+        @homework.homework_detail_programing = HomeworkDetailPrograming.new
+        @homework_detail_programing = @homework.homework_detail_programing
+        @homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+        @homework_detail_programing.language = homework_detail_programing.language
+        homework.homework_tests.each_with_index do |homework_test|
+          @homework.homework_tests << HomeworkTest.new(
+              input: homework_test.input,
+              output: homework_test.output
+          )
+        end
+      end
     end
     respond_to do |format|
       format.js
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index d221e50c8..b22053f6d 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -89,41 +89,5 @@
 
   
 <div class="BluePopupBox" id="BluePopupBox" style="display:none">
-  <a href="javascript:void(0);" class="CloseBtn" title="关闭弹框"></a>
-    <h2 class="BluePopuph2 fl">编程作业的测试集设置</h2>
-    <div class="cl"></div>
-    <div class="HomeWorkCon">
-      <div class="mt15">
-          <select class="InputBox W120 language_type"  >
-                <%= options_for_select({"C语言"=>1, "C++"=>2}, (edit_mode && homework.is_program_homework?) ? homework.language : 1) %>
-              </select>
-        </div>
-        
-
-        <% if edit_mode && homework.is_program_homework? %>
-          <% homework.homework_tests.each_with_index do |test, index| %>
-            <div class="mt10">
-              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"><%= test.input %></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"><%= test.output %></textarea>
-              <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-              <% if index != 0 %>
-              <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-              <% end %>
-              <div class="cl"></div>
-            </div>
-          <% end %>
-        <% else %>
-          <div class="mt10">
-            <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
-            <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-            <div class="cl"></div>
-          </div>
-        <% end %>
-        
-        <div class="mt10">
-            <a href="javascript:void(0);" class="BlueCirBtn fr">确&nbsp;&nbsp;定</a>
-            <div class="cl"></div>
-        </div>
-
-    </div><!----HomeWorkCon end-->
-
+  <%= render :partial => 'users/user_programing_attr', :locals => {:edit_mode => edit_mode, :homework=>homework} %>
 </div><!----BluePopupBox end-->
diff --git a/app/views/users/_user_programing_attr.html.erb b/app/views/users/_user_programing_attr.html.erb
new file mode 100644
index 000000000..6a3b4a773
--- /dev/null
+++ b/app/views/users/_user_programing_attr.html.erb
@@ -0,0 +1,36 @@
+<a href="javascript:void(0);" class="CloseBtn" title="关闭弹框"></a>
+<h2 class="BluePopuph2 fl">编程作业的测试集设置</h2>
+<div class="cl"></div>
+<div class="HomeWorkCon">
+  <div class="mt15">
+    <select class="InputBox W120 language_type"  >
+      <%= options_for_select({"C语言"=>1, "C++"=>2}, (edit_mode && homework.is_program_homework?) ? homework.language : 1) %>
+    </select>
+  </div>
+  <% if edit_mode && homework.is_program_homework? %>
+      <% homework.homework_tests.each_with_index do |test, index| %>
+          <div class="mt10">
+            <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"><%= test.input %></textarea>
+            <textarea class="InputBox  W320  fl mr5" placeholder="测试输出"><%= test.output %></textarea>
+            <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
+            <% if index != 0 %>
+                <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+      <% end %>
+  <% else %>
+      <div class="mt10">
+        <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea>
+        <textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
+        <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
+        <div class="cl"></div>
+      </div>
+  <% end %>
+
+  <div class="mt10">
+    <a href="javascript:void(0);" class="BlueCirBtn fr">确&nbsp;&nbsp;定</a>
+    <div class="cl"></div>
+  </div>
+
+</div><!----HomeWorkCon end-->
\ No newline at end of file
diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index acffd2506..001c45fa4 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -5,4 +5,6 @@ $("#homework_end_time").val("<%= @homework.end_time%>");
 $("#course_id").val("<%= @homework.course_id%>");
 $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
+$("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
+$("input[name='homework_type']").val("<%= @homework.homework_type%>");
 $("#homework_editor").show();
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 9a5d6aa37..45902ef16 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -124,7 +124,7 @@ $(function(){
         $('#textarea_input_test').focus();
     });
 
-    $("#BluePopupBox a.BlueCirBtn").on('click', function(){
+    $("#BluePopupBox a.BlueCirBtn").live('click', function(){
         var test_numbers = 0;
         var valid = true;  
         var input = null;

From 90a52aa01b7b8f375fc6bc9157bf704002a50d2a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 16:26:35 +0800
Subject: [PATCH 083/101] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=BC=96=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=90=8E=E3=80=81=E6=B5=8B=E8=AF=95=E9=9B=86?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_select_homework.js.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index 001c45fa4..5bea36d90 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -8,3 +8,4 @@ homework_description_editor.html("<%= escape_javascript(@homework.description.ht
 $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
 $("input[name='homework_type']").val("<%= @homework.homework_type%>");
 $("#homework_editor").show();
+$("#BluePopupBox a.BlueCirBtn").click();

From 760b70971a396fab23df72a488abf1adf58d2669 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 16:27:34 +0800
Subject: [PATCH 084/101] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A=E6=97=B6=E5=AF=B9homework?=
 =?UTF-8?q?=5Ftype=E7=9A=84=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_select_homework.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index 5bea36d90..308f74938 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -6,6 +6,6 @@ $("#course_id").val("<%= @homework.course_id%>");
 $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
 $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
-$("input[name='homework_type']").val("<%= @homework.homework_type%>");
+//$("input[name='homework_type']").val("<%#= @homework.homework_type%>");
 $("#homework_editor").show();
 $("#BluePopupBox a.BlueCirBtn").click();

From dc564c37f1074e6336bb1a6f15c5abcb02fb160f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 16:36:10 +0800
Subject: [PATCH 085/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=82=E6=95=B0=20=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9JS=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/system_messages_controller.rb | 2 +-
 app/controllers/users_controller.rb           | 4 ++--
 app/helpers/users_helper.rb                   | 2 +-
 app/views/users/user_messages.html.erb        | 8 ++++----
 db/schema.rb                                  | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb
index 7b1fa33f8..42291a407 100644
--- a/app/controllers/system_messages_controller.rb
+++ b/app/controllers/system_messages_controller.rb
@@ -42,7 +42,7 @@ class SystemMessagesController < ApplicationController
     @system_messages.user_id = User.current.id
     respond_to do |format|
       if @system_messages.save
-        format.html {redirect_to user_message_path(User.current, :type => "system_message")}
+        format.html {redirect_to user_message_path(User.current, :type => "system_messages")}
         flash[:notice] = l(:notice_successful_message)
       else
         if params[:system_message][:content].empty?
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 344bccc9c..487b68bd0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -117,7 +117,7 @@ class UsersController < ApplicationController
       message_last_time = message_new_time.onclick_time
       message_new_time.update_attributes(:onclick_time => Time.now)
     end
-    @user_system_messages = SystemMessage.where("created_at >?", message_last_time)
+    @user_system_messages = SystemMessage.where("created_at >?", message_last_time).order("created_at desc")
     # 当前用户查看消息，则设置消息为已读
     if params[:viewed] == "all"
       course_querys = @user.course_messages
@@ -148,7 +148,7 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
-      when 'system_message'
+      when 'system_messages'
         @message_alls = SystemMessage.order("created_at desc").all
       when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 1ae6fbfb6..15eebc15e 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -60,7 +60,7 @@ module UsersHelper
         '未读消息'
       when 'apply'
         '用户申请'
-      when 'system_message'
+      when 'system_messages'
         '系统消息'
       when 'homework'
         '作业消息'
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 26b606f49..a9fb0ffbd 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -25,7 +25,7 @@
           <%# 系统贴吧 %>
           <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
           <%# 系统消息 %>
-          <li><%= link_to "系统消息", user_message_path(User.current, :type => 'system_message'), :class => "resourcesGrey" %></li>
+          <li><%= link_to "系统消息", user_message_path(User.current, :type => 'system_messages'), :class => "resourcesGrey" %></li>
         </ul>
       </li>
     </ul>
@@ -42,7 +42,7 @@
         </div>
     <% end %>
     <%# 系统消息 %>
-      <% if params[:type] != 'system_message' %>
+      <% if params[:type] != 'system_messages' %>
           <% @user_system_messages.each do |usm| %>
               <ul class="homepageNewsList fl">
                 <li class="homepageNewsPortrait fl">
@@ -56,7 +56,7 @@
                   <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
                 </li>
                 <li class="homepageNewsContent fl">
-                  <%= link_to usm.content.html_safe, {:controller => 'system_messages', :action => 'index'},
+                  <%= link_to usm.content.html_safe, user_message_path(User.current, :type => "system_messages"),
                               :class => "newsRed",
                               :onmouseover => "message_titile_show($(this),event);",
                               :onmouseout => "message_titile_hide($(this));"
@@ -350,7 +350,7 @@
                     </li>
                     <li class="homepageNewsPubType fl"><span class="newsBlue homepageNewsPublisher" >Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span></li>
                     <li class="homepageNewsContent fl">
-                      <%= link_to ma.content.html_safe, {:controller => 'system_messages', :action => 'index'},
+                      <%= link_to ma.content.html_safe, user_message_path(User.current, :type => "system_messages"),
                                   :class => "#{params[:type]=="unviewed" ? "newsBlack" : "newsRed"}",
                                   :onmouseover =>"message_titile_show($(this),event);",
                                   :onmouseout => "message_titile_hide($(this));"
diff --git a/db/schema.rb b/db/schema.rb
index b6e0d39e2..6bc43fe5c 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 => 20150911031029) do
+ActiveRecord::Schema.define(:version => 20150909062619) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1323,8 +1323,8 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
     t.float    "student_score"
     t.float    "teaching_asistant_score"
     t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                   :null => false
-    t.datetime "updated_at",                                                   :null => false
+    t.datetime "created_at",                                                       :null => false
+    t.datetime "updated_at",                                                       :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
     t.integer  "system_score"

From 585818fe7a9f234af16b0d3622b1d26fb1d502c6 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Sep 2015 16:42:24 +0800
Subject: [PATCH 086/101] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E9=87=8D=E5=A4=8D=E5=87=BA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course_activity.rb | 20 ++++++++++------
 app/models/forge_activity.rb  | 19 +++++++++++-----
 db/schema.rb                  | 43 ++++++++++++++---------------------
 3 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index 103796a72..4e74142ad 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -14,13 +14,19 @@ class CourseActivity < ActiveRecord::Base
     if user_activity
       user_activity.save
     else
-      user_activity = UserActivity.new
-      user_activity.act_id = self.course_act_id
-      user_activity.act_type = self.course_act_type
-      user_activity.container_type = "Course"
-      user_activity.container_id = self.course_id
-      user_activity.user_id = self.user_id
-      user_activity.save
+      if self.course_act_type == 'Message' && !self.course_act.parent_id.nil?
+        user_activity = UserActivity.where("act_type = 'Message' and act_id = #{self.course_act.parent.id}").first
+        user_activity.created_at = self.created_at
+        user_activity.save
+      else
+        user_activity = UserActivity.new
+        user_activity.act_id = self.course_act_id
+        user_activity.act_type = self.course_act_type
+        user_activity.container_type = "Course"
+        user_activity.container_id = self.course_id
+        user_activity.user_id = self.user_id
+        user_activity.save
+      end
     end
   end
 
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index 9bc10bebf..c4f13c6d0 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -29,12 +29,19 @@ class ForgeActivity < ActiveRecord::Base
     if user_activity
       user_activity.save
     else
-      user_activity = UserActivity.new
-      user_activity.act_id = self.forge_act_id
-      user_activity.act_type = self.forge_act_type
-      user_activity.container_type = "Project"
-      user_activity.container_id = self.project_id
-      user_activity.save
+      if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
+        user_activity = UserActivity.where("act_type = 'Message' and act_id = #{self.forge_act.parent.id}").first
+        user_activity.created_at = self.created_at
+        user_activity.save
+      else
+        user_activity = UserActivity.new
+        user_activity.act_id = self.forge_act_id
+        user_activity.act_type = self.forge_act_type
+        user_activity.container_type = "Project"
+        user_activity.container_id = self.project_id
+        user_activity.user_id = self.user_id
+        user_activity.save
+      end
     end
   end
 
diff --git a/db/schema.rb b/db/schema.rb
index 008e13129..9f81c43cf 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 => 20150911031029) do
+ActiveRecord::Schema.define(:version => 20150911064528) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -476,13 +476,6 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -497,26 +490,23 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
+  create_table "dts", :force => true do |t|
+    t.string   "IPLineCode"
     t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
+    t.string   "Num"
+    t.string   "Variable"
+    t.string   "TraceInfo"
+    t.string   "Method"
+    t.string   "File"
+    t.string   "IPLine"
+    t.string   "Review"
+    t.string   "Category"
+    t.string   "Defect"
+    t.string   "PreConditions"
+    t.string   "StartLine"
     t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -916,6 +906,7 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
+    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"

From 9f871ababbcc99c4ad8afaba4d6b3361a3dd4aa1 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 16:44:19 +0800
Subject: [PATCH 087/101] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=88=91=E8=A6=81?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/init_KindEditor.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index 18e7182fb..956262d2f 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -8,15 +8,30 @@ function init_editor(params){
         minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
             items:['emoticons'],
         afterChange:function(){//按键事件
-            nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
             this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), paramsHeight));
         },
+        afterBlur:function(){
+            nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+            //params.toolbar_container.hide();
+        },
+        afterFocus: function(){
+            var edit = this.edit;
+            var body = edit.doc.body;
+            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\#\d*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
+                edit.html('');
+            }
+            params.contentmsg.hide();
+           // params.toolbar_container.show();
+        },
+
         afterCreate:function(){
             var toolbar = $("div[class='ke-toolbar']",params.div_form);
-            $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+            toolbar.css('width',20);
+            $(".ke-outline>.ke-toolbar-icon",toolbar)//.append('表情');
             params.toolbar_container.append(toolbar);
             //init
             var edit = this.edit;
@@ -28,7 +43,9 @@ function init_editor(params){
             var body = edit.doc.body;
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
+            edit.html('<span id="hint" style="color: #808080">我要回复</span>');
             this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , paramsHeight));
+           // params.toolbar_container.hide();
 
         }
     }).loadPlugin('paste');
@@ -44,7 +61,7 @@ function nh_check_field(params){
         if(params.content.html()!=params.textarea.html() || params.issubmit==true){
             params.textarea.html(params.content.html());
             params.content.sync();
-            if(params.content.isEmpty()){
+            if(params.content.isEmpty() || /^\&\w*\;\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\#\d*\;\"\&\w*\;[\u4e00-\u9fa5]*\&\w*\;\/\w*\&\w*\;$/.test(params.textarea.html())){
                 params.contentmsg.html('内容不能为空');
                 params.contentmsg.css({color:'#ff0000'});
             }else{

From 312955e5dc80027e05aeb20aef7094fa38f4f94e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Sep 2015 16:45:50 +0800
Subject: [PATCH 088/101] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20150911064528_alter_user_activities.rb   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 db/migrate/20150911064528_alter_user_activities.rb

diff --git a/db/migrate/20150911064528_alter_user_activities.rb b/db/migrate/20150911064528_alter_user_activities.rb
new file mode 100644
index 000000000..a65f933d8
--- /dev/null
+++ b/db/migrate/20150911064528_alter_user_activities.rb
@@ -0,0 +1,26 @@
+class AlterUserActivities < ActiveRecord::Migration
+  def up
+    count = UserActivity.all.count / 30 + 3
+    transaction do
+      for i in 1 ... count do i
+        UserActivity.page(i).per(30).each do |activity|
+          if activity.act_type == 'Message'
+            if activity.act
+              unless activity.act.parent_id.nil?
+                parent_act = UserActivity.where("act_id = #{activity.act.parent.id} and act_type='Message'").first
+                parent_act.created_at = activity.act.parent.children.maximum("created_on")
+                parent_act.save
+                activity.destroy
+              end
+            else
+              activity.destroy
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

From c701eefb4272df07054d1cacb0f33fbf59814ea6 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 16:45:57 +0800
Subject: [PATCH 089/101] =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20=E6=88=91=E8=A6=81=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/init_KindEditor.js | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index 956262d2f..18e7182fb 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -8,30 +8,15 @@ function init_editor(params){
         minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
             items:['emoticons'],
         afterChange:function(){//按键事件
-
+            nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
             this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), paramsHeight));
         },
-        afterBlur:function(){
-            nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-            //params.toolbar_container.hide();
-        },
-        afterFocus: function(){
-            var edit = this.edit;
-            var body = edit.doc.body;
-            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\#\d*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
-                edit.html('');
-            }
-            params.contentmsg.hide();
-           // params.toolbar_container.show();
-        },
-
         afterCreate:function(){
             var toolbar = $("div[class='ke-toolbar']",params.div_form);
-            toolbar.css('width',20);
-            $(".ke-outline>.ke-toolbar-icon",toolbar)//.append('表情');
+            $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             //init
             var edit = this.edit;
@@ -43,9 +28,7 @@ function init_editor(params){
             var body = edit.doc.body;
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
-            edit.html('<span id="hint" style="color: #808080">我要回复</span>');
             this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , paramsHeight));
-           // params.toolbar_container.hide();
 
         }
     }).loadPlugin('paste');
@@ -61,7 +44,7 @@ function nh_check_field(params){
         if(params.content.html()!=params.textarea.html() || params.issubmit==true){
             params.textarea.html(params.content.html());
             params.content.sync();
-            if(params.content.isEmpty() || /^\&\w*\;\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\#\d*\;\"\&\w*\;[\u4e00-\u9fa5]*\&\w*\;\/\w*\&\w*\;$/.test(params.textarea.html())){
+            if(params.content.isEmpty()){
                 params.contentmsg.html('内容不能为空');
                 params.contentmsg.css({color:'#ff0000'});
             }else{

From 295a3332c60a282c935b4038082751e01544df45 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 16:47:53 +0800
Subject: [PATCH 090/101] =?UTF-8?q?schema.rb=E6=96=87=E4=BB=B6=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb | 1685 --------------------------------------------------
 1 file changed, 1685 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 13afb2bbf..ebc66ead1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,1687 +1,3 @@
-<<<<<<< HEAD
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20150911064528) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "act_id",                                  :null => false
-    t.string   "act_type",                                :null => false
-    t.integer  "user_id",                                 :null => false
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type", :default => ""
-    t.datetime "created_at"
-  end
-
-  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
-  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
-  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
-
-  create_table "activity_notifies", :force => true do |t|
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type"
-    t.integer  "activity_id"
-    t.string   "activity_type"
-    t.integer  "notify_to"
-    t.datetime "created_on"
-    t.integer  "is_read"
-  end
-
-  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
-  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
-  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
-
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    t.integer "user_id",    :null => false
-  end
-
-  create_table "apply_project_masters", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "apply_type"
-    t.integer  "apply_id"
-    t.integer  "status"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "attachments", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
-    t.integer  "is_public",                    :default => 1
-    t.integer  "copy_from"
-    t.integer  "quotes"
-  end
-
-  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
-  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
-  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
-
-  create_table "attachmentstypes", :force => true do |t|
-    t.integer "typeId",                 :null => false
-    t.string  "typeName", :limit => 50
-  end
-
-  create_table "auth_sources", :force => true do |t|
-    t.string  "type",              :limit => 30, :default => "",    :null => false
-    t.string  "name",              :limit => 60, :default => "",    :null => false
-    t.string  "host",              :limit => 60
-    t.integer "port"
-    t.string  "account"
-    t.string  "account_password",                :default => ""
-    t.string  "base_dn"
-    t.string  "attr_login",        :limit => 30
-    t.string  "attr_firstname",    :limit => 30
-    t.string  "attr_lastname",     :limit => 30
-    t.string  "attr_mail",         :limit => 30
-    t.boolean "onthefly_register",               :default => false, :null => false
-    t.boolean "tls",                             :default => false, :null => false
-    t.string  "filter"
-    t.integer "timeout"
-  end
-
-  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
-
-  create_table "biding_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "bids", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",                                    :null => false
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.text     "description"
-    t.datetime "created_on",                                :null => false
-    t.datetime "updated_on",                                :null => false
-    t.integer  "commit"
-    t.integer  "reward_type"
-    t.integer  "homework_type"
-    t.integer  "parent_id"
-    t.string   "password"
-    t.integer  "is_evaluation"
-    t.integer  "proportion",                :default => 60
-    t.integer  "comment_status",            :default => 0
-    t.integer  "evaluation_num",            :default => 3
-    t.integer  "open_anonymous_evaluation", :default => 1
-  end
-
-  create_table "boards", :force => true do |t|
-    t.integer "project_id",                      :null => false
-    t.string  "name",            :default => "", :null => false
-    t.string  "description"
-    t.integer "position",        :default => 1
-    t.integer "topics_count",    :default => 0,  :null => false
-    t.integer "messages_count",  :default => 0,  :null => false
-    t.integer "last_message_id"
-    t.integer "parent_id"
-    t.integer "course_id"
-  end
-
-  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
-  add_index "boards", ["project_id"], :name => "boards_project_id"
-
-  create_table "bug_to_osps", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.string   "description"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "changes", :force => true do |t|
-    t.integer "changeset_id",                               :null => false
-    t.string  "action",        :limit => 1, :default => "", :null => false
-    t.text    "path",                                       :null => false
-    t.text    "from_path"
-    t.string  "from_revision"
-    t.string  "revision"
-    t.string  "branch"
-  end
-
-  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
-
-  create_table "changeset_parents", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "parent_id",    :null => false
-  end
-
-  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
-  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
-
-  create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
-    t.string   "committer"
-    t.datetime "committed_on",  :null => false
-    t.text     "comments"
-    t.date     "commit_date"
-    t.string   "scmid"
-    t.integer  "user_id"
-  end
-
-  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
-  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
-  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
-  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
-  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
-
-  create_table "changesets_issues", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "issue_id",     :null => false
-  end
-
-  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
-
-  create_table "code_review_assignments", :force => true do |t|
-    t.integer "issue_id"
-    t.integer "change_id"
-    t.integer "attachment_id"
-    t.string  "file_path"
-    t.string  "rev"
-    t.string  "rev_to"
-    t.string  "action_type"
-    t.integer "changeset_id"
-  end
-
-  create_table "code_review_project_settings", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tracker_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "updated_by"
-    t.boolean  "hide_code_review_tab",     :default => false
-    t.integer  "auto_relation",            :default => 1
-    t.integer  "assignment_tracker_id"
-    t.text     "auto_assign"
-    t.integer  "lock_version",             :default => 0,     :null => false
-    t.boolean  "tracker_in_review_dialog", :default => false
-  end
-
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "code_reviews", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "change_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "line"
-    t.integer  "updated_by_id"
-    t.integer  "lock_version",        :default => 0, :null => false
-    t.integer  "status_changed_from"
-    t.integer  "status_changed_to"
-    t.integer  "issue_id"
-    t.string   "action_type"
-    t.string   "file_path"
-    t.string   "rev"
-    t.string   "rev_to"
-    t.integer  "attachment_id"
-    t.integer  "file_count",          :default => 0, :null => false
-    t.boolean  "diff_all"
-  end
-
-  create_table "comments", :force => true do |t|
-    t.string   "commented_type", :limit => 30, :default => "", :null => false
-    t.integer  "commented_id",                 :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.text     "comments"
-    t.datetime "created_on",                                   :null => false
-    t.datetime "updated_on",                                   :null => false
-  end
-
-  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
-  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
-
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "contests", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",      :default => ""
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-  end
-
-  create_table "course_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_act_id"
-    t.string   "course_act_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "course_attachments", :force => true do |t|
-    t.string   "filename"
-    t.string   "disk_filename"
-    t.integer  "filesize"
-    t.string   "content_type"
-    t.string   "digest"
-    t.integer  "downloads"
-    t.string   "author_id"
-    t.string   "integer"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "container_id",   :default => 0
-  end
-
-  create_table "course_groups", :force => true do |t|
-    t.string   "name"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_infos", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_message_id"
-    t.string   "course_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.string   "content"
-    t.integer  "status"
-  end
-
-  create_table "course_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "course_id"
-    t.float    "grade",            :default => 0.0
-    t.integer  "course_ac_para",   :default => 0
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "courses", :force => true do |t|
-    t.integer  "tea_id"
-    t.string   "name"
-    t.integer  "state"
-    t.string   "code"
-    t.integer  "time"
-    t.string   "extra"
-    t.datetime "created_at",                                  :null => false
-    t.datetime "updated_at",                                  :null => false
-    t.string   "location"
-    t.string   "term"
-    t.string   "string"
-    t.string   "password"
-    t.string   "setup_time"
-    t.string   "endup_time"
-    t.string   "class_period"
-    t.integer  "school_id"
-    t.text     "description"
-    t.integer  "status",                       :default => 1
-    t.integer  "attachmenttype",               :default => 2
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "is_public",       :limit => 1, :default => 1
-    t.integer  "inherit_members", :limit => 1, :default => 1
-    t.integer  "open_student",                 :default => 0
-  end
-
-  create_table "custom_fields", :force => true do |t|
-    t.string  "type",            :limit => 30, :default => "",    :null => false
-    t.string  "name",            :limit => 30, :default => "",    :null => false
-    t.string  "field_format",    :limit => 30, :default => "",    :null => false
-    t.text    "possible_values"
-    t.string  "regexp",                        :default => ""
-    t.integer "min_length",                    :default => 0,     :null => false
-    t.integer "max_length",                    :default => 0,     :null => false
-    t.boolean "is_required",                   :default => false, :null => false
-    t.boolean "is_for_all",                    :default => false, :null => false
-    t.boolean "is_filter",                     :default => false, :null => false
-    t.integer "position",                      :default => 1
-    t.boolean "searchable",                    :default => false
-    t.text    "default_value"
-    t.boolean "editable",                      :default => true
-    t.boolean "visible",                       :default => true,  :null => false
-    t.boolean "multiple",                      :default => false
-  end
-
-  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
-
-  create_table "custom_fields_projects", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "project_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
-
-  create_table "custom_fields_trackers", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "tracker_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
-
-  create_table "custom_values", :force => true do |t|
-    t.string  "customized_type", :limit => 30, :default => "", :null => false
-    t.integer "customized_id",                 :default => 0,  :null => false
-    t.integer "custom_field_id",               :default => 0,  :null => false
-    t.text    "value"
-  end
-
-  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
-  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0, :null => false
-    t.integer  "attempts",   :default => 0, :null => false
-    t.text     "handler",                   :null => false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "documents", :force => true do |t|
-    t.integer  "project_id",                :default => 0,  :null => false
-    t.integer  "category_id",               :default => 0,  :null => false
-    t.string   "title",       :limit => 60, :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_on"
-    t.integer  "user_id",                   :default => 0
-    t.integer  "is_public",                 :default => 1
-  end
-
-  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
-  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
-  add_index "documents", ["project_id"], :name => "documents_project_id"
-
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    t.string   "TraceInfo"
-    t.string   "Method"
-    t.string   "File"
-    t.string   "IPLine"
-    t.string   "Review"
-    t.string   "Category"
-    t.string   "Defect"
-    t.string   "PreConditions"
-    t.string   "StartLine"
-    t.integer  "project_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "enabled_modules", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",       :null => false
-    t.integer "course_id"
-  end
-
-  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
-
-  create_table "enumerations", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_default",                  :default => false, :null => false
-    t.string  "type"
-    t.boolean "active",                      :default => true,  :null => false
-    t.integer "project_id"
-    t.integer "parent_id"
-    t.string  "position_name", :limit => 30
-  end
-
-  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
-  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
-
-  create_table "first_pages", :force => true do |t|
-    t.string   "web_title"
-    t.string   "title"
-    t.text     "description"
-    t.string   "page_type"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
-  end
-
-  create_table "forge_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_act_id"
-    t.string   "forge_act_type"
-    t.integer  "org_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
-
-  create_table "forge_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_message_id"
-    t.string   "forge_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "forums", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.text     "description"
-    t.integer  "topic_count",  :default => 0
-    t.integer  "memo_count",   :default => 0
-    t.integer  "last_memo_id", :default => 0
-    t.integer  "creator_id",                  :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "sticky"
-    t.integer  "locked"
-  end
-
-  create_table "groups_users", :id => false, :force => true do |t|
-    t.integer "group_id", :null => false
-    t.integer "user_id",  :null => false
-  end
-
-  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
-
-  create_table "homework_attaches", :force => true do |t|
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.string   "reward"
-    t.string   "name"
-    t.text     "description"
-    t.integer  "state"
-    t.integer  "project_id",       :default => 0
-    t.float    "score",            :default => 0.0
-    t.integer  "is_teacher_score", :default => 0
-  end
-
-  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
-
-  create_table "homework_commons", :force => true do |t|
-    t.string   "name"
-    t.integer  "user_id"
-    t.text     "description"
-    t.date     "publish_time"
-    t.date     "end_time"
-    t.integer  "homework_type", :default => 1
-    t.string   "late_penalty"
-    t.integer  "course_id"
-    t.datetime "created_at",                   :null => false
-    t.datetime "updated_at",                   :null => false
-  end
-
-  create_table "homework_detail_manuals", :force => true do |t|
-    t.float    "ta_proportion"
-    t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
-    t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "homework_detail_programings", :force => true do |t|
-    t.string   "language"
-    t.text     "standard_code",      :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.float    "ta_proportion",                            :default => 0.1
-    t.integer  "question_id"
-  end
-
-  create_table "homework_evaluations", :force => true do |t|
-    t.string   "user_id"
-    t.string   "homework_attach_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "homework_for_courses", :force => true do |t|
-    t.integer "course_id"
-    t.integer "bid_id"
-  end
-
-  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
-  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
-
-  create_table "homework_tests", :force => true do |t|
-    t.text     "input"
-    t.text     "output"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.integer  "result"
-    t.text     "error_msg"
-  end
-
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "invite_lists", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "issue_categories", :force => true do |t|
-    t.integer "project_id",                   :default => 0,  :null => false
-    t.string  "name",           :limit => 30, :default => "", :null => false
-    t.integer "assigned_to_id"
-  end
-
-  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
-  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
-
-  create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id",                 :null => false
-    t.integer "issue_to_id",                   :null => false
-    t.string  "relation_type", :default => "", :null => false
-    t.integer "delay"
-  end
-
-  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
-  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
-  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
-
-  create_table "issue_statuses", :force => true do |t|
-    t.string  "name",               :limit => 30, :default => "",    :null => false
-    t.boolean "is_closed",                        :default => false, :null => false
-    t.boolean "is_default",                       :default => false, :null => false
-    t.integer "position",                         :default => 1
-    t.integer "default_done_ratio"
-  end
-
-  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
-  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
-  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
-
-  create_table "issues", :force => true do |t|
-    t.integer  "tracker_id",                              :null => false
-    t.integer  "project_id",                              :null => false
-    t.string   "subject",              :default => "",    :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.integer  "category_id"
-    t.integer  "status_id",                               :null => false
-    t.integer  "assigned_to_id"
-    t.integer  "priority_id",                             :null => false
-    t.integer  "fixed_version_id"
-    t.integer  "author_id",                               :null => false
-    t.integer  "lock_version",         :default => 0,     :null => false
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.date     "start_date"
-    t.integer  "done_ratio",           :default => 0,     :null => false
-    t.float    "estimated_hours"
-    t.integer  "parent_id"
-    t.integer  "root_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "is_private",           :default => false, :null => false
-    t.datetime "closed_on"
-    t.integer  "project_issues_index"
-  end
-
-  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
-  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
-  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
-  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
-  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
-  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
-  add_index "issues", ["project_id"], :name => "issues_project_id"
-  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
-  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
-  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
-
-  create_table "join_in_competitions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "competition_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "join_in_contests", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "journal_details", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
-
-  create_table "journal_replies", :id => false, :force => true do |t|
-    t.integer "journal_id"
-    t.integer "user_id"
-    t.integer "reply_id"
-  end
-
-  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
-  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
-  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
-
-  create_table "journals", :force => true do |t|
-    t.integer  "journalized_id",                 :default => 0,     :null => false
-    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
-    t.integer  "user_id",                        :default => 0,     :null => false
-    t.text     "notes"
-    t.datetime "created_on",                                        :null => false
-    t.boolean  "private_notes",                  :default => false, :null => false
-  end
-
-  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
-  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
-  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
-  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
-
-  create_table "journals_for_messages", :force => true do |t|
-    t.integer  "jour_id"
-    t.string   "jour_type"
-    t.integer  "user_id"
-    t.text     "notes"
-    t.integer  "status"
-    t.integer  "reply_id"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-    t.string   "m_parent_id"
-    t.boolean  "is_readed"
-    t.integer  "m_reply_count"
-    t.integer  "m_reply_id"
-    t.integer  "is_comprehensive_evaluation"
-  end
-
-  create_table "kindeditor_assets", :force => true do |t|
-    t.string   "asset"
-    t.integer  "file_size"
-    t.string   "file_type"
-    t.integer  "owner_id"
-    t.string   "asset_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "owner_type", :default => 0
-  end
-
-  create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
-    t.integer "inherited_from"
-  end
-
-  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
-  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
-
-  create_table "members", :force => true do |t|
-    t.integer  "user_id",           :default => 0,     :null => false
-    t.integer  "project_id",        :default => 0
-    t.datetime "created_on"
-    t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id",         :default => -1
-    t.integer  "course_group_id",   :default => 0
-  end
-
-  add_index "members", ["project_id"], :name => "index_members_on_project_id"
-  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
-  add_index "members", ["user_id"], :name => "index_members_on_user_id"
-
-  create_table "memo_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "forum_id"
-    t.integer  "memo_id"
-    t.string   "memo_type"
-    t.integer  "viewed"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "memos", :force => true do |t|
-    t.integer  "forum_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",                          :null => false
-    t.text     "content",                          :null => false
-    t.integer  "author_id",                        :null => false
-    t.integer  "replies_count", :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",          :default => false
-    t.boolean  "sticky",        :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "viewed_count",  :default => 0
-  end
-
-  create_table "message_alls", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "messages", :force => true do |t|
-    t.integer  "board_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",       :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "replies_count", :default => 0,     :null => false
-    t.integer  "last_reply_id"
-    t.datetime "created_on",                       :null => false
-    t.datetime "updated_on",                       :null => false
-    t.boolean  "locked",        :default => false
-    t.integer  "sticky",        :default => 0
-  end
-
-  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["board_id"], :name => "messages_board_id"
-  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
-  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
-  add_index "messages", ["parent_id"], :name => "messages_parent_id"
-
-  create_table "news", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "title",          :limit => 60, :default => "", :null => false
-    t.string   "summary",                      :default => ""
-    t.text     "description"
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.integer  "comments_count",               :default => 0,  :null => false
-    t.integer  "course_id"
-    t.datetime "updated_on"
-  end
-
-  add_index "news", ["author_id"], :name => "index_news_on_author_id"
-  add_index "news", ["created_on"], :name => "index_news_on_created_on"
-  add_index "news", ["project_id"], :name => "news_project_id"
-
-  create_table "no_uses", :force => true do |t|
-    t.integer  "user_id",     :null => false
-    t.string   "no_use_type"
-    t.integer  "no_use_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "notificationcomments", :force => true do |t|
-    t.string   "notificationcommented_type"
-    t.integer  "notificationcommented_id"
-    t.integer  "author_id"
-    t.text     "notificationcomments"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    t.string  "handle"
-    t.string  "assoc_type"
-    t.binary  "server_url"
-    t.binary  "secret"
-  end
-
-  create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",  :null => false
-    t.string  "server_url"
-    t.string  "salt",       :null => false
-  end
-
-  create_table "open_source_projects", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "commit_count",     :default => 0
-    t.integer  "code_line",        :default => 0
-    t.integer  "users_count",      :default => 0
-    t.date     "last_commit_time"
-    t.string   "url"
-    t.date     "date_collected"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-  end
-
-  create_table "option_numbers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "memo"
-    t.integer  "messages_for_issues"
-    t.integer  "issues_status"
-    t.integer  "replay_for_message"
-    t.integer  "replay_for_memo"
-    t.integer  "follow"
-    t.integer  "tread"
-    t.integer  "praise_by_one"
-    t.integer  "praise_by_two"
-    t.integer  "praise_by_three"
-    t.integer  "tread_by_one"
-    t.integer  "tread_by_two"
-    t.integer  "tread_by_three"
-    t.integer  "changeset"
-    t.integer  "document"
-    t.integer  "attachment"
-    t.integer  "issue_done_ratio"
-    t.integer  "post_issue"
-    t.integer  "score_type"
-    t.integer  "total_score"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.integer  "project_id"
-  end
-
-  create_table "organizations", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_link"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "phone_app_versions", :force => true do |t|
-    t.string   "version"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "poll_answers", :force => true do |t|
-    t.integer  "poll_question_id"
-    t.text     "answer_text"
-    t.integer  "answer_position"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "poll_questions", :force => true do |t|
-    t.string   "question_title"
-    t.integer  "question_type"
-    t.integer  "is_necessary"
-    t.integer  "poll_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_number"
-  end
-
-  create_table "poll_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "poll_votes", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_question_id"
-    t.integer  "poll_answer_id"
-    t.text     "vote_text"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "polls", :force => true do |t|
-    t.string   "polls_name"
-    t.string   "polls_type"
-    t.integer  "polls_group_id"
-    t.integer  "polls_status"
-    t.integer  "user_id"
-    t.datetime "published_at"
-    t.datetime "closed_at"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.text     "polls_description"
-    t.integer  "show_result",       :default => 1
-  end
-
-  create_table "praise_tread_caches", :force => true do |t|
-    t.integer  "object_id",   :null => false
-    t.string   "object_type"
-    t.integer  "praise_num"
-    t.integer  "tread_num"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "praise_treads", :force => true do |t|
-    t.integer  "user_id",                  :null => false
-    t.integer  "praise_tread_object_id"
-    t.string   "praise_tread_object_type"
-    t.integer  "praise_or_tread"
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
-  end
-
-  create_table "project_infos", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "project_scores", :force => true do |t|
-    t.string   "project_id"
-    t.integer  "score"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "issue_num",         :default => 0
-    t.integer  "issue_journal_num", :default => 0
-    t.integer  "news_num",          :default => 0
-    t.integer  "documents_num",     :default => 0
-    t.integer  "changeset_num",     :default => 0
-    t.integer  "board_message_num", :default => 0
-  end
-
-  create_table "project_statuses", :force => true do |t|
-    t.integer "changesets_count"
-    t.integer "watchers_count"
-    t.integer "project_id"
-    t.integer "project_type"
-    t.float   "grade",            :default => 0.0
-    t.integer "course_ac_para",   :default => 0
-  end
-
-  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
-
-  create_table "projecting_softapplictions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "softapplication_id"
-    t.integer  "project_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "projects", :force => true do |t|
-    t.string   "name",             :default => "",    :null => false
-    t.text     "description"
-    t.string   "homepage",         :default => ""
-    t.boolean  "is_public",        :default => true,  :null => false
-    t.integer  "parent_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "identifier"
-    t.integer  "status",           :default => 1,     :null => false
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "inherit_members",  :default => false, :null => false
-    t.integer  "project_type"
-    t.boolean  "hidden_repo",      :default => false, :null => false
-    t.integer  "attachmenttype",   :default => 1
-    t.integer  "user_id"
-    t.integer  "dts_test",         :default => 0
-    t.string   "enterprise_name"
-    t.integer  "organization_id"
-    t.integer  "project_new_type"
-  end
-
-  add_index "projects", ["lft"], :name => "index_projects_on_lft"
-  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
-
-  create_table "projects_trackers", :id => false, :force => true do |t|
-    t.integer "project_id", :default => 0, :null => false
-    t.integer "tracker_id", :default => 0, :null => false
-  end
-
-  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
-  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
-
-  create_table "queries", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",          :default => "",    :null => false
-    t.text    "filters"
-    t.integer "user_id",       :default => 0,     :null => false
-    t.boolean "is_public",     :default => false, :null => false
-    t.text    "column_names"
-    t.text    "sort_criteria"
-    t.string  "group_by"
-    t.string  "type"
-  end
-
-  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
-  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
-
-  create_table "relative_memo_to_open_source_projects", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
-    t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
-    t.string   "url"
-    t.string   "username"
-    t.string   "userhomeurl"
-    t.date     "date_collected"
-    t.string   "topic_resource"
-  end
-
-  create_table "repositories", :force => true do |t|
-    t.integer "project_id",                  :default => 0,     :null => false
-    t.string  "url",                         :default => "",    :null => false
-    t.string  "login",         :limit => 60, :default => ""
-    t.string  "password",                    :default => ""
-    t.string  "root_url",                    :default => ""
-    t.string  "type"
-    t.string  "path_encoding", :limit => 64
-    t.string  "log_encoding",  :limit => 64
-    t.text    "extra_info"
-    t.string  "identifier"
-    t.boolean "is_default",                  :default => false
-    t.boolean "hidden",                      :default => false
-  end
-
-  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
-
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
-  create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position",                        :default => 1
-    t.boolean "assignable",                      :default => true
-    t.integer "builtin",                         :default => 0,         :null => false
-    t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
-  end
-
-  create_table "schools", :force => true do |t|
-    t.string   "name"
-    t.string   "province"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "logo_link"
-  end
-
-  create_table "seems_rateable_cached_ratings", :force => true do |t|
-    t.integer  "cacheable_id",   :limit => 8
-    t.string   "cacheable_type"
-    t.float    "avg",                         :null => false
-    t.integer  "cnt",                         :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  create_table "seems_rateable_rates", :force => true do |t|
-    t.integer  "rater_id",         :limit => 8
-    t.integer  "rateable_id"
-    t.string   "rateable_type"
-    t.float    "stars",                                        :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.integer  "is_teacher_score",              :default => 0
-  end
-
-  create_table "settings", :force => true do |t|
-    t.string   "name",       :default => "", :null => false
-    t.text     "value"
-    t.datetime "updated_on"
-  end
-
-  add_index "settings", ["name"], :name => "index_settings_on_name"
-
-  create_table "shares", :force => true do |t|
-    t.date     "created_on"
-    t.string   "url"
-    t.string   "title"
-    t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.string   "description"
-  end
-
-  create_table "softapplications", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "app_type_id"
-    t.string   "app_type_name"
-    t.string   "android_min_version_available"
-    t.integer  "user_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "contest_id"
-    t.integer  "softapplication_id"
-    t.integer  "is_public"
-    t.string   "application_developers"
-    t.string   "deposit_project_url"
-    t.string   "deposit_project"
-    t.integer  "project_id"
-  end
-
-  create_table "student_work_tests", :force => true do |t|
-    t.integer  "student_work_id"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 9
-    t.text     "results"
-    t.text     "src"
-  end
-
-  create_table "student_works", :force => true do |t|
-    t.string   "name"
-    t.text     "description",             :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.integer  "user_id"
-    t.float    "final_score"
-    t.float    "teacher_score"
-    t.float    "student_score"
-    t.float    "teaching_asistant_score"
-    t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                       :null => false
-    t.datetime "updated_at",                                                       :null => false
-    t.integer  "late_penalty",                                  :default => 0
-    t.integer  "absence_penalty",                               :default => 0
-    t.integer  "system_score"
-    t.boolean  "is_test",                                       :default => false
-  end
-
-  create_table "student_works_evaluation_distributions", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "student_works_scores", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.integer  "score"
-    t.text     "comment"
-    t.integer  "reviewer_role"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "students_for_courses", :force => true do |t|
-    t.integer  "student_id"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
-  add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context",       :limit => 128
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  create_table "teachers", :force => true do |t|
-    t.string   "tea_name"
-    t.string   "location"
-    t.integer  "couurse_time"
-    t.integer  "course_code"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-    t.string   "extra"
-  end
-
-  create_table "time_entries", :force => true do |t|
-    t.integer  "project_id",  :null => false
-    t.integer  "user_id",     :null => false
-    t.integer  "issue_id"
-    t.float    "hours",       :null => false
-    t.string   "comments"
-    t.integer  "activity_id", :null => false
-    t.date     "spent_on",    :null => false
-    t.integer  "tyear",       :null => false
-    t.integer  "tmonth",      :null => false
-    t.integer  "tweek",       :null => false
-    t.datetime "created_on",  :null => false
-    t.datetime "updated_on",  :null => false
-  end
-
-  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
-  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
-  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
-  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
-  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
-
-  create_table "tokens", :force => true do |t|
-    t.integer  "user_id",                  :default => 0,  :null => false
-    t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40, :default => "", :null => false
-    t.datetime "created_on",                               :null => false
-  end
-
-  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
-  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
-
-  create_table "trackers", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.boolean "is_in_chlog",                 :default => false, :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_in_roadmap",               :default => true,  :null => false
-    t.integer "fields_bits",                 :default => 0
-  end
-
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "user_id"
-  end
-
-  create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",                            :null => false
-    t.date     "birthday"
-    t.string   "brief_introduction"
-    t.integer  "gender"
-    t.string   "location"
-    t.string   "occupation"
-    t.integer  "work_experience"
-    t.integer  "zip_code"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
-    t.integer  "identity"
-    t.string   "student_id"
-    t.string   "teacher_realname"
-    t.string   "student_realname"
-    t.string   "location_city"
-    t.integer  "school_id"
-    t.string   "description",        :default => ""
-  end
-
-  create_table "user_feedback_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "journals_for_message_id"
-    t.string   "journals_for_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_grades", :force => true do |t|
-    t.integer  "user_id",                     :null => false
-    t.integer  "project_id",                  :null => false
-    t.float    "grade",      :default => 0.0
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
-  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
-  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
-
-  create_table "user_levels", :force => true do |t|
-    t.integer "user_id"
-    t.integer "level"
-  end
-
-  create_table "user_preferences", :force => true do |t|
-    t.integer "user_id",   :default => 0,     :null => false
-    t.text    "others"
-    t.boolean "hide_mail", :default => false
-    t.string  "time_zone"
-  end
-
-  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
-
-  create_table "user_score_details", :force => true do |t|
-    t.integer  "current_user_id"
-    t.integer  "target_user_id"
-    t.string   "score_type"
-    t.string   "score_action"
-    t.integer  "user_id"
-    t.integer  "old_score"
-    t.integer  "new_score"
-    t.integer  "current_user_level"
-    t.integer  "target_user_level"
-    t.integer  "score_changeable_obj_id"
-    t.string   "score_changeable_obj_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_scores", :force => true do |t|
-    t.integer  "user_id",       :null => false
-    t.integer  "collaboration"
-    t.integer  "influence"
-    t.integer  "skill"
-    t.integer  "active"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "user_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.float    "grade",            :default => 0.0
-  end
-
-  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
-  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
-  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
-
-  create_table "users", :force => true do |t|
-    t.string   "login",                           :default => "",    :null => false
-    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
-    t.string   "firstname",         :limit => 30, :default => "",    :null => false
-    t.string   "lastname",                        :default => "",    :null => false
-    t.string   "mail",              :limit => 60, :default => "",    :null => false
-    t.boolean  "admin",                           :default => false, :null => false
-    t.integer  "status",                          :default => 1,     :null => false
-    t.datetime "last_login_on"
-    t.string   "language",          :limit => 5,  :default => ""
-    t.integer  "auth_source_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "type"
-    t.string   "identity_url"
-    t.string   "mail_notification",               :default => "",    :null => false
-    t.string   "salt",              :limit => 64
-  end
-
-  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
-  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
-  add_index "users", ["type"], :name => "index_users_on_type"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "project_id",      :default => 0,      :null => false
-    t.string   "name",            :default => "",     :null => false
-    t.string   "description",     :default => ""
-    t.date     "effective_date"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "wiki_page_title"
-    t.string   "status",          :default => "open"
-    t.string   "sharing",         :default => "none", :null => false
-  end
-
-  add_index "versions", ["project_id"], :name => "versions_project_id"
-  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
-
-  create_table "visitors", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "master_id"
-    t.datetime "updated_on"
-    t.datetime "created_on"
-  end
-
-  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
-  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
-  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
-
-  create_table "watchers", :force => true do |t|
-    t.string  "watchable_type", :default => "", :null => false
-    t.integer "watchable_id",   :default => 0,  :null => false
-    t.integer "user_id"
-  end
-
-  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
-  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
-  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
-
-  create_table "web_footer_companies", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_size"
-    t.string   "url"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "web_footer_oranizers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "wiki_content_versions", :force => true do |t|
-    t.integer  "wiki_content_id",                                       :null => false
-    t.integer  "page_id",                                               :null => false
-    t.integer  "author_id"
-    t.binary   "data",            :limit => 2147483647
-    t.string   "compression",     :limit => 6,          :default => ""
-    t.string   "comments",                              :default => ""
-    t.datetime "updated_on",                                            :null => false
-    t.integer  "version",                                               :null => false
-  end
-
-  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
-  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
-
-  create_table "wiki_contents", :force => true do |t|
-    t.integer  "page_id",                                          :null => false
-    t.integer  "author_id"
-    t.text     "text",       :limit => 2147483647
-    t.string   "comments",                         :default => ""
-    t.datetime "updated_on",                                       :null => false
-    t.integer  "version",                                          :null => false
-  end
-
-  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
-  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
-
-  create_table "wiki_pages", :force => true do |t|
-    t.integer  "wiki_id",                       :null => false
-    t.string   "title",                         :null => false
-    t.datetime "created_on",                    :null => false
-    t.boolean  "protected",  :default => false, :null => false
-    t.integer  "parent_id"
-  end
-
-  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
-  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
-  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
-
-  create_table "wiki_redirects", :force => true do |t|
-    t.integer  "wiki_id",      :null => false
-    t.string   "title"
-    t.string   "redirects_to"
-    t.datetime "created_on",   :null => false
-  end
-
-  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
-  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
-
-  create_table "wikis", :force => true do |t|
-    t.integer "project_id",                :null => false
-    t.string  "start_page",                :null => false
-    t.integer "status",     :default => 1, :null => false
-  end
-
-  add_index "wikis", ["project_id"], :name => "wikis_project_id"
-
-  create_table "workflows", :force => true do |t|
-    t.integer "tracker_id",                  :default => 0,     :null => false
-    t.integer "old_status_id",               :default => 0,     :null => false
-    t.integer "new_status_id",               :default => 0,     :null => false
-    t.integer "role_id",                     :default => 0,     :null => false
-    t.boolean "assignee",                    :default => false, :null => false
-    t.boolean "author",                      :default => false, :null => false
-    t.string  "type",          :limit => 30
-    t.string  "field_name",    :limit => 30
-    t.string  "rule",          :limit => 30
-  end
-
-  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
-  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
-  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
-  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
-
-  create_table "works_categories", :force => true do |t|
-    t.string   "category"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "zip_packs", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "homework_id"
-    t.string   "file_digest"
-    t.string   "file_path"
-    t.integer  "pack_times",   :default => 1
-    t.integer  "pack_size",    :default => 0
-    t.text     "file_digests"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-end
-=======
 # encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
@@ -3387,4 +1703,3 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
   end
 
 end
->>>>>>> b75247177ceb40c8ed83623238f8027d80826f8a

From 86f0889f5b09b1ea8555f51602b87823d7bca532 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Sep 2015 16:53:09 +0800
Subject: [PATCH 091/101] =?UTF-8?q?"=E6=88=91=E7=9A=84=E5=8A=A8=E6=80=81"?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6669a43d7..5db53b07b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -863,7 +863,7 @@ class UsersController < ApplicationController
         when "project_message"
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
         when "current_user"
-          @user_activities = UserActivity.where("user_id = #{User.current.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
         else
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
       end

From ecf2ac5e1965733c474dd740fb64460ed2a2f8f8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 16:57:49 +0800
Subject: [PATCH 092/101] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=86=85=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E4=BD=9C=E4=B8=9A=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb |  2 +-
 db/schema.rb                            | 92 +++++++++----------------
 public/javascripts/course.js            |  5 ++
 3 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index d6d5581e6..b59e97324 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -123,7 +123,7 @@
         <div class="subNav">
           <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
           <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
-          <%#= link_to( "+#{l(:label_course_homework_new)}", new_homework_common_path(:course => @course.id), :class => 'subnav_green c_white') if is_teacher %>
+          <%= link_to( "+#{l(:label_course_homework_new)}", "javascript:void(0)", :class => 'subnav_green c_white', :onclick => "new_homework_alert();") if is_teacher %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>
diff --git a/db/schema.rb b/db/schema.rb
index ebc66ead1..850160f9c 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 => 20150909062619) do
+ActiveRecord::Schema.define(:version => 20150911031029) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -236,13 +236,6 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
     t.boolean  "tracker_in_review_dialog", :default => false
   end
 
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "code_reviews", :force => true do |t|
     t.integer  "project_id"
     t.integer  "change_id"
@@ -476,13 +469,6 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -497,26 +483,23 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
+  create_table "dts", :force => true do |t|
+    t.string   "IPLineCode"
     t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
+    t.string   "Num"
+    t.string   "Variable"
+    t.string   "TraceInfo"
+    t.string   "Method"
+    t.string   "File"
+    t.string   "IPLine"
+    t.string   "Review"
+    t.string   "Category"
+    t.string   "Defect"
+    t.string   "PreConditions"
+    t.string   "StartLine"
     t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -1179,18 +1162,18 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
+    t.integer  "replies_count",      :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
+    t.boolean  "lock",               :default => false
+    t.boolean  "sticky",             :default => false
+    t.boolean  "is_quote",           :default => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_local", :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -1215,19 +1198,6 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1
@@ -1279,11 +1249,10 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.integer  "project_id"
     t.integer  "user_id"
-    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1453,8 +1422,8 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
     t.integer  "zip_code"
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
     t.integer  "identity"
+    t.string   "technical_title"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1522,6 +1491,9 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
+    t.integer  "level"
+    t.integer  "file"
+    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index be29fdc30..e5c50ac51 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -934,3 +934,8 @@ function SearchByName_1(url)
         location.href = url + "&name=" + $("#course_student_name").val() + "&group=" + $("#late_penalty").val();
     }
 }
+
+//新建作业临时弹框
+function new_homework_alert(){
+    alert("您好！课程内直接发布作业的功能正在改进中，请直接点击\n顶部导航栏的“作业”向本课程发送作业。谢谢！如有问\n题，可参见帮助中心。");
+}

From 4ee4bb6e9d57a6568ec3a9d0492c92dc2dad45cc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 17:07:30 +0800
Subject: [PATCH 093/101] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_list.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 1a24b1499..642373d58 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -35,8 +35,8 @@
             <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
             <div class="cl"></div>
           </div>
-          <%# if is_teacher%>
-          <% if false%>
+          <% if is_teacher%>
+          <%# if false%>
               <div class="homepagePostSetting">
                 <ul>
                   <li class="homepagePostSettingIcon">

From 9dc3f43af1ec6586455a968e447f07e243336f4d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Sep 2015 17:15:05 +0800
Subject: [PATCH 094/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20150911064528_alter_user_activities.rb   |   25 +-
 db/schema.rb                                  | 1694 -----------------
 2 files changed, 10 insertions(+), 1709 deletions(-)

diff --git a/db/migrate/20150911064528_alter_user_activities.rb b/db/migrate/20150911064528_alter_user_activities.rb
index a65f933d8..07cccae89 100644
--- a/db/migrate/20150911064528_alter_user_activities.rb
+++ b/db/migrate/20150911064528_alter_user_activities.rb
@@ -1,21 +1,16 @@
 class AlterUserActivities < ActiveRecord::Migration
   def up
-    count = UserActivity.all.count / 30 + 3
-    transaction do
-      for i in 1 ... count do i
-        UserActivity.page(i).per(30).each do |activity|
-          if activity.act_type == 'Message'
-            if activity.act
-              unless activity.act.parent_id.nil?
-                parent_act = UserActivity.where("act_id = #{activity.act.parent.id} and act_type='Message'").first
-                parent_act.created_at = activity.act.parent.children.maximum("created_on")
-                parent_act.save
-                activity.destroy
-              end
-            else
-              activity.destroy
-            end
+    UserActivity.each do |activity|
+      if activity.act_type == 'Message'
+        if activity.act
+          unless activity.act.parent_id.nil?
+            parent_act = UserActivity.where("act_id = #{activity.act.parent.id} and act_type='Message'").first
+            parent_act.created_at = activity.act.parent.children.maximum("created_on")
+            parent_act.save
+            activity.destroy
           end
+        else
+          activity.destroy
         end
       end
     end
diff --git a/db/schema.rb b/db/schema.rb
index 13afb2bbf..b98ab20b4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
@@ -931,1698 +930,6 @@ ActiveRecord::Schema.define(:version => 20150911064528) do
     t.datetime "updated_at",                 :null => false
   end
 
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    t.string  "handle"
-    t.string  "assoc_type"
-    t.binary  "server_url"
-    t.binary  "secret"
-  end
-
-  create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",  :null => false
-    t.string  "server_url"
-    t.string  "salt",       :null => false
-  end
-
-  create_table "open_source_projects", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "commit_count",     :default => 0
-    t.integer  "code_line",        :default => 0
-    t.integer  "users_count",      :default => 0
-    t.date     "last_commit_time"
-    t.string   "url"
-    t.date     "date_collected"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-  end
-
-  create_table "option_numbers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "memo"
-    t.integer  "messages_for_issues"
-    t.integer  "issues_status"
-    t.integer  "replay_for_message"
-    t.integer  "replay_for_memo"
-    t.integer  "follow"
-    t.integer  "tread"
-    t.integer  "praise_by_one"
-    t.integer  "praise_by_two"
-    t.integer  "praise_by_three"
-    t.integer  "tread_by_one"
-    t.integer  "tread_by_two"
-    t.integer  "tread_by_three"
-    t.integer  "changeset"
-    t.integer  "document"
-    t.integer  "attachment"
-    t.integer  "issue_done_ratio"
-    t.integer  "post_issue"
-    t.integer  "score_type"
-    t.integer  "total_score"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.integer  "project_id"
-  end
-
-  create_table "organizations", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_link"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "phone_app_versions", :force => true do |t|
-    t.string   "version"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "poll_answers", :force => true do |t|
-    t.integer  "poll_question_id"
-    t.text     "answer_text"
-    t.integer  "answer_position"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "poll_questions", :force => true do |t|
-    t.string   "question_title"
-    t.integer  "question_type"
-    t.integer  "is_necessary"
-    t.integer  "poll_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_number"
-  end
-
-  create_table "poll_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "poll_votes", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "poll_question_id"
-    t.integer  "poll_answer_id"
-    t.text     "vote_text"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "polls", :force => true do |t|
-    t.string   "polls_name"
-    t.string   "polls_type"
-    t.integer  "polls_group_id"
-    t.integer  "polls_status"
-    t.integer  "user_id"
-    t.datetime "published_at"
-    t.datetime "closed_at"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.text     "polls_description"
-    t.integer  "show_result",       :default => 1
-  end
-
-  create_table "praise_tread_caches", :force => true do |t|
-    t.integer  "object_id",   :null => false
-    t.string   "object_type"
-    t.integer  "praise_num"
-    t.integer  "tread_num"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "praise_treads", :force => true do |t|
-    t.integer  "user_id",                  :null => false
-    t.integer  "praise_tread_object_id"
-    t.string   "praise_tread_object_type"
-    t.integer  "praise_or_tread"
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
-  end
-
-  create_table "project_infos", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "project_scores", :force => true do |t|
-    t.string   "project_id"
-    t.integer  "score"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "issue_num",         :default => 0
-    t.integer  "issue_journal_num", :default => 0
-    t.integer  "news_num",          :default => 0
-    t.integer  "documents_num",     :default => 0
-    t.integer  "changeset_num",     :default => 0
-    t.integer  "board_message_num", :default => 0
-  end
-
-  create_table "project_statuses", :force => true do |t|
-    t.integer "changesets_count"
-    t.integer "watchers_count"
-    t.integer "project_id"
-    t.integer "project_type"
-    t.float   "grade",            :default => 0.0
-    t.integer "course_ac_para",   :default => 0
-  end
-
-  add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
-
-  create_table "projecting_softapplictions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "softapplication_id"
-    t.integer  "project_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "projects", :force => true do |t|
-    t.string   "name",             :default => "",    :null => false
-    t.text     "description"
-    t.string   "homepage",         :default => ""
-    t.boolean  "is_public",        :default => true,  :null => false
-    t.integer  "parent_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "identifier"
-    t.integer  "status",           :default => 1,     :null => false
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "inherit_members",  :default => false, :null => false
-    t.integer  "project_type"
-    t.boolean  "hidden_repo",      :default => false, :null => false
-    t.integer  "attachmenttype",   :default => 1
-    t.integer  "user_id"
-    t.integer  "dts_test",         :default => 0
-    t.string   "enterprise_name"
-    t.integer  "organization_id"
-    t.integer  "project_new_type"
-  end
-
-  add_index "projects", ["lft"], :name => "index_projects_on_lft"
-  add_index "projects", ["rgt"], :name => "index_projects_on_rgt"
-
-  create_table "projects_trackers", :id => false, :force => true do |t|
-    t.integer "project_id", :default => 0, :null => false
-    t.integer "tracker_id", :default => 0, :null => false
-  end
-
-  add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
-  add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
-
-  create_table "queries", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",          :default => "",    :null => false
-    t.text    "filters"
-    t.integer "user_id",       :default => 0,     :null => false
-    t.boolean "is_public",     :default => false, :null => false
-    t.text    "column_names"
-    t.text    "sort_criteria"
-    t.string  "group_by"
-    t.string  "type"
-  end
-
-  add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
-  add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
-
-  create_table "relative_memo_to_open_source_projects", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
-    t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
-    t.string   "url"
-    t.string   "username"
-    t.string   "userhomeurl"
-    t.date     "date_collected"
-    t.string   "topic_resource"
-  end
-
-  create_table "repositories", :force => true do |t|
-    t.integer "project_id",                  :default => 0,     :null => false
-    t.string  "url",                         :default => "",    :null => false
-    t.string  "login",         :limit => 60, :default => ""
-    t.string  "password",                    :default => ""
-    t.string  "root_url",                    :default => ""
-    t.string  "type"
-    t.string  "path_encoding", :limit => 64
-    t.string  "log_encoding",  :limit => 64
-    t.text    "extra_info"
-    t.string  "identifier"
-    t.boolean "is_default",                  :default => false
-    t.boolean "hidden",                      :default => false
-  end
-
-  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
-
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
-  create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 30, :default => "",        :null => false
-    t.integer "position",                        :default => 1
-    t.boolean "assignable",                      :default => true
-    t.integer "builtin",                         :default => 0,         :null => false
-    t.text    "permissions"
-    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
-  end
-
-  create_table "schools", :force => true do |t|
-    t.string   "name"
-    t.string   "province"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "logo_link"
-  end
-
-  create_table "seems_rateable_cached_ratings", :force => true do |t|
-    t.integer  "cacheable_id",   :limit => 8
-    t.string   "cacheable_type"
-    t.float    "avg",                         :null => false
-    t.integer  "cnt",                         :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  create_table "seems_rateable_rates", :force => true do |t|
-    t.integer  "rater_id",         :limit => 8
-    t.integer  "rateable_id"
-    t.string   "rateable_type"
-    t.float    "stars",                                        :null => false
-    t.string   "dimension"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
-    t.integer  "is_teacher_score",              :default => 0
-  end
-
-  create_table "settings", :force => true do |t|
-    t.string   "name",       :default => "", :null => false
-    t.text     "value"
-    t.datetime "updated_on"
-  end
-
-  add_index "settings", ["name"], :name => "index_settings_on_name"
-
-  create_table "shares", :force => true do |t|
-    t.date     "created_on"
-    t.string   "url"
-    t.string   "title"
-    t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.string   "description"
-  end
-
-  create_table "softapplications", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "app_type_id"
-    t.string   "app_type_name"
-    t.string   "android_min_version_available"
-    t.integer  "user_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "contest_id"
-    t.integer  "softapplication_id"
-    t.integer  "is_public"
-    t.string   "application_developers"
-    t.string   "deposit_project_url"
-    t.string   "deposit_project"
-    t.integer  "project_id"
-  end
-
-  create_table "student_work_tests", :force => true do |t|
-    t.integer  "student_work_id"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 9
-    t.text     "results"
-    t.text     "src"
-  end
-
-  create_table "student_works", :force => true do |t|
-    t.string   "name"
-    t.text     "description",             :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.integer  "user_id"
-    t.float    "final_score"
-    t.float    "teacher_score"
-    t.float    "student_score"
-    t.float    "teaching_asistant_score"
-    t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                       :null => false
-    t.datetime "updated_at",                                                       :null => false
-    t.integer  "late_penalty",                                  :default => 0
-    t.integer  "absence_penalty",                               :default => 0
-    t.integer  "system_score"
-    t.boolean  "is_test",                                       :default => false
-  end
-
-  create_table "student_works_evaluation_distributions", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "student_works_scores", :force => true do |t|
-    t.integer  "student_work_id"
-    t.integer  "user_id"
-    t.integer  "score"
-    t.text     "comment"
-    t.integer  "reviewer_role"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "students_for_courses", :force => true do |t|
-    t.integer  "student_id"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
-  add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context",       :limit => 128
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_type"], :name => "index_taggings_on_taggable_type"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  create_table "teachers", :force => true do |t|
-    t.string   "tea_name"
-    t.string   "location"
-    t.integer  "couurse_time"
-    t.integer  "course_code"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-    t.string   "extra"
-  end
-
-  create_table "time_entries", :force => true do |t|
-    t.integer  "project_id",  :null => false
-    t.integer  "user_id",     :null => false
-    t.integer  "issue_id"
-    t.float    "hours",       :null => false
-    t.string   "comments"
-    t.integer  "activity_id", :null => false
-    t.date     "spent_on",    :null => false
-    t.integer  "tyear",       :null => false
-    t.integer  "tmonth",      :null => false
-    t.integer  "tweek",       :null => false
-    t.datetime "created_on",  :null => false
-    t.datetime "updated_on",  :null => false
-  end
-
-  add_index "time_entries", ["activity_id"], :name => "index_time_entries_on_activity_id"
-  add_index "time_entries", ["created_on"], :name => "index_time_entries_on_created_on"
-  add_index "time_entries", ["issue_id"], :name => "time_entries_issue_id"
-  add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
-  add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
-
-  create_table "tokens", :force => true do |t|
-    t.integer  "user_id",                  :default => 0,  :null => false
-    t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40, :default => "", :null => false
-    t.datetime "created_on",                               :null => false
-  end
-
-  add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
-  add_index "tokens", ["value"], :name => "tokens_value", :unique => true
-
-  create_table "trackers", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.boolean "is_in_chlog",                 :default => false, :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_in_roadmap",               :default => true,  :null => false
-    t.integer "fields_bits",                 :default => 0
-  end
-
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "user_id"
-  end
-
-  create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",                            :null => false
-    t.date     "birthday"
-    t.string   "brief_introduction"
-    t.integer  "gender"
-    t.string   "location"
-    t.string   "occupation"
-    t.integer  "work_experience"
-    t.integer  "zip_code"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
-    t.integer  "identity"
-    t.string   "student_id"
-    t.string   "teacher_realname"
-    t.string   "student_realname"
-    t.string   "location_city"
-    t.integer  "school_id"
-    t.string   "description",        :default => ""
-  end
-
-  create_table "user_feedback_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "journals_for_message_id"
-    t.string   "journals_for_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_grades", :force => true do |t|
-    t.integer  "user_id",                     :null => false
-    t.integer  "project_id",                  :null => false
-    t.float    "grade",      :default => 0.0
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  add_index "user_grades", ["grade"], :name => "index_user_grades_on_grade"
-  add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
-  add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
-
-  create_table "user_levels", :force => true do |t|
-    t.integer "user_id"
-    t.integer "level"
-  end
-
-  create_table "user_preferences", :force => true do |t|
-    t.integer "user_id",   :default => 0,     :null => false
-    t.text    "others"
-    t.boolean "hide_mail", :default => false
-    t.string  "time_zone"
-  end
-
-  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
-
-  create_table "user_score_details", :force => true do |t|
-    t.integer  "current_user_id"
-    t.integer  "target_user_id"
-    t.string   "score_type"
-    t.string   "score_action"
-    t.integer  "user_id"
-    t.integer  "old_score"
-    t.integer  "new_score"
-    t.integer  "current_user_level"
-    t.integer  "target_user_level"
-    t.integer  "score_changeable_obj_id"
-    t.string   "score_changeable_obj_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "user_scores", :force => true do |t|
-    t.integer  "user_id",       :null => false
-    t.integer  "collaboration"
-    t.integer  "influence"
-    t.integer  "skill"
-    t.integer  "active"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
-
-  create_table "user_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.float    "grade",            :default => 0.0
-  end
-
-  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
-  add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
-  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
-
-  create_table "users", :force => true do |t|
-    t.string   "login",                           :default => "",    :null => false
-    t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
-    t.string   "firstname",         :limit => 30, :default => "",    :null => false
-    t.string   "lastname",                        :default => "",    :null => false
-    t.string   "mail",              :limit => 60, :default => "",    :null => false
-    t.boolean  "admin",                           :default => false, :null => false
-    t.integer  "status",                          :default => 1,     :null => false
-    t.datetime "last_login_on"
-    t.string   "language",          :limit => 5,  :default => ""
-    t.integer  "auth_source_id"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "type"
-    t.string   "identity_url"
-    t.string   "mail_notification",               :default => "",    :null => false
-    t.string   "salt",              :limit => 64
-  end
-
-  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
-  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
-  add_index "users", ["type"], :name => "index_users_on_type"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "project_id",      :default => 0,      :null => false
-    t.string   "name",            :default => "",     :null => false
-    t.string   "description",     :default => ""
-    t.date     "effective_date"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "wiki_page_title"
-    t.string   "status",          :default => "open"
-    t.string   "sharing",         :default => "none", :null => false
-  end
-
-  add_index "versions", ["project_id"], :name => "versions_project_id"
-  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
-
-  create_table "visitors", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "master_id"
-    t.datetime "updated_on"
-    t.datetime "created_on"
-  end
-
-  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
-  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
-  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
-
-  create_table "watchers", :force => true do |t|
-    t.string  "watchable_type", :default => "", :null => false
-    t.integer "watchable_id",   :default => 0,  :null => false
-    t.integer "user_id"
-  end
-
-  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
-  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
-  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
-
-  create_table "web_footer_companies", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_size"
-    t.string   "url"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "web_footer_oranizers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "wiki_content_versions", :force => true do |t|
-    t.integer  "wiki_content_id",                                       :null => false
-    t.integer  "page_id",                                               :null => false
-    t.integer  "author_id"
-    t.binary   "data",            :limit => 2147483647
-    t.string   "compression",     :limit => 6,          :default => ""
-    t.string   "comments",                              :default => ""
-    t.datetime "updated_on",                                            :null => false
-    t.integer  "version",                                               :null => false
-  end
-
-  add_index "wiki_content_versions", ["updated_on"], :name => "index_wiki_content_versions_on_updated_on"
-  add_index "wiki_content_versions", ["wiki_content_id"], :name => "wiki_content_versions_wcid"
-
-  create_table "wiki_contents", :force => true do |t|
-    t.integer  "page_id",                                          :null => false
-    t.integer  "author_id"
-    t.text     "text",       :limit => 2147483647
-    t.string   "comments",                         :default => ""
-    t.datetime "updated_on",                                       :null => false
-    t.integer  "version",                                          :null => false
-  end
-
-  add_index "wiki_contents", ["author_id"], :name => "index_wiki_contents_on_author_id"
-  add_index "wiki_contents", ["page_id"], :name => "wiki_contents_page_id"
-
-  create_table "wiki_pages", :force => true do |t|
-    t.integer  "wiki_id",                       :null => false
-    t.string   "title",                         :null => false
-    t.datetime "created_on",                    :null => false
-    t.boolean  "protected",  :default => false, :null => false
-    t.integer  "parent_id"
-  end
-
-  add_index "wiki_pages", ["parent_id"], :name => "index_wiki_pages_on_parent_id"
-  add_index "wiki_pages", ["wiki_id", "title"], :name => "wiki_pages_wiki_id_title"
-  add_index "wiki_pages", ["wiki_id"], :name => "index_wiki_pages_on_wiki_id"
-
-  create_table "wiki_redirects", :force => true do |t|
-    t.integer  "wiki_id",      :null => false
-    t.string   "title"
-    t.string   "redirects_to"
-    t.datetime "created_on",   :null => false
-  end
-
-  add_index "wiki_redirects", ["wiki_id", "title"], :name => "wiki_redirects_wiki_id_title"
-  add_index "wiki_redirects", ["wiki_id"], :name => "index_wiki_redirects_on_wiki_id"
-
-  create_table "wikis", :force => true do |t|
-    t.integer "project_id",                :null => false
-    t.string  "start_page",                :null => false
-    t.integer "status",     :default => 1, :null => false
-  end
-
-  add_index "wikis", ["project_id"], :name => "wikis_project_id"
-
-  create_table "workflows", :force => true do |t|
-    t.integer "tracker_id",                  :default => 0,     :null => false
-    t.integer "old_status_id",               :default => 0,     :null => false
-    t.integer "new_status_id",               :default => 0,     :null => false
-    t.integer "role_id",                     :default => 0,     :null => false
-    t.boolean "assignee",                    :default => false, :null => false
-    t.boolean "author",                      :default => false, :null => false
-    t.string  "type",          :limit => 30
-    t.string  "field_name",    :limit => 30
-    t.string  "rule",          :limit => 30
-  end
-
-  add_index "workflows", ["new_status_id"], :name => "index_workflows_on_new_status_id"
-  add_index "workflows", ["old_status_id"], :name => "index_workflows_on_old_status_id"
-  add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
-  add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
-
-  create_table "works_categories", :force => true do |t|
-    t.string   "category"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "zip_packs", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "homework_id"
-    t.string   "file_digest"
-    t.string   "file_path"
-    t.integer  "pack_times",   :default => 1
-    t.integer  "pack_size",    :default => 0
-    t.text     "file_digests"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-end
-=======
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20150909062619) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "act_id",                                  :null => false
-    t.string   "act_type",                                :null => false
-    t.integer  "user_id",                                 :null => false
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type", :default => ""
-    t.datetime "created_at"
-  end
-
-  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
-  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
-  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
-
-  create_table "activity_notifies", :force => true do |t|
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type"
-    t.integer  "activity_id"
-    t.string   "activity_type"
-    t.integer  "notify_to"
-    t.datetime "created_on"
-    t.integer  "is_read"
-  end
-
-  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
-  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
-  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
-
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    t.integer "user_id",    :null => false
-  end
-
-  create_table "apply_project_masters", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "apply_type"
-    t.integer  "apply_id"
-    t.integer  "status"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "attachments", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
-    t.integer  "is_public",                    :default => 1
-    t.integer  "copy_from"
-    t.integer  "quotes"
-  end
-
-  add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
-  add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
-  add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
-
-  create_table "attachmentstypes", :force => true do |t|
-    t.integer "typeId",                 :null => false
-    t.string  "typeName", :limit => 50
-  end
-
-  create_table "auth_sources", :force => true do |t|
-    t.string  "type",              :limit => 30, :default => "",    :null => false
-    t.string  "name",              :limit => 60, :default => "",    :null => false
-    t.string  "host",              :limit => 60
-    t.integer "port"
-    t.string  "account"
-    t.string  "account_password",                :default => ""
-    t.string  "base_dn"
-    t.string  "attr_login",        :limit => 30
-    t.string  "attr_firstname",    :limit => 30
-    t.string  "attr_lastname",     :limit => 30
-    t.string  "attr_mail",         :limit => 30
-    t.boolean "onthefly_register",               :default => false, :null => false
-    t.boolean "tls",                             :default => false, :null => false
-    t.string  "filter"
-    t.integer "timeout"
-  end
-
-  add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
-
-  create_table "biding_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "bids", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",                                    :null => false
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.text     "description"
-    t.datetime "created_on",                                :null => false
-    t.datetime "updated_on",                                :null => false
-    t.integer  "commit"
-    t.integer  "reward_type"
-    t.integer  "homework_type"
-    t.integer  "parent_id"
-    t.string   "password"
-    t.integer  "is_evaluation"
-    t.integer  "proportion",                :default => 60
-    t.integer  "comment_status",            :default => 0
-    t.integer  "evaluation_num",            :default => 3
-    t.integer  "open_anonymous_evaluation", :default => 1
-  end
-
-  create_table "boards", :force => true do |t|
-    t.integer "project_id",                      :null => false
-    t.string  "name",            :default => "", :null => false
-    t.string  "description"
-    t.integer "position",        :default => 1
-    t.integer "topics_count",    :default => 0,  :null => false
-    t.integer "messages_count",  :default => 0,  :null => false
-    t.integer "last_message_id"
-    t.integer "parent_id"
-    t.integer "course_id"
-  end
-
-  add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
-  add_index "boards", ["project_id"], :name => "boards_project_id"
-
-  create_table "bug_to_osps", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.string   "description"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "changes", :force => true do |t|
-    t.integer "changeset_id",                               :null => false
-    t.string  "action",        :limit => 1, :default => "", :null => false
-    t.text    "path",                                       :null => false
-    t.text    "from_path"
-    t.string  "from_revision"
-    t.string  "revision"
-    t.string  "branch"
-  end
-
-  add_index "changes", ["changeset_id"], :name => "changesets_changeset_id"
-
-  create_table "changeset_parents", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "parent_id",    :null => false
-  end
-
-  add_index "changeset_parents", ["changeset_id"], :name => "changeset_parents_changeset_ids"
-  add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
-
-  create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
-    t.string   "committer"
-    t.datetime "committed_on",  :null => false
-    t.text     "comments"
-    t.date     "commit_date"
-    t.string   "scmid"
-    t.integer  "user_id"
-  end
-
-  add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
-  add_index "changesets", ["repository_id", "revision"], :name => "changesets_repos_rev", :unique => true
-  add_index "changesets", ["repository_id", "scmid"], :name => "changesets_repos_scmid"
-  add_index "changesets", ["repository_id"], :name => "index_changesets_on_repository_id"
-  add_index "changesets", ["user_id"], :name => "index_changesets_on_user_id"
-
-  create_table "changesets_issues", :id => false, :force => true do |t|
-    t.integer "changeset_id", :null => false
-    t.integer "issue_id",     :null => false
-  end
-
-  add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
-
-  create_table "code_review_assignments", :force => true do |t|
-    t.integer "issue_id"
-    t.integer "change_id"
-    t.integer "attachment_id"
-    t.string  "file_path"
-    t.string  "rev"
-    t.string  "rev_to"
-    t.string  "action_type"
-    t.integer "changeset_id"
-  end
-
-  create_table "code_review_project_settings", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tracker_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "updated_by"
-    t.boolean  "hide_code_review_tab",     :default => false
-    t.integer  "auto_relation",            :default => 1
-    t.integer  "assignment_tracker_id"
-    t.text     "auto_assign"
-    t.integer  "lock_version",             :default => 0,     :null => false
-    t.boolean  "tracker_in_review_dialog", :default => false
-  end
-
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "code_reviews", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "change_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "line"
-    t.integer  "updated_by_id"
-    t.integer  "lock_version",        :default => 0, :null => false
-    t.integer  "status_changed_from"
-    t.integer  "status_changed_to"
-    t.integer  "issue_id"
-    t.string   "action_type"
-    t.string   "file_path"
-    t.string   "rev"
-    t.string   "rev_to"
-    t.integer  "attachment_id"
-    t.integer  "file_count",          :default => 0, :null => false
-    t.boolean  "diff_all"
-  end
-
-  create_table "comments", :force => true do |t|
-    t.string   "commented_type", :limit => 30, :default => "", :null => false
-    t.integer  "commented_id",                 :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.text     "comments"
-    t.datetime "created_on",                                   :null => false
-    t.datetime "updated_on",                                   :null => false
-  end
-
-  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
-  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
-
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "contests", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",      :default => ""
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-  end
-
-  create_table "course_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_act_id"
-    t.string   "course_act_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "course_attachments", :force => true do |t|
-    t.string   "filename"
-    t.string   "disk_filename"
-    t.integer  "filesize"
-    t.string   "content_type"
-    t.string   "digest"
-    t.integer  "downloads"
-    t.string   "author_id"
-    t.string   "integer"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "container_id",   :default => 0
-  end
-
-  create_table "course_groups", :force => true do |t|
-    t.string   "name"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_infos", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_message_id"
-    t.string   "course_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.string   "content"
-    t.integer  "status"
-  end
-
-  create_table "course_statuses", :force => true do |t|
-    t.integer  "changesets_count"
-    t.integer  "watchers_count"
-    t.integer  "course_id"
-    t.float    "grade",            :default => 0.0
-    t.integer  "course_ac_para",   :default => 0
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "courses", :force => true do |t|
-    t.integer  "tea_id"
-    t.string   "name"
-    t.integer  "state"
-    t.string   "code"
-    t.integer  "time"
-    t.string   "extra"
-    t.datetime "created_at",                                  :null => false
-    t.datetime "updated_at",                                  :null => false
-    t.string   "location"
-    t.string   "term"
-    t.string   "string"
-    t.string   "password"
-    t.string   "setup_time"
-    t.string   "endup_time"
-    t.string   "class_period"
-    t.integer  "school_id"
-    t.text     "description"
-    t.integer  "status",                       :default => 1
-    t.integer  "attachmenttype",               :default => 2
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "is_public",       :limit => 1, :default => 1
-    t.integer  "inherit_members", :limit => 1, :default => 1
-    t.integer  "open_student",                 :default => 0
-  end
-
-  create_table "custom_fields", :force => true do |t|
-    t.string  "type",            :limit => 30, :default => "",    :null => false
-    t.string  "name",            :limit => 30, :default => "",    :null => false
-    t.string  "field_format",    :limit => 30, :default => "",    :null => false
-    t.text    "possible_values"
-    t.string  "regexp",                        :default => ""
-    t.integer "min_length",                    :default => 0,     :null => false
-    t.integer "max_length",                    :default => 0,     :null => false
-    t.boolean "is_required",                   :default => false, :null => false
-    t.boolean "is_for_all",                    :default => false, :null => false
-    t.boolean "is_filter",                     :default => false, :null => false
-    t.integer "position",                      :default => 1
-    t.boolean "searchable",                    :default => false
-    t.text    "default_value"
-    t.boolean "editable",                      :default => true
-    t.boolean "visible",                       :default => true,  :null => false
-    t.boolean "multiple",                      :default => false
-  end
-
-  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
-
-  create_table "custom_fields_projects", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "project_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
-
-  create_table "custom_fields_trackers", :id => false, :force => true do |t|
-    t.integer "custom_field_id", :default => 0, :null => false
-    t.integer "tracker_id",      :default => 0, :null => false
-  end
-
-  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
-
-  create_table "custom_values", :force => true do |t|
-    t.string  "customized_type", :limit => 30, :default => "", :null => false
-    t.integer "customized_id",                 :default => 0,  :null => false
-    t.integer "custom_field_id",               :default => 0,  :null => false
-    t.text    "value"
-  end
-
-  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
-  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0, :null => false
-    t.integer  "attempts",   :default => 0, :null => false
-    t.text     "handler",                   :null => false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "documents", :force => true do |t|
-    t.integer  "project_id",                :default => 0,  :null => false
-    t.integer  "category_id",               :default => 0,  :null => false
-    t.string   "title",       :limit => 60, :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_on"
-    t.integer  "user_id",                   :default => 0
-    t.integer  "is_public",                 :default => 1
-  end
-
-  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
-  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
-  add_index "documents", ["project_id"], :name => "documents_project_id"
-
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
-    t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
-  end
-
-  create_table "enabled_modules", :force => true do |t|
-    t.integer "project_id"
-    t.string  "name",       :null => false
-    t.integer "course_id"
-  end
-
-  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
-
-  create_table "enumerations", :force => true do |t|
-    t.string  "name",          :limit => 30, :default => "",    :null => false
-    t.integer "position",                    :default => 1
-    t.boolean "is_default",                  :default => false, :null => false
-    t.string  "type"
-    t.boolean "active",                      :default => true,  :null => false
-    t.integer "project_id"
-    t.integer "parent_id"
-    t.string  "position_name", :limit => 30
-  end
-
-  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
-  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
-
-  create_table "first_pages", :force => true do |t|
-    t.string   "web_title"
-    t.string   "title"
-    t.text     "description"
-    t.string   "page_type"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
-  end
-
-  create_table "forge_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_act_id"
-    t.string   "forge_act_type"
-    t.integer  "org_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id"
-
-  create_table "forge_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_message_id"
-    t.string   "forge_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "forums", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.text     "description"
-    t.integer  "topic_count",  :default => 0
-    t.integer  "memo_count",   :default => 0
-    t.integer  "last_memo_id", :default => 0
-    t.integer  "creator_id",                  :null => false
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "sticky"
-    t.integer  "locked"
-  end
-
-  create_table "groups_users", :id => false, :force => true do |t|
-    t.integer "group_id", :null => false
-    t.integer "user_id",  :null => false
-  end
-
-  add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
-
-  create_table "homework_attaches", :force => true do |t|
-    t.integer  "bid_id"
-    t.integer  "user_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.string   "reward"
-    t.string   "name"
-    t.text     "description"
-    t.integer  "state"
-    t.integer  "project_id",       :default => 0
-    t.float    "score",            :default => 0.0
-    t.integer  "is_teacher_score", :default => 0
-  end
-
-  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
-
-  create_table "homework_commons", :force => true do |t|
-    t.string   "name"
-    t.integer  "user_id"
-    t.text     "description"
-    t.date     "publish_time"
-    t.date     "end_time"
-    t.integer  "homework_type", :default => 1
-    t.string   "late_penalty"
-    t.integer  "course_id"
-    t.datetime "created_at",                   :null => false
-    t.datetime "updated_at",                   :null => false
-  end
-
-  create_table "homework_detail_manuals", :force => true do |t|
-    t.float    "ta_proportion"
-    t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
-    t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "homework_detail_programings", :force => true do |t|
-    t.string   "language"
-    t.text     "standard_code",      :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.float    "ta_proportion",                            :default => 0.1
-    t.integer  "question_id"
-  end
-
-  create_table "homework_evaluations", :force => true do |t|
-    t.string   "user_id"
-    t.string   "homework_attach_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "homework_for_courses", :force => true do |t|
-    t.integer "course_id"
-    t.integer "bid_id"
-  end
-
-  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
-  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
-
-  create_table "homework_tests", :force => true do |t|
-    t.text     "input"
-    t.text     "output"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.integer  "result"
-    t.text     "error_msg"
-  end
-
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "invite_lists", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "issue_categories", :force => true do |t|
-    t.integer "project_id",                   :default => 0,  :null => false
-    t.string  "name",           :limit => 30, :default => "", :null => false
-    t.integer "assigned_to_id"
-  end
-
-  add_index "issue_categories", ["assigned_to_id"], :name => "index_issue_categories_on_assigned_to_id"
-  add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
-
-  create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id",                 :null => false
-    t.integer "issue_to_id",                   :null => false
-    t.string  "relation_type", :default => "", :null => false
-    t.integer "delay"
-  end
-
-  add_index "issue_relations", ["issue_from_id", "issue_to_id"], :name => "index_issue_relations_on_issue_from_id_and_issue_to_id", :unique => true
-  add_index "issue_relations", ["issue_from_id"], :name => "index_issue_relations_on_issue_from_id"
-  add_index "issue_relations", ["issue_to_id"], :name => "index_issue_relations_on_issue_to_id"
-
-  create_table "issue_statuses", :force => true do |t|
-    t.string  "name",               :limit => 30, :default => "",    :null => false
-    t.boolean "is_closed",                        :default => false, :null => false
-    t.boolean "is_default",                       :default => false, :null => false
-    t.integer "position",                         :default => 1
-    t.integer "default_done_ratio"
-  end
-
-  add_index "issue_statuses", ["is_closed"], :name => "index_issue_statuses_on_is_closed"
-  add_index "issue_statuses", ["is_default"], :name => "index_issue_statuses_on_is_default"
-  add_index "issue_statuses", ["position"], :name => "index_issue_statuses_on_position"
-
-  create_table "issues", :force => true do |t|
-    t.integer  "tracker_id",                              :null => false
-    t.integer  "project_id",                              :null => false
-    t.string   "subject",              :default => "",    :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.integer  "category_id"
-    t.integer  "status_id",                               :null => false
-    t.integer  "assigned_to_id"
-    t.integer  "priority_id",                             :null => false
-    t.integer  "fixed_version_id"
-    t.integer  "author_id",                               :null => false
-    t.integer  "lock_version",         :default => 0,     :null => false
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.date     "start_date"
-    t.integer  "done_ratio",           :default => 0,     :null => false
-    t.float    "estimated_hours"
-    t.integer  "parent_id"
-    t.integer  "root_id"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.boolean  "is_private",           :default => false, :null => false
-    t.datetime "closed_on"
-    t.integer  "project_issues_index"
-  end
-
-  add_index "issues", ["assigned_to_id"], :name => "index_issues_on_assigned_to_id"
-  add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
-  add_index "issues", ["category_id"], :name => "index_issues_on_category_id"
-  add_index "issues", ["created_on"], :name => "index_issues_on_created_on"
-  add_index "issues", ["fixed_version_id"], :name => "index_issues_on_fixed_version_id"
-  add_index "issues", ["priority_id"], :name => "index_issues_on_priority_id"
-  add_index "issues", ["project_id"], :name => "issues_project_id"
-  add_index "issues", ["root_id", "lft", "rgt"], :name => "index_issues_on_root_id_and_lft_and_rgt"
-  add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
-  add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
-
-  create_table "join_in_competitions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "competition_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "join_in_contests", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "journal_details", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
-
-  create_table "journal_replies", :id => false, :force => true do |t|
-    t.integer "journal_id"
-    t.integer "user_id"
-    t.integer "reply_id"
-  end
-
-  add_index "journal_replies", ["journal_id"], :name => "index_journal_replies_on_journal_id"
-  add_index "journal_replies", ["reply_id"], :name => "index_journal_replies_on_reply_id"
-  add_index "journal_replies", ["user_id"], :name => "index_journal_replies_on_user_id"
-
-  create_table "journals", :force => true do |t|
-    t.integer  "journalized_id",                 :default => 0,     :null => false
-    t.string   "journalized_type", :limit => 30, :default => "",    :null => false
-    t.integer  "user_id",                        :default => 0,     :null => false
-    t.text     "notes"
-    t.datetime "created_on",                                        :null => false
-    t.boolean  "private_notes",                  :default => false, :null => false
-  end
-
-  add_index "journals", ["created_on"], :name => "index_journals_on_created_on"
-  add_index "journals", ["journalized_id", "journalized_type"], :name => "journals_journalized_id"
-  add_index "journals", ["journalized_id"], :name => "index_journals_on_journalized_id"
-  add_index "journals", ["user_id"], :name => "index_journals_on_user_id"
-
-  create_table "journals_for_messages", :force => true do |t|
-    t.integer  "jour_id"
-    t.string   "jour_type"
-    t.integer  "user_id"
-    t.text     "notes"
-    t.integer  "status"
-    t.integer  "reply_id"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-    t.string   "m_parent_id"
-    t.boolean  "is_readed"
-    t.integer  "m_reply_count"
-    t.integer  "m_reply_id"
-    t.integer  "is_comprehensive_evaluation"
-  end
-
-  create_table "kindeditor_assets", :force => true do |t|
-    t.string   "asset"
-    t.integer  "file_size"
-    t.string   "file_type"
-    t.integer  "owner_id"
-    t.string   "asset_type"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "owner_type", :default => 0
-  end
-
-  create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
-    t.integer "inherited_from"
-  end
-
-  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
-  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
-
-  create_table "members", :force => true do |t|
-    t.integer  "user_id",           :default => 0,     :null => false
-    t.integer  "project_id",        :default => 0
-    t.datetime "created_on"
-    t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id",         :default => -1
-    t.integer  "course_group_id",   :default => 0
-  end
-
-  add_index "members", ["project_id"], :name => "index_members_on_project_id"
-  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
-  add_index "members", ["user_id"], :name => "index_members_on_user_id"
-
-  create_table "memo_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "forum_id"
-    t.integer  "memo_id"
-    t.string   "memo_type"
-    t.integer  "viewed"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "memos", :force => true do |t|
-    t.integer  "forum_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",                          :null => false
-    t.text     "content",                          :null => false
-    t.integer  "author_id",                        :null => false
-    t.integer  "replies_count", :default => 0
-    t.integer  "last_reply_id"
-    t.boolean  "lock",          :default => false
-    t.boolean  "sticky",        :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "viewed_count",  :default => 0
-  end
-
-  create_table "message_alls", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "messages", :force => true do |t|
-    t.integer  "board_id",                         :null => false
-    t.integer  "parent_id"
-    t.string   "subject",       :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "replies_count", :default => 0,     :null => false
-    t.integer  "last_reply_id"
-    t.datetime "created_on",                       :null => false
-    t.datetime "updated_on",                       :null => false
-    t.boolean  "locked",        :default => false
-    t.integer  "sticky",        :default => 0
-  end
-
-  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
-  add_index "messages", ["board_id"], :name => "messages_board_id"
-  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
-  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
-  add_index "messages", ["parent_id"], :name => "messages_parent_id"
-
-  create_table "news", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "title",          :limit => 60, :default => "", :null => false
-    t.string   "summary",                      :default => ""
-    t.text     "description"
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.datetime "created_on"
-    t.integer  "comments_count",               :default => 0,  :null => false
-    t.integer  "course_id"
-  end
-
-  add_index "news", ["author_id"], :name => "index_news_on_author_id"
-  add_index "news", ["created_on"], :name => "index_news_on_created_on"
-  add_index "news", ["project_id"], :name => "news_project_id"
-
-  create_table "no_uses", :force => true do |t|
-    t.integer  "user_id",     :null => false
-    t.string   "no_use_type"
-    t.integer  "no_use_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "notificationcomments", :force => true do |t|
-    t.string   "notificationcommented_type"
-    t.integer  "notificationcommented_id"
-    t.integer  "author_id"
-    t.text     "notificationcomments"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -3387,4 +1694,3 @@ ActiveRecord::Schema.define(:version => 20150909062619) do
   end
 
 end
->>>>>>> b75247177ceb40c8ed83623238f8027d80826f8a

From 0d595c5feb99aa22fdf4c1aa0fa1f9d73db16b7d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 17:19:12 +0800
Subject: [PATCH 095/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index 10169f30b..1d9f0cc10 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -12,7 +12,7 @@
         <p id="content_notice_span" class="ml55"></p>
       </div>
       <div class="actions">
-        <%= link_to l(:label_submit), "javascript:void(0)",:class => "small", :onclick => "system_message_editor.sync();submit_message();" %>
+        <%= link_to l(:label_submit), "javascript:void(0)", :class => "btn_message_free", :onclick => "system_message_editor.sync();submit_message();" %>
       </div>
   <% end %>
 </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8fdb26ffc..ac983479a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2809,4 +2809,5 @@ img.school_avatar {
     max-width: none;
 }
 
-.admin_message_warn{font-size: 12px;color: red;}
\ No newline at end of file
+.admin_message_warn{font-size: 12px;color: red;}
+a.btn_message_free{ background:#15BCCF; display:block;  text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 5ff90bb43..7d6478e4e 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -19,7 +19,7 @@ table{ background:#fff;}
 .line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 .no_border{ border:none;}
 .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/new_project/public_icon.png) 135px -193px no-repeat;}
-
+a.btn_message_free{ background:#ff5722; display:block;  text-align:center; color:#fff; padding:3px 0; width:80px; margin-bottom:10px;}
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}
 h3{ font-size:14px; color:#e8770d;}

From 42ddc0bf3c49ca90229a4fc615bad3d97ac0e332 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Sep 2015 17:19:40 +0800
Subject: [PATCH 096/101] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/db/migrate/20150911064528_alter_user_activities.rb b/db/migrate/20150911064528_alter_user_activities.rb
index 07cccae89..b6ede5bdb 100644
--- a/db/migrate/20150911064528_alter_user_activities.rb
+++ b/db/migrate/20150911064528_alter_user_activities.rb
@@ -1,6 +1,6 @@
 class AlterUserActivities < ActiveRecord::Migration
   def up
-    UserActivity.each do |activity|
+    UserActivity.all.each do |activity|
       if activity.act_type == 'Message'
         if activity.act
           unless activity.act.parent_id.nil?

From da269ef71615cf3eceb49fcd03caa934409ae02a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 17:27:07 +0800
Subject: [PATCH 097/101] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E5=85=88=E8=BE=93=E5=85=A5=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb |  2 +-
 db/schema.rb                                 | 41 ++++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index b22053f6d..6e07e7122 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -10,7 +10,7 @@
 
 <div class="HomeWorkCon">
   <div>
-    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  w701" maxlength="255" onfocus="$('#homework_editor').show()" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
+    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  w701" maxlength="255" onfocus="$('#homework_editor').show()" onkeyup="regex_homework_name();" placeholder="发布作业，请先输入作业标题" value="<%= homework.name%>" >
     <p id="homework_name_span" class="c_red mt5"></p>
   </div>
   <div class="cl"></div>
diff --git a/db/schema.rb b/db/schema.rb
index b98ab20b4..4dd7f1b68 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -476,6 +476,13 @@ ActiveRecord::Schema.define(:version => 20150911064528) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -490,23 +497,26 @@ ActiveRecord::Schema.define(:version => 20150911064528) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    t.string   "TraceInfo"
-    t.string   "Method"
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
     t.string   "File"
-    t.string   "IPLine"
-    t.string   "Review"
-    t.string   "Category"
-    t.string   "Defect"
-    t.string   "PreConditions"
-    t.string   "StartLine"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
     t.integer  "project_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -906,7 +916,6 @@ ActiveRecord::Schema.define(:version => 20150911064528) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"

From 169c7f3a97fbe5df0fa5d2bca6fd93f10388df67 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Sep 2015 17:48:14 +0800
Subject: [PATCH 098/101] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BD=9C=E4=B8=9A=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index a9fb0ffbd..a184a6d7e 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -99,7 +99,7 @@
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
-                <% if ma.course_message_type == "HomeworkCommon" %>
+                <% if ma.course_message_type == "HomeworkCommon" &&  ma.status != 1 %>
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                       <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了作业：</span></li>

From 1673f4f960c5bf3405e35dcc02e6c3851eac61c4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 17:52:37 +0800
Subject: [PATCH 099/101] =?UTF-8?q?1=E3=80=81=E8=80=81=E5=B8=88=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E7=BC=96=E7=A8=8B=E4=BD=9C=E5=93=81=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=202=E3=80=81=E9=9A=90=E8=97=8F=E5=BC=80=E5=90=AF=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_common/index.html.erb      |  4 +-
 .../_programing_work_show.html.erb            | 70 ++++++++++---------
 app/views/student_work/index.html.erb         |  2 +-
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 694069b44..a39f93671 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -25,8 +25,8 @@
           ( <%= link_to homework.student_works.count, student_work_index_path(:homework => homework.id), :class => 'c_red'%> )
         </p>
         <% if @is_teacher%>
-            <%= homework_anonymous_comment(homework)%>
-            <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit")  %>
+            <%#= homework_anonymous_comment(homework)%>
+            <%#= link_to(l(:label_bid_respond_delete), homework_common_path(homework),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit")  %>
             <%#= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %>
         <% elsif @is_student%>
             <%= student_anonymous_comment homework %>
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index b259e20a5..10e1870ef 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -25,40 +25,44 @@
     </li>
 
     <% if @is_teacher%>
-        <li ><span class="tit_fb ">测试结果：</span>
-          <table class="border_ce" cellpadding="0" cellspacing="0">
-            <tbody>
-            <tr class=" b_lblue fb c_w">
-              <td  class="td_tit ">输入</td>
-              <td class="td_tit border_l ">输出</td>
-              <td class="td_50 border_l ">测试结果</td>
-            </tr>
-            <%@homework.homework_tests.each do |test|%>
-                <tr class="<%= cycle("", "b_grey") %>">
-                  <td  class="td_tit hidden">
-                    <%= test.input%>
-                  </td>
-                  <td  class="td_tit border_l hidden">
-                    <%= test.output%>
-                  </td>
-                  <% student_work_test = StudentWorkTest.where(:homework_test_id => test.id,:student_work_id => @work.id).first%>
-                  <td class="td_50 c_red border_l"><%= student_work_test.nil? ? "正在编译" : student_work_test.status_to_s%></td>
-                  <input type="hidden" value="<%= student_work_test.result if student_work_test%>">
-                </tr>
-            <% end%>
-            <% student_work_test = @work.student_work_test.first%>
-            <% if student_work_test && student_work_test.error_msg && !student_work_test.error_msg.empty?%>
-                <tr class="border_t" >
-                  <td colspan="3" class="td_end" >
-                    <%= student_work_test.error_msg%>
-                  </td>
-                </tr>
-            <% end%>
-
-            </tbody>
-          </table>
-          <div class="cl"></div>
+        <li>
+          <span class="tit_fb ">
+            测试结果：
+          </span>
+          <div class="show_hwork_p break_word">
+            <% @work.student_work_tests.each_with_index do |test, index| %>
+                <div class="ProResultTop">
+                  <p class="c_blue fl">第<%= @work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
+                  <div class="cl"></div>
+                </div>
+                <% if test.status.to_i == -2 %>
+                    <div class="ProResultCon "><%= test.results.first %></div>
+                <% else %>
+                    <div class="ProResultTable " >
+                      <ul class="ProResultUl " >
+                        <% test.results.each_with_index do |x, i| %>
+                            <li >
+                              <span class="w60 T_C">测试<%=i+1%></span>
+                              <% if x["status"].to_i != 0 %>
+                                  <span class="w150 c_red">测试错误！</span>
+                                  <span class="w60">您的输出：</span>
+                                  <span class="W200"><%=x["result"]%></span>
+                                  <span class="w60">正确输出：</span>
+                                  <span  class="W200"><%=x["output"]%></span>
+                                  <div class="cl"></div>
+                              <% else %>
+                                  <span class="w150 c_green">测试正确！</span>
+                                  <div class="cl"></div>
+                              <% end %>
+                            </li>
+                        <% end %>
+                    </ul>
+                    </div>
+                <% end %>
+            <% end %>
+          </div>
         </li>
+
         <!-- 编程作业老师才可以评分 -->
         <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
           <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index e8fa33902..d128eab67 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -123,7 +123,7 @@
             <%= @homework.name%>
         </h4>
         <% if @is_teacher%>
-            <%= homework_anonymous_comment(@homework)%>
+            <%#= homework_anonymous_comment(@homework)%>
         <% else%>
             <%= student_anonymous_comment @homework %>
             <%= student_new_homework @homework %>

From f1a6e3d7e3b3bf0227f58cf32832268cfb10cf34 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Sep 2015 17:57:25 +0800
Subject: [PATCH 100/101] =?UTF-8?q?=E2=80=9C=E5=85=B3=E4=BA=8E=E6=88=91?=
 =?UTF-8?q?=E4=BB=AC=E2=80=9D=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css   | 2 ++
 public/stylesheets/public.css     | 1 +
 public/stylesheets/public_new.css | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index bd71ef270..0111ec212 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -680,6 +680,8 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 /*20150826协议 LB*/
 .AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
 .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
+.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
+.AgreementImg{margin: 0px auto; width: 820px;}
 
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 5ff90bb43..c445f1631 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -536,5 +536,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 }
 
 .AgreementBox{margin: 20px 0; color: #666666; font-size: 14px; line-height: 1.9;}
+.Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
 .AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
 .AgreementImg{margin: 0px auto; width: 820px;}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index 555cef836..7cd0a461c 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -789,3 +789,9 @@ div.flash.warning, .conflict {
 /*消息铃铛样式*/
 .navHomepageNews {width:30px; display:block; float:right; margin-top:4px; position:relative; margin-right: 8px;}
 .newsActive {width:6px; height:6px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:20px; top:8px;z-index:999}
+
+/*20150826协议 LB*/
+.AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
+.Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
+.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
+.AgreementImg{margin: 0px auto; width: 820px;}
\ No newline at end of file

From 8f3889e2c56c55c1eb42b1a712ea05a88756caf3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 11 Sep 2015 18:03:37 +0800
Subject: [PATCH 101/101] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A1=86=E8=87=AA=E5=8A=A8=E5=A2=9E=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/new_user_commit_homework.html.erb | 6 +++++-
 public/javascripts/homework.js                    | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 8b02b4594..ab7cb5b59 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -70,11 +70,15 @@
           <div class="mt15">
             <span>请使用 <%= @homework.language_name %> 语言编写</span>
             </div>
-          <div class="mt10">
+            <div class="mt10">
               <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>
             </div>
             <div class="mt10">
             <%= f.text_area :description, id: 'program-src', class:"InputBox W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
+              <script>
+                  var text = document.getElementById("program-src");
+                  autoTextarea(text);// 调用
+              </script>
             </div>
             <div class="mt10">
               <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 45902ef16..ca07093fe 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -95,9 +95,9 @@ $(function(){
 
 //发布作业
 
-    $('#program-src').focus(function(){
-        $(this).css('height', '100px');
-    });
+    //$('#program-src').focus(function(){
+    //    $(this).css('height', '100px');
+    //});
     
     var datepickerOptions={dateFormat:'yy-mm-dd',firstDay:0,showWeek:true,showOtherMonths:true,selectOtherMonths:true};