diff --git a/.gitignore b/.gitignore
index 5810401cb..fdb7a3c6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.swp
 /config/database.yml
 /config/configuration.yml
+/config/additional_environment.rb
 
 /files/*
 /log/*
diff --git a/Gemfile b/Gemfile
index c1f7bcbeb..660a7ff49 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,10 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
-source 'http://rubygems.oneapm.com' do
-    gem 'oneapm_rpm'
-end
-
+gem 'rest-client'
 gem "mysql2", "= 0.3.18"
 gem 'redis-rails'
 gem 'rubyzip'
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index dc1cceb87..181f76b22 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -336,9 +336,11 @@ class AccountController < ApplicationController
       :expires => 1.month.from_now,
       :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
       :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
-      :domain => Redmine::Configuration['cookie_domain'],
       :httponly => true
     }
+    if Redmine::Configuration['cookie_domain'].present?
+      cookie_options = cookie_options.merge(domain: Redmine::Configuration['cookie_domain'])
+    end
     cookies[autologin_cookie_name] = cookie_options
   end
 
diff --git a/app/controllers/activity_notifys_controller.rb b/app/controllers/activity_notifys_controller.rb
new file mode 100644
index 000000000..c696836b2
--- /dev/null
+++ b/app/controllers/activity_notifys_controller.rb
@@ -0,0 +1,54 @@
+class ActivityNotifysController < ApplicationController
+#  layout 'base_projects'#by young
+#  default_search_scope :messages
+  before_filter :find_project_by_project_id#, :find_board_if_available
+#  before_filter :authorize, :except => [:new, :show, :create, :index]
+#  accept_rss_auth :index, :show
+
+  helper :activities
+  def index
+    query = nil
+    if @course
+      query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=?',@course.id,'Course',User.current.id);
+    else
+      @events_by_day = []
+    end
+
+    if( query != nil )
+      logger.info('xxoo')
+      limit = 10;
+      @obj_count = query.count();
+      @obj_pages = Paginator.new @obj_count,limit,params['page']
+      list = query.order('id desc').limit(limit).offset(@obj_pages.offset).all();
+      events=[];
+      for item in list
+        event = item.activity;
+        event.set_notify_id(item.id)
+        event.set_notify_is_read(item.is_read)
+        events << event
+      end
+      @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
+      @controller_name = 'ActivityNotifys'
+      logger.info('aavv')
+    end
+    respond_to do |format|
+      format.html  {render :template => 'courses/show', :layout => 'base_courses'}
+    end
+  end
+
+  def chang_read_flag
+    if @course
+      if(params[:an_id] != nil )
+        query = ActivityNotify.where('id=? and notify_to=?',params[:an_id],User.current.id)
+      else
+        query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=? and is_read=0',@course.id,'Course',User.current.id)
+      end
+      @result = query.update_all('is_read=1');
+    else
+      @result = false;
+    end
+    respond_to do |format|
+      format.html{render :layout => nil}
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 88cd51d67..10e5e6f06 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -199,7 +199,11 @@ class ApplicationController < ActionController::Base
   # Logs out current user
   def logout_user
     if User.current.logged?
-      cookies.delete(autologin_cookie_name, domain: :all)
+      if Redmine::Configuration['cookie_domain'].present?
+        cookies.delete(autologin_cookie_name, domain: Redmine::Configuration['cookie_domain'])
+      else
+        cookies.delete autologin_cookie_name
+      end
       # Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
       self.logged_user = nil
     end
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index d880ebe35..c310087f7 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -65,19 +65,22 @@ class AttachmentsController < ApplicationController
   def download
     # modify by nwb
     # 下载添加权限设置
-     candown = attachment_candown @attachment
+    candown = attachment_candown @attachment
     if candown || User.current.admin? || User.current.id == @attachment.author_id
       @attachment.increment_download
       if stale?(:etag => @attachment.digest)
-        send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-                  :type => detect_content_type(@attachment),
-                  :disposition => 'attachment'    #inline can open in browser
+        convered_file = File.join(Rails.root, "files", "convered_office", @attachment.disk_filename + ".html")
+        if File.exist?(convered_file)
+          send_file convered_file,  :type => 'text/html; charset=utf-8', :disposition => 'inline'
+        else
+          send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+            :type => detect_content_type(@attachment),
+            :disposition => 'attachment'    #inline can open in browser
+        end
       end
-
     else
       render_403 :message => :notice_not_authorized
     end
-
   rescue => e
     redirect_to "http:  //" + (Setting.host_name.to_s) +"/file_not_found.html"
   end
@@ -188,9 +191,19 @@ class AttachmentsController < ApplicationController
       if !@attachment.container.nil? &&
          (@attachment.container.is_a?(Course) || ((@attachment.container.has_attribute?(:course) || @attachment.container.has_attribute?(:course_id) )  &&
          @attachment.container.course ) || ((@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) &&
-         @attachment.container.board && @attachment.container.board.course ) )
+         @attachment.container.board && @attachment.container.board.course ) || @attachment.container.is_a?(StudentWorksScore) ||  @attachment.container.is_a?(HomeworkCommon) ||
+         @attachment.container.is_a?(StudentWork))
         if @attachment.container.is_a?(News)
           format.html { redirect_to_referer_or news_path(@attachment.container) }
+        elsif @attachment.container.is_a?(StudentWorksScore)
+          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          format.js
+        elsif @attachment.container.is_a?(HomeworkCommon)
+          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          format.js
+        elsif @attachment.container.is_a?(StudentWork)
+          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          format.js
         elsif @attachment.container.is_a?(Message)
           format.html { redirect_to_referer_or new_board_message_path(@attachment.container) }
         elsif @course.nil?
@@ -428,7 +441,7 @@ private
         @attachment.container.board.course)
       @course = @attachment.container.board.course
     else
-      unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion'
+      unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
         @project = @attachment.project
       end
     end
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index db5bded55..6ff4d2f97 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -88,14 +88,40 @@ class BoardsController < ApplicationController
               preload(:author, {:last_reply => :author}).
               all
         elsif @course
-          board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
-              includes(:last_reply).
-              # limit(@topic_pages.per_page).
-              # offset(@topic_pages.offset).
-
-              preload(:author, {:last_reply => :author}).
-              all : []
-          @topics = paginateHelper board_topics,10
+          #
+          # board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
+          #     includes(:last_reply).
+          #     # limit(@topic_pages.per_page).
+          #     # offset(@topic_pages.offset).
+          #
+          #     preload(:author, {:last_reply => :author}).
+          #     all : []
+          # @topics = paginateHelper board_topics,10
+          if( @board )
+            limit = 10;
+            pageno = params[:page];
+            if(pageno == nil || pageno=='')
+              dw_topic = nil;
+              if( params[:parent_id]!=nil && params[:parent_id]!='' )
+                dw_topic = @board.topics.where(id:params[:parent_id]).first();
+              end
+              if( dw_topic != nil )
+                dw_count = @board.topics.where('(sticky>?) or (sticky=? and created_on>?)',dw_topic.sticky,dw_topic.sticky,dw_topic.created_on).count();
+                dw_count = dw_count+1;
+                pageno = dw_count%10==0 ? (dw_count/limit) : (dw_count/limit+1)
+              end
+            end
+            if(pageno == nil || pageno=='')
+              pageno=1;
+            end
+            @topic_count = @board.topics.count();
+            @topic_pages = Paginator.new @topic_count, limit, pageno
+            @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
+                            limit(limit).offset(@topic_pages.offset).includes(:last_reply).
+                            preload(:author, {:last_reply => :author}).all();
+          else
+            @topics = [];
+          end
         end
 
         @message = Message.new(:board => @board)
@@ -103,6 +129,7 @@ class BoardsController < ApplicationController
         if @project
           render :action => 'show', :layout => 'base_projects'
         elsif @course
+          @params=params
           render :action => 'show', :layout => 'base_courses'
         end
       }
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index be69b1777..333ad77b1 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -298,7 +298,6 @@ class CoursesController < ApplicationController
     else
       page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1)
       @results = student_homework_score(0,page_from, 10,"desc")
-      @results = paginateHelper_for_members @results, 10
     end
   end
 
@@ -317,14 +316,11 @@ class CoursesController < ApplicationController
         when '1'
           @subPage_title = l :label_teacher_list
           @all_members = searchTeacherAndAssistant(@course)
-          #@members = paginateHelper @all_members, 10
           @members =  @all_members
         when '2'
           @subPage_title = l :label_student_list
           page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
           @all_members = student_homework_score(0,page, 10,"desc")
-          # @all_members = @course.members
-         # @members = paginateHelper_for_members @all_members, 10
           @members =  @all_members
       end
       respond_to do |format|
@@ -379,11 +375,9 @@ class CoursesController < ApplicationController
       if group_id == '0'
         page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
         @results = student_homework_score(0,page, 10,@score_sort_by)
-        @results = paginateHelper_for_members @results, 10
       else
         @group = CourseGroup.find(group_id)
         @results = student_homework_score(group_id, 0, 0,@score_sort_by)
-        @results = paginateHelper @results, 10
       end
     end
   end
@@ -612,32 +606,6 @@ class CoursesController < ApplicationController
     end
   end
 
-  def homework
-    if @course.is_public != 0 || User.current.member_of_course?(@course) || User.current.admin?
-      bids = @course.homeworks.order('created_on DESC')
-      bids = bids.like(params[:name]) if params[:name].present?
-      @bids = paginateHelper bids,10
-      @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
-      @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
-      render :layout => 'base_courses'
-    else
-      render_403
-    end
-   end
-
-  # 新建作业
-  def new_homework
-    @homework = Bid.new
-    @homework.safe_attributes = params[:bid]
-    @homework.open_anonymous_evaluation = 1
-    @homework.deadline = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    if (User.current.logged? && User.current.member_of_course?(Course.find params[:id] ))
-      render :layout => 'base_courses'
-    else
-      render_403
-    end
-  end
-
   def toggleCourse
     @course_prefs = Course.find_by_extra(@course.extra)
     unless (@course_prefs.teacher == User.current || User.current.admin?)
@@ -712,8 +680,8 @@ class CoursesController < ApplicationController
         "show_course_news" => true,
         "show_course_messages" => true,
         #"show_course_journals_for_messages" => true,
-        "show_bids" => true,
-        "show_homeworks" => true,
+        # "show_bids" => true,
+        # "show_homeworks" => true,
         "show_polls" => true
     }
     @date_to ||= Date.today + 1
@@ -863,44 +831,32 @@ class CoursesController < ApplicationController
   end
 
   def student_homework_score(groupid,start_from, nums, score_sort_by)
-    #teachers = find_course_teachers(@course)
     start_from = start_from * nums
     sql_select = ""
     if groupid == 0
-      if nums == 0
-        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-            WHERE members.course_id = #{@course.id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{@course.id}) AND members.user_id = homework_attaches.user_id
-        AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id}) GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{@course.id} AND
-        students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by}"
-      else
-        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-            WHERE members.course_id = #{@course.id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{@course.id}) AND members.user_id = homework_attaches.user_id
-        AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id})  GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{@course.id} AND
-        students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by} " #limit #{start_from}, #{nums}"
-
-      end
+      sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.final_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{@course.id}
+          AND student_works.user_id = members.user_id
+        ) AS score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
     else
-      sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-        WHERE members.course_id = #{@course.id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{@course.id}) AND members.user_id = homework_attaches.user_id
-        and members.course_group_id = #{groupid} AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id})
-        GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{@course.id}
-        and members.course_group_id = #{groupid} AND
-        students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by}"
+      sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.final_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{@course.id}
+          AND student_works.user_id = members.user_id
+        ) AS score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{@course.id} AND members.course_group_id = #{groupid} ORDER BY score #{score_sort_by}"
     end
     sql = ActiveRecord::Base.connection()
     homework_scores = Member.find_by_sql(sql_select)
@@ -922,7 +878,6 @@ class CoursesController < ApplicationController
     @score_sort_by = "desc"
     page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1)
     @results = student_homework_score(group.id,0,0, "desc")
-    @results = paginateHelper @results, 10
 
   end
 
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index f6b044c63..5dd5363b9 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -334,9 +334,8 @@ class HomeworkAttachController < ApplicationController
       @homework.name = name
       @homework.description = description
       @homework.project_id = params[:project_id] || 0
-      if params[:attachments]
-        @homework.save_attachments(params[:attachments])
-      end
+      @homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(@homework)
       if @homework.save
         respond_to do |format|
           format.html { redirect_to course_for_bid_url @homework.bid }
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
new file mode 100644
index 000000000..06bc1fd38
--- /dev/null
+++ b/app/controllers/homework_common_controller.rb
@@ -0,0 +1,210 @@
+class HomeworkCommonController < ApplicationController
+  layout "base_courses"
+  before_filter :find_course, :only => [:index,:new,:create]
+  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]
+
+  def index
+    homeworks = @course.homework_commons.order("created_at desc")
+    @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
+    @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
+    @homeworks = paginateHelper homeworks,20
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def new
+    @homework = HomeworkCommon.new
+    @homework.safe_attributes = params[:homework_common]
+    @homework.late_penalty = 0
+    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+
+    #匿评作业相关属性
+    @homework_detail_manual = HomeworkDetailManual.new
+    @homework_detail_manual.ta_proportion = 0.6
+    @homework_detail_manual.absence_penalty = 0
+    @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
+    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)
+
+      #匿评作业相关属性
+      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
+
+      if homework.save
+        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
+    respond_to do |format|
+      format.html
+    end
+  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]
+    @homework.late_penalty = params[:late_penalty]
+    @homework.user_id = User.current.id
+    @homework.course_id = @course.id
+
+    #匿评作业相关属性
+    @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]
+    @homework_detail_manual.absence_penalty = params[:absence_penalty]
+
+    @homework.save_attachments(params[:attachments])
+    render_attachment_warning_if_needed(@homework)
+
+    if @homework.save && @homework_detail_manual.save
+      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)
+        }
+      end
+    end
+  end
+
+  def destroy
+    if @homework.destroy
+      respond_to do |format|
+        format.html {redirect_to homework_common_index_path(:course => @course.id)}
+      end
+    end
+  end
+
+  #开启匿评
+  #statue 1:启动成功，2：启动失败，作业总数大于等于2份时才能启动匿评，3:已开启匿评，请务重复开启,4:没有开启匿评的权限
+  def start_anonymous_comment
+    @statue =4 and return unless User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
+    if @homework_detail_manual.comment_status == 1
+      student_works = @homework.student_works
+      if student_works && student_works.size >=2
+        student_works.each_with_index do |work, index|
+          user = work.user
+          n = @homework_detail_manual.evaluation_num
+          n = n < student_works.size ? n : student_works.size - 1
+          assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+          assigned_homeworks.each do |h|
+            student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+            student_works_evaluation_distributions.save
+          end
+        end
+        @homework_detail_manual.update_column('comment_status', 2)
+        @statue = 1
+      else
+        @statue = 2
+      end
+    else
+      @statue = 3
+    end
+  end
+
+  #关闭匿评
+  def stop_anonymous_comment
+    @homework_detail_manual.update_column('comment_status', 3)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #提示
+  def alert_anonymous_comment
+    @cur_size = 0
+    @totle_size = 0
+    if @homework_detail_manual.comment_status == 1
+      @totle_size = @course.student.count
+      @cur_size = @homework.student_works.size
+    elsif @homework_detail_manual.comment_status == 2
+      @homework.student_works.map { |work| @totle_size += work.student_works_evaluation_distributions.count}
+      @cur_size = 0
+      @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
+    end
+    @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  private
+  #获取课程
+  def find_course
+    @course = Course.find params[:course]
+  rescue
+    render_404
+  end
+  #获取作业
+  def find_homework
+    @homework = HomeworkCommon.find params[:id]
+    @homework_detail_manual = @homework.homework_detail_manual
+    @course = @homework.course
+  rescue
+    render_404
+  end
+  #是不是课程的老师
+  def teacher_of_course
+    render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+  end
+
+  def get_assigned_homeworks(student_works, n, index)
+    student_works += student_works
+    student_works[index + 1 .. index + n]
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index e33eb8d75..9e36d15f4 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -31,6 +31,8 @@ class MessagesController < ApplicationController
   include AttachmentsHelper
   helper :project_score
 
+  include CoursesHelper
+
   REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
 
   # Show a topic and its replies
@@ -91,6 +93,29 @@ class MessagesController < ApplicationController
           ids = params[:asset_id].split(',')
           update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
         end
+        # 与我相关动态的记录add start
+        if(@board.course_id>0) #项目的先不管
+          teachers = searchTeacherAndAssistant(@board.course);
+          for teacher in teachers
+            if(teacher.user_id != User.current.id)
+              notify = ActivityNotify.new()
+              if(@board.course_id>0)
+                notify.activity_container_id = @board.course_id
+                notify.activity_container_type = 'Course'
+              else
+                notify.activity_container_id = @board.project_id
+                notify.activity_container_type = 'Project'
+              end
+              notify.activity_id = @message.id
+              notify.activity_type = 'Message'
+              notify.notify_to = teacher.user_id
+              notify.is_read = 0
+              notify.save()
+            end
+          end
+        end
+        # 与我相关动态的记录add end
+
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
         render_attachment_warning_if_needed(@message)
         if params[:is_board]
@@ -151,6 +176,35 @@ class MessagesController < ApplicationController
         ids = params[:asset_id].split(',')
         update_kindeditor_assets_owner ids,@reply.id,OwnerTypeHelper::MESSAGE
       end
+
+      # 与我相关动态的记录add start
+      if(@board.course_id>0) #项目的先不管
+        notifyto_arr = {}
+        notifyto_arr[@topic.author_id] = @topic.author_id
+        if( params[:parent_topic] != nil && params[:parent_topic] != '')
+          parent_topic = Message.find(params[:parent_topic])
+          notifyto_arr[parent_topic.author_id] = parent_topic.author_id
+        end
+        notifyto_arr.each do |k,user_id|
+          if(user_id != User.current.id)
+            notify = ActivityNotify.new()
+            if(@board.course_id>0)
+              notify.activity_container_id = @board.course_id
+              notify.activity_container_type = 'Course'
+            else
+              notify.activity_container_id = @board.project_id
+              notify.activity_container_type = 'Project'
+            end
+            notify.activity_id = @reply.id
+            notify.activity_type = 'Message'
+            notify.notify_to = user_id
+            notify.is_read = 0
+            notify.save()
+          end
+        end
+      end
+      # 与我相关动态的记录add end
+
       call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
       attachments = Attachment.attach_files(@reply, params[:attachments])
       render_attachment_warning_if_needed(@reply)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
new file mode 100644
index 000000000..30fd0ff50
--- /dev/null
+++ b/app/controllers/student_work_controller.rb
@@ -0,0 +1,300 @@
+class StudentWorkController < ApplicationController
+  layout "base_courses"
+  include StudentWorkHelper
+  require 'bigdecimal'
+  before_filter :find_homework, :only => [:new, :index, :create]
+  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
+  before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
+  before_filter :author_of_work, :only => [:edit, :update, :destroy]
+
+  def index
+    @order,@b_sort,@name = params[:order] || "final_score",params[:sort] || "desc",params[:name] || ""
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    #老师 || 非匿评作业 || 匿评结束 显示所有的作品
+    @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3
+    if @show_all
+      if @homework.homework_type == 1 || @is_teacher || User.current.admin?
+        @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+      else
+        my_work = @homework.student_works.where(:user_id => User.current.id)
+        if my_work.empty?
+          @stundet_works = []
+        else
+          @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+        end
+      end
+    else #学生
+      if @homework.homework_detail_manual.comment_status == 1 #未开启匿评，只显示我的作品
+        @stundet_works = @homework.student_works.where(:user_id => User.current.id)
+      elsif @homework.homework_detail_manual.comment_status == 2 #匿评列表，显示匿评作品和我的作品
+        @is_evaluation = true
+        my_work = @homework.student_works.where(:user_id => User.current.id)
+        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+      end
+    end
+    @homework_commons = @course.homework_commons.order("created_at desc")
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    respond_to do |format|
+      format.html
+      format.xls {
+        send_data(homework_to_xls(@stundet_works), :type => "text/excel;charset=utf-8; header=present",
+                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_homework_list)}.xls")
+      }
+    end
+  end
+
+  def new
+    student_work = @homework.student_works.where("user_id = ?",User.current.id).first
+    if student_work.nil?
+      @stundet_work = StudentWork.new
+      respond_to do |format|
+        format.html
+      end
+    else
+      render_403
+    end
+  end
+
+  def create
+    if params[:student_work]
+      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])
+      render_attachment_warning_if_needed(stundet_work)
+      if stundet_work.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_create)
+            redirect_to student_work_index_url(:homework => @homework.id)
+          }
+        end
+        return
+      end
+    end
+    respond_to do |format|
+      format.html {
+        flash[:notice] = l(:notice_failed_create)
+        redirect_to new_student_work_url(:homework => @homework.id)
+      }
+    end
+  end
+
+  def edit
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def update
+    if params[:student_work]
+      @work.name = params[:student_work][:name]
+      @work.description = params[:student_work][:description]
+      @work.project_id = params[:student_work][:project]
+      @work.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(@work)
+      if @work.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_edit)
+            redirect_to student_work_index_url(:homework => @homework.id)
+          }
+        end
+        return
+      end
+    end
+    respond_to do |format|
+      format.html{redirect_to edit_student_work_url(@work)}
+    end
+  end
+
+  def show
+    @score = student_work_score @work,User.current
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def destroy
+    if @work.destroy
+      respond_to do |format|
+        format.html {
+          redirect_to student_work_index_url(:homework => @homework.id)
+        }
+      end
+    end
+  end
+
+  #添加评分，已评分则为修改评分
+  def add_score
+    render_403 and return if User.current == @work.user #不可以匿评自己的作品
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    #老师、教辅可以随时评分，学生只能在匿评作业的匿评阶段进行评分
+    render_403 and return unless @is_teacher || (@homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2)
+    @score = student_work_score @work,User.current
+    if @score
+      @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+      @score.score = params[:score] if params[:score]
+      @is_new = false
+    else
+      @score = StudentWorksScore.new
+      @score.score = params[:score] if params[:score]
+      @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+      @score.user_id = User.current.id
+      @score.student_work_id = @work.id
+      role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
+      User.current.admin? ? @score.reviewer_role = 1 : @score.reviewer_role = get_role_by_name(role)
+      @is_new = true
+    end
+
+    @score.save_attachments(params[:attachments])
+    render_attachment_warning_if_needed(@score)
+
+    if @score.save
+      case @score.reviewer_role
+        when 1 #教师评分：最后一个教师评分为最终评分
+          @work.teacher_score = @score.score
+          @work.final_score = @score.score
+        when 2 #教辅评分 教辅评分显示平均分
+          @work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+          if @work.teacher_score.nil?
+            if @work.student_score.nil?
+              @work.final_score = @work.teaching_asistant_score
+            else
+              final_ta_score = BigDecimal.new("#{@work.teaching_asistant_score}") * BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}")
+              final_s_score = BigDecimal.new("#{@work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              @work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        when 3 #学生评分 学生评分显示平均分
+          @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+          if @work.teacher_score.nil?
+            if @work.teaching_asistant_score.nil?
+              @work.final_score = @work.student_score
+            else
+              final_ta_score = BigDecimal.new("#{@work.teaching_asistant_score}") * BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}")
+              final_s_score = BigDecimal.new("#{@work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              @work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+      end
+
+      if @work.save
+        respond_to do |format|
+          format.js
+        end
+      end
+    end
+  end
+
+  #添加评分的回复
+  def add_score_reply
+    @score = StudentWorksScore.find params[:score_id]
+    @jour = @score.journals_for_messages.new(:user_id => User.current.id,:notes =>params[:message], :reply_id => 0)
+    if @jour.save
+      @status = 1
+    else
+      @status = 2
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #删除评分的回复
+  def destroy_score_reply
+    @jour = JournalsForMessage.find params[:jour_id]
+    if @jour.destroy
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  #为作品点赞
+  def praise_student_work
+    pt = PraiseTread.new
+    pt.user_id = User.current.id
+    pt.praise_tread_object_id = @work.id
+    pt.praise_tread_object_type = "StudentWork"
+    pt.praise_or_tread = 1
+    if pt.save
+      respond_to do |format|
+        format.js
+      end
+    else
+      render_404
+    end
+  end
+
+  private
+  #获取作业
+  def find_homework
+    @homework = HomeworkCommon.find params[:homework]
+    @course = @homework.course
+  rescue
+    render_404
+  end
+  #获取作品
+  def find_work
+    @work = StudentWork.find params[:id]
+    @homework = @work.homework_common
+    @course = @homework.course
+  rescue
+    render_404
+  end
+
+  #是不是当前课程的成员
+  #当前课程成员才可以看到作品列表
+  def member_of_course
+    render_403 unless User.current.member_of_course? @course || User.current.admin?
+  end
+
+  #判断是不是当前作品的提交者
+  #提交者 && (非匿评作业 || 未开启匿评) 可以编辑作品
+  def author_of_work
+    render_403 unless (User.current.id == @work.user_id || User.current.admin?) && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 )
+  end
+
+  #根据条件过滤作业结果
+  def search_homework_member homeworks,name
+    name = name.downcase
+    select_homework = homeworks.select{ |homework|
+      homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
+    }
+    select_homework
+  end
+
+  def homework_to_xls items
+    xls_report = StringIO.new
+    book = Spreadsheet::Workbook.new
+    sheet1 = book.create_worksheet :name => "homework"
+    blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
+    sheet1.row(0).default_format = blue
+    sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
+                          l(:excel_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
+    count_row = 1
+    items.each do |homework|
+      sheet1[count_row,0]=homework.user.id
+      sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+      sheet1[count_row,2] = homework.user.login
+      sheet1[count_row,3] = homework.user.user_extensions.student_id
+      sheet1[count_row,4] = homework.user.mail
+      sheet1[count_row,5] = homework.name
+      sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
+      sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
+      sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
+      sheet1[count_row,9] = homework.final_score.nil? ? l(:label_without_score) : format("%.2f",homework.final_score)
+      sheet1[count_row,10] = format_time(homework.created_at)
+      count_row += 1
+    end
+    book.write xls_report
+    xls_report.string
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/test_controller.rb b/app/controllers/test_controller.rb
index 51ff293f1..12fead4f2 100644
--- a/app/controllers/test_controller.rb
+++ b/app/controllers/test_controller.rb
@@ -1,3 +1,5 @@
+require 'net/http'
+
 class TestController < ApplicationController
   
   helper :UserScore
@@ -5,6 +7,10 @@ class TestController < ApplicationController
 
   def bootstrap; end
 
+  def view_office
+
+  end
+
   def zip
     homeworks_attach_path = []
     homework_id = params[:homework_id]
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ace4ae903..0382e7be0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -462,14 +462,14 @@ class UsersController < ApplicationController
         ids = []
         ids << Issue.where(id: act_ids, project_id: p_ids).map{|x| x.id}
 
-        #Bid
-        act_ids = activity.where(act_type: 'Bid').select('act_id').map{|x| x.act_id}
-        course_ids = HomeworkForCourse.where(bid_id: act_ids).select('distinct course_id').map{|x| x.course_id} 
+        #HomeworkCommon
+        act_ids = activity.where(act_type: 'HomeworkCommon').select('act_id').map{|x| x.act_id}
+        course_ids = HomeworkCommon.where(id: act_ids).select('distinct course_id').map{|x| x.course_id}
         c_ids = []
         Course.where(id: course_ids).each do |x|
           c_ids << x.id unless x.is_public !=0 && User.current.member_of_course?(x)
         end
-        ids << HomeworkForCourse.where(bid_id: act_ids, course_id: c_ids).map{|x| x.id}
+        ids << HomeworkCommon.where(id: act_ids, course_id: c_ids).map{|x| x.id}
 
         #Journal
         act_ids = activity.where(act_type: 'Journal').select('act_id').map{|x| x.act_id}
diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index d9b900833..043552872 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -33,26 +33,25 @@ class ZipdownController < ApplicationController
         render file: 'public/no_file_found.html'
         return
       end
+    elsif params[:obj_class] == "HomeworkCommon"
+      homework = HomeworkCommon.find params[:obj_id]
+      render_403 if User.current.allowed_to?(:as_teacher,homework.course)
+      file_count = 0
+      homework.student_works.map { |work| file_count += work.attachments.count}
+      if file_count > 0
+        zipfile = zip_homework_common homework
+      else
+        render file: 'public/no_file_found.html'
+        return
+      end
     else
       logger.error "[ZipDown#assort] ===> #{params[:obj_class]} unKown !!"
     end
-
-    # if zipfile
-    #   if zipfile.length > 1
-    #     @mut_down_files = zipfile #zipfile.each{|x| File.basename(x)}
-    #   else
-    #     send_file zipfile.first[:real_file], :filename => bid.name + ".zip", :type => detect_content_type(zipfile.first[:real_file])
-    #     return
-    #   end
-    # end
-
     respond_to do |format|
       format.json {
         render json: zipfile.to_json
       }
     end
-  #rescue Exception => e
-  #  render file: 'public/no_file_found.html'
   end
 
   #下载某一学生的作业的所有文件
@@ -102,29 +101,34 @@ class ZipdownController < ApplicationController
         digests << out_file.file_digest
       end
     end
-
     homework_id = bid.id
     user_id = bid.author_id
-
-
     out_file = find_or_pack(homework_id, user_id, digests.sort){
       zipping("#{Time.now.to_i}_#{bid.name}.zip",
               bid_homework_path, OUTPUT_FOLDER)
     }
+    [{files:[out_file.file_path], count: 1, index: 1,
+      real_file: out_file.file_path,  file: File.basename(out_file.file_path),
+      size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
+     }]
+  end
 
-
-    # zips = split_pack_files(bid_homework_path, Setting.pack_attachment_max_size.to_i*1024)
-    # x = 0
-    #
-    #
-    # zips.each { |o|
-    #   x += 1
-    #   file = zipping "#{Time.now.to_i}_#{bid.name}_#{x}.zip", o[:files], OUTPUT_FOLDER
-    #   o[:real_file] = file
-    #   o[:file] = File.basename(file)
-    #   o[:size] = (File.size(file) / 1024.0 / 1024.0).round(2)
-    # }
-
+  def zip_homework_common homework_common
+    bid_homework_path = []
+    digests = []
+    homework_common.student_works.each do |work|
+      unless work.attachments.empty?
+        out_file = zip_student_work_by_user(work)
+        bid_homework_path << out_file.file_path
+        digests << out_file.file_digest
+      end
+    end
+    homework_id = homework_common.id
+    user_id = homework_common.user_id
+    out_file = find_or_pack(homework_id, user_id, digests.sort){
+      zipping("#{Time.now.to_i}_#{homework_common.name}.zip",
+              bid_homework_path, OUTPUT_FOLDER)
+    }
     [{files:[out_file.file_path], count: 1, index: 1,
       real_file: out_file.file_path,  file: File.basename(out_file.file_path),
       size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
@@ -135,8 +139,6 @@ class ZipdownController < ApplicationController
     homeworks_attach_path = []
     not_exist_file = []
     # 需要将所有homework.attachments遍历加入zip
-
-
     digests = []
     homework_attach.attachments.each do |attach|
       if File.exist?(attach.diskfile)
@@ -147,12 +149,30 @@ class ZipdownController < ApplicationController
         digests << 'not_exist_file'
       end
     end
-
     out_file = find_or_pack(homework_attach.bid_id, homework_attach.user_id, digests.sort){
       zipping("#{homework_attach.user.lastname}#{homework_attach.user.firstname}_#{((homework_attach.user.user_extensions.nil? || homework_attach.user.user_extensions.student_id.nil?) ? "" : homework_attach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
               homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
     }
+  end
 
+  def zip_student_work_by_user work
+    homeworks_attach_path = []
+    not_exist_file = []
+    # 需要将所有homework.attachments遍历加入zip
+    digests = []
+    work.attachments.each do |attach|
+      if File.exist?(attach.diskfile)
+        homeworks_attach_path << attach.diskfile
+        digests << attach.digest
+      else
+        not_exist_file << attach.filename
+        digests << 'not_exist_file'
+      end
+    end
+    out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+      zipping("#{work.user.lastname}#{work.user.firstname}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
+              homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
+    }
   end
 
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a07ff320d..5ae70fd7c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1824,7 +1824,7 @@ module ApplicationHelper
   def attachment_candown attachment
     candown = false
     if attachment.container
-      if attachment.container.class.to_s != "HomeworkAttach" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
+      if attachment.container.class.to_s != "HomeworkAttach" && attachment.container.class.to_s != "StudentWork" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
         project = attachment.container.project
         candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
       elsif attachment.container.is_a?(Project)
@@ -1844,7 +1844,11 @@ module ApplicationHelper
           attachment.container.board.course
         course = attachment.container.board.course
         candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
-      elsif attachment.container.class.to_s=="HomeworkAttach" && attachment.container.bid.reward_type == 3
+      elsif attachment.container.class.to_s=="HomeworkAttach"
+        candown = true
+      elsif attachment.container.class.to_s=="StudentWorksScore"
+        candown = true
+      elsif attachment.container.class.to_s=="StudentWork"
         candown = true
       elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
         course = attachment.container.courses.first
@@ -2110,7 +2114,7 @@ module ApplicationHelper
     # courses_link = link_to l(:label_course_practice), {:controller => 'courses', :action => 'index'}
     #users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index', :host => Setting.host_user}
     # contest_link = link_to l(:label_contest_innovate), {:controller => 'contests', :action => 'index'}
-    bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'}
+    # bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'}
     forum_link = link_to l(:label_forum_all), {:controller => "forums", :action => "index"}
     stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'}
     school_all_school_link = link_to l(:label_school_all), {:controller => 'school', :action => 'index'}
@@ -2270,4 +2274,60 @@ module ApplicationHelper
     tag_list = attachment_tag_list all_attachments
     tag_list
   end
+
+  #获取匿评相关连接代码
+  def homework_anonymous_comment homework
+    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
+      if 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
+      end
+    else
+      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+    end
+    link
+  end
+  #学生根据传入作业确定显示为编辑作品还是新建作品
+  def student_new_homework homework
+    work = cur_user_works_for_homework homework
+    if work.nil?
+      link_to l(:label_commit_homework),  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
+    else
+      if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+        "<span class='fr mr10 pr_join_span '>#{l(:label_edit_homework)}</span>".html_safe
+      else
+        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
+      end
+    end
+  end
+
+  def student_anonymous_comment homework
+    if homework.homework_type == 1 && homework.homework_detail_manual
+      case homework.homework_detail_manual.comment_status
+        when 1
+          "<span class='fr mr10 pr_join_span '>未开启匿评</span>".html_safe
+        when 2
+          "<span class='fr mr10 pr_join_span '>正在匿评中</span>".html_safe
+        when 3
+          "<span class='fr mr10 pr_join_span '>匿评已结束</span>".html_safe
+      end
+    elsif homework.homework_type == 0
+      "<span class='fr mr10 pr_join_span '>未启用匿评</span>".html_safe
+    elsif homework.homework_type == 2
+      "<span class='fr mr10 pr_join_span '>编程作业</span>".html_safe
+    end
+  end
+
+  #获取当前用户在指定作业下提交的作业的集合
+  def cur_user_works_for_homework homework
+    homework.student_works.where("user_id = ?",User.current).first
+  end
 end
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index babd8cb12..13012a70c 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -201,14 +201,13 @@ module CoursesHelper
     end
     members
   end
+
   def searchStudent project
     #searchPeopleByRoles(project, StudentRoles)
     members = []
-
     project.members.each do |m|
       if m && m.user && m.user.allowed_to?(:as_student,project)
         members << m
-
       end
     end
     members
@@ -428,40 +427,19 @@ module CoursesHelper
 
     now > cTime
   end
+
   def find_by_extra_from_project extra
     Course.find_by_extra(try(extra))
   end
+
   #判断指定用户是不是当前课程的老师
   def is_course_teacher (user,course)
-    #course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and members.user_id = #{user.id}", {:role_id => TeacherRoles}).count != 0
     user.allowed_to?(:as_teacher,course)
-    #修改为根据用户是否有发布任务的权限来判断用户是否是课程的老师
-    #is_teacher = false
-    #@membership = user.memberships.all(:conditions => Project.visible_condition(User.current))
-    #@membership.each do |membership|
-    #  unless(membership.project.project_type==0)
-    #    if user.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false)
-    #      is_teacher = true
-    #    end
-    #  end
-    #end
-    #is_teacher
   end
+
   #当前用户是不是指定课程的学生
   def is_cur_course_student course
-    #course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and members.user_id = #{User.current.id}", {:role_id => StudentRoles}).count != 0
     User.current.logged? && User.current.member_of_course?(course) && !(User.current.allowed_to?(:as_teacher,course))
-    #修改：能新建占位且不能新建任务的角色判定为学生
-    #is_student = false
-    #@membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current))
-    #@membership.each do |membership|
-    #  unless(membership.project.project_type==0)
-    #    if !User.current.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false) && User.current.allowed_to?({:controller => "homework_attach", :action => "new"}, membership.project, :global => false)
-    #      is_student = true
-    #    end
-    #  end
-    #end
-    #is_student
   end
   #获取当前用户在指定作业下提交的作业的集合
   def cur_user_homework_for_bid bid
@@ -479,61 +457,6 @@ module CoursesHelper
     homework.nil? ? [] : (homework.users + [homework.user])
   end
 
-  #获取指定作业的最终评分
-  #最终评分 = 学生评分的平均分 * 0.4 +教师评分 * 0.6
-  def score_for_homework homework
-    if  homework.bid.is_evaluation == 1 || homework.bid.is_evaluation == nil
-      return format("%.2f",(homework.bid.proportion * 1.0 / 100) * (teacher_score_for_homework(homework).to_f) + (1 - homework.bid.proportion * 1.0 / 100) * (student_score_for_homework(homework).to_f))
-    else
-      return teacher_score_for_homework homework
-    end
-  end
-  def score_for_homework_new homework
-    if  teacher_score_for_homework(homework) != 0
-      return teacher_score_for_homework homework
-    else
-      return student_score_for_homework homework
-    end
-  end
-  #获取作业的互评得分
-  def student_score_for_homework homework
-    #member = searchTeacherAndAssistant(homework.bid.courses.first).first#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first
-    #if member.nil?
-    #  return "0.00"
-    #end
-    #student_stars = homework.rates(:quality).where("rater_id <> #{member.user_id}").select("stars")
-    members = searchStudent(homework.bid.courses.first)
-    user_ids = []
-    members.each do |user|
-      user_ids << user.user_id
-    end
-    student_stars = homework.rates(:quality).where("rater_id in (:user_ids)",{:user_ids => user_ids}).select("stars")
-    student_stars_count = 0
-    student_stars.each do |star|
-      student_stars_count = student_stars_count +  star.stars
-    end
-    return format("%.2f",student_stars_count / (student_stars.count == 0 ? 1 : student_stars.count))
-
-
-
-  end
-
-  #获取作业的教师评分
-  #多个教师只获取一份教师评分
-  def teacher_score_for_homework homework
-    members = searchTeacherAndAssistant(homework.bid.courses.first)
-    teacher_ids = []
-    members.each do |user|
-      teacher_ids << user.user_id
-    end
-    teacher_stars = homework.rates(:quality).where("rater_id in (:teacher_ids)",{:teacher_ids => teacher_ids}).select("stars")
-    teacher_stars_count = 0
-    teacher_stars.each do |star|
-      teacher_stars_count = teacher_stars_count +  star.stars
-    end
-    return format("%.2f",teacher_stars.count > 0 ? teacher_stars_count/teacher_stars.count : 0)
-  end
-
   #获取指定项目的得分
   def project_score project
     issue_count = project.issues.count
@@ -647,11 +570,6 @@ module CoursesHelper
       end
     end
 
-    #message_count
-    #Board.where(course_id: @course_ids).each do |board|
-    #  activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count
-    #end
-
     #message_count
     Board.where(course_id: @course_ids).each do |board|
       countmessage = 0
@@ -671,24 +589,15 @@ module CoursesHelper
       end  
     end
 
-    #feedback_count 留言目前有问题留待下一步处理
-    #JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess|
-    #  activities[jourformess.jour_id]+=1
-    #end
-
     #homework_count
-    HomeworkForCourse.where(course_id: @course_ids).each do |homework|
-      countbid=0
-      #  @bid_ids<<homework.bid_id
-      Bid.where(id: homework.bid_id).where("created_on>?",date_from).each do |bid|
-        countbid+=1
-      end
-      activities[homework.course_id]+=countbid
-    end
-
-    #@bid_ids.each do |bid_id|
-    #  activities[] +=Bid.where(id: bid_id ).where("created_on>?",date_from).count
-    #end
+    # HomeworkForCourse.where(course_id: @course_ids).each do |homework|
+    #   countbid=0
+    #   #  @bid_ids<<homework.bid_id
+    #   Bid.where(id: homework.bid_id).where("created_on>?",date_from).each do |bid|
+    #     countbid+=1
+    #   end
+    #   activities[homework.course_id]+=countbid
+    # end
 
     #poll_count
     # 动态目前只统计发布的问卷，关闭的问卷不在动态内显示
@@ -739,54 +648,6 @@ module CoursesHelper
     link.html_safe
   end
 
-  def bid_anonymous_comment bid
-    if bid.open_anonymous_evaluation == 1
-      if bid.homeworks.count >= 2
-        case bid.comment_status
-          when 0
-            link = link_to '启动匿评',  alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
-          when 1
-            link = link_to '关闭匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
-          when 2
-            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
-      end
-    else
-      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
-    end
-    link
-  end
-
-  def student_new_homework bid
-    user_homework = cur_user_homework_for_bid bid
-    if user_homework && user_homework.empty?
-      link_to l(:label_commit_homework),  new_exercise_book_path(bid),:class => 'fr mr10 work_edit'
-    else
-      if bid.comment_status == 1 && bid.open_anonymous_evaluation == 1
-        "<span class='fr mr10 pr_join_span ' title='已开启匿评不能修改作品'>#{l(:label_edit_homework)}</span>".html_safe
-      else
-        link_to l(:label_edit_homework),  edit_homework_attach_path(user_homework.first.id),:class => 'fr mr10 work_edit'
-      end
-    end
-  end
-
-  def student_anonymous_comment bid
-    if bid.open_anonymous_evaluation == 1
-      case bid.comment_status
-        when 0
-          "<span class='fr mr10 pr_join_span '>未开启匿评</span>".html_safe
-        when 1
-          "<span class='fr mr10 pr_join_span '>正在匿评中</span>".html_safe
-        when 2
-          "<span class='fr mr10 pr_join_span '>匿评已结束</span>".html_safe
-      end
-    else
-      "<span class='fr mr10 pr_join_span '>未启用匿评</span>".html_safe
-    end
-  end
-
   def visable_attachemnts_incourse course
     return[] unless course
     result = []
diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb
new file mode 100644
index 000000000..b9940f4be
--- /dev/null
+++ b/app/helpers/homework_common_helper.rb
@@ -0,0 +1,53 @@
+# encoding: utf-8
+module HomeworkCommonHelper
+  #迟交扣分下拉框
+  def late_penalty_option
+    type = []
+    for i in (0..5)
+      option = []
+      option << i
+      option << i
+      type << option
+    end
+    type
+  end
+
+  #教辅评分比例下拉框
+  def ta_proportion_option
+    type = []
+    i = 10
+    while  i <= 100
+      option = []
+      option << i.to_s + "%"
+      option << i.to_f / 100
+      type << option
+      i += 10
+    end
+    type
+  end
+
+  #缺评扣分
+  def absence_penalty_option
+    type = []
+    i = 0
+    while  i <= 5
+      option = []
+      option << i
+      option << i
+      type << option
+      i += 1
+    end
+    type
+  end
+
+  #根据传入作业确定跳转到开启匿评还是关闭匿评功能
+  def alert_anonyoms_path homework,homework_detail_manual
+    link = ""
+    if homework_detail_manual.comment_status == 1
+      link = start_anonymous_comment_homework_common_url homework.id
+    elsif homework_detail_manual.comment_status == 2
+      link = stop_anonymous_comment_homework_common_url homework.id
+    end
+    link
+  end
+end
\ No newline at end of file
diff --git a/app/helpers/owner_type_helper.rb b/app/helpers/owner_type_helper.rb
index dd5dbbbac..c03f2d19e 100644
--- a/app/helpers/owner_type_helper.rb
+++ b/app/helpers/owner_type_helper.rb
@@ -6,4 +6,5 @@ module OwnerTypeHelper
   COMMENT = 5
   BID = 6
   JOURNALSFORMESSAGE = 7
+  HOMEWORKCOMMON = 8
 end
\ No newline at end of file
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
new file mode 100644
index 000000000..990a563c4
--- /dev/null
+++ b/app/helpers/student_work_helper.rb
@@ -0,0 +1,63 @@
+# encoding: utf-8
+module StudentWorkHelper
+  def user_projects_option
+    cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1"
+    memberships = User.current.memberships.all(:conditions => cond)
+    projects = memberships.map(&:project)
+    not_have_project = []
+    not_have_project << Setting.please_chose
+    not_have_project << 0
+    type = []
+    type << not_have_project
+    projects.each do |project|
+      if project != nil
+        option = []
+        option <<  project.name
+        option <<  project.id
+        type << option
+      end
+    end
+    type
+  end
+
+  #获取指定用户对某一作业的评分结果
+  def student_work_score work,user
+    StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).first
+  end
+
+  #获取指定评分的角色
+  def student_work_score_role score
+    case score.reviewer_role
+      when 1
+        role = "教师"
+      when 2
+        role = "助教"
+      when 3
+        role = "学生"
+    end
+  end
+
+  def get_role_by_name role
+    case role
+      when "Teacher"
+        result = 1
+      when "Manager"
+        result = 1
+      when "TeachingAsistant"
+        result = 2
+      when "Student"
+        result = 3
+    end
+    result
+  end
+
+  #获取赞的总数
+  def praise_homework_count obj_id
+    PraiseTread.where("praise_tread_object_id = #{obj_id} AND praise_tread_object_type = 'StudentWork'").count
+  end
+
+  #判断指定用户是不是已经赞过该作业
+  def is_praise_homework user_id, obj_id
+    PraiseTread.where("user_id = #{user_id} AND praise_tread_object_id = #{obj_id} AND praise_tread_object_type = 'StudentWork'").empty?
+  end
+end
\ No newline at end of file
diff --git a/app/models/activity_notify.rb b/app/models/activity_notify.rb
new file mode 100644
index 000000000..0fbe1f6f1
--- /dev/null
+++ b/app/models/activity_notify.rb
@@ -0,0 +1,3 @@
+class ActivityNotify < ActiveRecord::Base
+  belongs_to :activity, polymorphic: true
+end
\ No newline at end of file
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 7ac7d786d..1e477ed04 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -72,7 +72,7 @@ class Attachment < ActiveRecord::Base
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
   before_save :files_to_final_location
-  after_create :be_user_score ,:act_as_forge_activity# user_score
+  after_create :office_conver, :be_user_score ,:act_as_forge_activity# user_score
   after_update :be_user_score
   after_destroy :delete_from_disk,:down_user_score
 
@@ -258,6 +258,15 @@ class Attachment < ActiveRecord::Base
     filename
   end
 
+  def office_conver
+    saved_path = File.join(Rails.root, "files", "convered_office")
+    unless Dir.exist?(saved_path)
+      Dir.mkdir(saved_path)
+    end
+    convered_file = File.join(saved_path, self.disk_filename + ".html")
+    OfficeConverTask.new.conver(self.diskfile, convered_file)
+  end
+
   # Copies the temporary file to its final location
   # and computes its MD5 hash
   def files_to_final_location
diff --git a/app/models/course.rb b/app/models/course.rb
index 610f52f71..6d71ad967 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -10,7 +10,7 @@ class Course < ActiveRecord::Base
   #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
   belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
-  has_many :bid
+  # has_many :bid
   has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
   has_many :memberships, :class_name => 'Member'
   has_many :member_principals, :class_name => 'Member',
@@ -18,9 +18,9 @@ class Course < ActiveRecord::Base
            :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
   has_many :principals, :through => :member_principals, :source => :principal
   has_many :users, :through => :members
-  has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
+  # has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
-  has_many :homework_for_courses, :dependent => :destroy
+  # has_many :homework_for_courses, :dependent => :destroy
   has_many :student, :class_name => 'StudentsForCourse', :source => :user
   has_many :course_infos, :class_name => 'CourseInfos',:dependent => :destroy
   has_many :enabled_modules, :dependent => :delete_all
@@ -29,6 +29,9 @@ class Course < ActiveRecord::Base
   has_many :news, :dependent => :destroy, :include => :author
   has_one :course_status, :class_name => "CourseStatus", :dependent => :destroy
 
+  has_many :homework_commons, :dependent => :destroy
+  has_many :student_works, :through => :homework_commons, :dependent => :destroy
+
   has_many :course_groups, :dependent => :destroy
 
   acts_as_taggable
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
new file mode 100644
index 000000000..ac10b2516
--- /dev/null
+++ b/app/models/homework_common.rb
@@ -0,0 +1,31 @@
+#老师布置的作业表
+#homework_type: 0:普通作业;1:匿评作业;2:编程作业
+class HomeworkCommon < ActiveRecord::Base
+  # attr_accessible :name, :user_id, :description, :publish_time, :end_time, :homework_type, :late_penalty, :course_id
+  include Redmine::SafeAttributes
+  include ApplicationHelper
+
+  belongs_to :course
+  belongs_to :user
+  has_one :homework_detail_manual, :dependent => :destroy
+  has_one :homework_detail_programing, :dependent => :destroy
+  has_many :homework_tests, :dependent => :destroy
+  has_many :student_works, :dependent => :destroy
+  has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
+  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
+  acts_as_attachable
+  acts_as_event :title => Proc.new {|o| "#{l(:label_course_homework)} ##{o.id}: #{o.name}" },
+                :description => :description,
+                :author => :author,
+                :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
+  after_create :act_as_activity
+  after_destroy :delete_kindeditor_assets
+
+  def act_as_activity
+    self.acts << Activity.new(:user_id => self.user_id)
+  end
+  #删除对应的图片
+  def delete_kindeditor_assets
+    delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::HOMEWORKCOMMON
+  end
+end
diff --git a/app/models/homework_detail_manual.rb b/app/models/homework_detail_manual.rb
new file mode 100644
index 000000000..e0c4dcdcb
--- /dev/null
+++ b/app/models/homework_detail_manual.rb
@@ -0,0 +1,7 @@
+#手动评分作业表
+#comment_status: 1:未开启匿评，2：开启匿评，3：匿评结束
+class HomeworkDetailManual < ActiveRecord::Base
+   attr_accessible :ta_proportion, :comment_status, :evaluation_start, :evaluation_end, :evaluation_num, :absence_penalty, :homework_common_id
+
+  belongs_to :homework_common
+end
diff --git a/app/models/homework_detail_programing.rb b/app/models/homework_detail_programing.rb
new file mode 100644
index 000000000..4c7134806
--- /dev/null
+++ b/app/models/homework_detail_programing.rb
@@ -0,0 +1,5 @@
+class HomeworkDetailPrograming < ActiveRecord::Base
+  attr_accessible :language, :standard_code, :homework_common_id
+
+  belongs_to :homework_common
+end
diff --git a/app/models/homework_test.rb b/app/models/homework_test.rb
new file mode 100644
index 000000000..f7d9b20bc
--- /dev/null
+++ b/app/models/homework_test.rb
@@ -0,0 +1,5 @@
+class HomeworkTest < ActiveRecord::Base
+  attr_accessible :input, :output, :homework_common_id
+
+  belongs_to :homework_common
+end
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 239a15881..b15c9b2d1 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -29,6 +29,7 @@ class JournalsForMessage < ActiveRecord::Base
   belongs_to :jour, :polymorphic => true
   belongs_to :user
   belongs_to :homework_attach
+  belongs_to :student_works_score
   belongs_to :at_user, :class_name => "User", :foreign_key => 'reply_id'
 
   acts_as_event :title => Proc.new {|o| "#{l(:label_my_message)}"},
diff --git a/app/models/member.rb b/app/models/member.rb
index f1a139f74..2936392ab 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -117,10 +117,11 @@ class Member < ActiveRecord::Base
   # 查找每个学生每个作业的评分
   def student_homework_score
     score_count = 0
-    homework_score = HomeworkAttach.find_by_sql("SELECT bids.name, homework_attaches.score as score
-            FROM homework_attaches, bids where homework_attaches.user_id = #{self.user_id}
-							and homework_attaches.bid_id IN (SELECT bid_id FROM homework_for_courses where course_id = #{self.course_id})
-							AND homework_attaches.bid_id = bids.id  ")
+    homework_score = StudentWork.find_by_sql("SELECT homework_commons.name,student_works.final_score as score
+      FROM student_works,homework_commons
+      WHERE student_works.homework_common_id = homework_commons.id
+      AND homework_commons.course_id = #{self.course_id}
+      AND student_works.user_id = #{self.user_id}")
     homework_score.each do |homework|
       mem_score = 0
       if homework[:score]
diff --git a/app/models/message.rb b/app/models/message.rb
index bbf62b5dc..15d358789 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -34,6 +34,8 @@ class Message < ActiveRecord::Base
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # end
 
+  has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
+
   acts_as_searchable :columns => ['subject', 'content'],
                      :include => {:board => :project},
                      :project_key => "#{Board.table_name}.project_id",
@@ -148,6 +150,19 @@ class Message < ActiveRecord::Base
     usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
   end
 
+  def set_notify_id(notify_id)
+    @notify_id= notify_id
+  end
+  def get_notify_id()
+    return @notify_id
+  end
+  def set_notify_is_read(notify_is_read)
+    @notify_is_read = notify_is_read
+  end
+  def get_notify_is_read()
+    return @notify_is_read
+  end
+
   private
 
   def add_author_as_watcher
@@ -218,4 +233,5 @@ class Message < ActiveRecord::Base
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
   end
+
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index bf94df248..4a546a430 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -30,7 +30,7 @@ class Project < ActiveRecord::Base
 
   # Specific overidden Activities
 
-  belongs_to :homework_attach
+  has_many :student_works
   has_many :time_entry_activities
   has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
   has_many :memberships, :class_name => 'Member'
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
new file mode 100644
index 000000000..e2be18423
--- /dev/null
+++ b/app/models/student_work.rb
@@ -0,0 +1,12 @@
+#学生提交作品表
+class StudentWork < ActiveRecord::Base
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id
+
+  belongs_to :homework_common
+  belongs_to :user
+  has_many :student_works_evaluation_distributions, :dependent => :destroy
+  has_many :student_works_scores, :dependent => :destroy
+  belongs_to :project
+
+  acts_as_attachable
+end
diff --git a/app/models/student_works_evaluation_distribution.rb b/app/models/student_works_evaluation_distribution.rb
new file mode 100644
index 000000000..60f786af8
--- /dev/null
+++ b/app/models/student_works_evaluation_distribution.rb
@@ -0,0 +1,7 @@
+#学生作品匿评分配表
+class StudentWorksEvaluationDistribution < ActiveRecord::Base
+  attr_accessible :student_work_id, :user_id
+
+  belongs_to :student_work
+  belongs_to :user
+end
diff --git a/app/models/student_works_score.rb b/app/models/student_works_score.rb
new file mode 100644
index 000000000..8fa14f8de
--- /dev/null
+++ b/app/models/student_works_score.rb
@@ -0,0 +1,10 @@
+class StudentWorksScore < ActiveRecord::Base
+  #reviewer_role: 1:教师评分;2:教辅评分;3:学生匿评
+  attr_accessible :student_work_id, :user_id, :score, :comment, :reviewer_role
+
+  belongs_to :user
+  belongs_to :student_work
+  has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+
+  acts_as_attachable
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4c30012d7..a1f00a234 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,13 +75,18 @@ class User < Principal
   has_many :homework_users
   has_many :homework_attaches, :through => :homework_users
   has_many :homework_evaluations
-
   #问卷相关关关系
   has_many :poll_users, :dependent => :destroy
   has_many :poll_votes, :dependent => :destroy
   has_many :poll, :dependent => :destroy #用户创建的问卷
   has_many :answers, :source => :poll, :through => :poll_users, :dependent => :destroy #用户已经完成问答的问卷
   # end
+  #作业相关关系
+  has_many :homework_commons, :dependent => :destroy
+  has_many :student_works, :dependent => :destroy
+  has_many :student_works_evaluation_distributions, :dependent => :destroy
+  has_many :student_works_scores, :dependent => :destroy
+  #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
                                    :after_remove => Proc.new {|user, group| group.user_removed(user)}
@@ -92,7 +97,7 @@ class User < Principal
   belongs_to :auth_source
   belongs_to :ucourse, :class_name => 'Course', :foreign_key => :id  #huang
 ## added by xianbo for delete 
-  has_many :biding_projects, :dependent => :destroy
+  # has_many :biding_projects, :dependent => :destroy
   has_many :contesting_projects, :dependent => :destroy
   belongs_to :softapplication, :foreign_key => 'id', :dependent => :destroy
 ##ended by xianbo
@@ -100,7 +105,7 @@ class User < Principal
 #####fq
   has_many :jours, :class_name => 'JournalsForMessage', :dependent => :destroy
   has_many :journals_messages, :class_name => 'JournalsForMessage', :foreign_key => "user_id", :dependent => :destroy
-  has_many :bids, :foreign_key => 'author_id', :dependent => :destroy
+  # has_many :bids, :foreign_key => 'author_id', :dependent => :destroy
   has_many :contests, :foreign_key => 'author_id', :dependent => :destroy
   has_many :softapplications, :foreign_key => 'user_id', :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
@@ -261,16 +266,6 @@ class User < Principal
     end
   end
   
-  # 判断用户是否加入了竞赛中 fq
-  def join_in_contest?(bid)
-    joined = JoinInContest.where('user_id = ? and bid_id =?', self.id, bid.id)
-    if joined.size > 0
-      true
-    else
-      false
-    end
-  end
-  
   ### fq
   def join_in?(course)
     joined = StudentsForCourse.where('student_id = ? and course_id = ?', self.id, course.id)
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 40275a29b..aff0a975c 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -245,10 +245,10 @@ class UsersService
         "show_changesets" => true
     }
     scope = User.logged.status(status)
+    search_by = params[:search_by] ? params[:search_by] : "0"
     if params[:is_search_assitant].nil?
       #modify by yutao 2015/5/18 没有params[:user_id]参数时去掉"id not in (?)"条件(bug:#2270) start
       #say by yutao: params[:user_id]这个是指谁发起的搜索么? 如果是 这个值貌似应该从session获取 怪怪的赶脚-_-!
-      search_by = params[:search_by] ? params[:search_by] : "0"
       if params[:name].present?
         if !params[:user_id].nil?
           watcher = User.watched_by(params[:user_id])
diff --git a/app/tasks/office_conver_task.rb b/app/tasks/office_conver_task.rb
new file mode 100644
index 000000000..da950bf2e
--- /dev/null
+++ b/app/tasks/office_conver_task.rb
@@ -0,0 +1,12 @@
+#coding=utf-8
+#
+class OfficeConverTask
+  def conver(source_file, saved_file)
+    office = Trustie::Utils::Office.new(source_file)
+    if office.conver(saved_file)
+      Rails.logger.info "process ok: #{saved_file} "
+    end
+  end
+  handle_asynchronously :conver,:queue => 'office_conver'
+end
+
diff --git a/app/views/activity_notifys/chang_read_flag.html.erb b/app/views/activity_notifys/chang_read_flag.html.erb
new file mode 100644
index 000000000..ca89a7e3f
--- /dev/null
+++ b/app/views/activity_notifys/chang_read_flag.html.erb
@@ -0,0 +1 @@
+<%= @result == false ? 'false' : 'true' %>
\ No newline at end of file
diff --git a/app/views/attachments/destroy.js.erb b/app/views/attachments/destroy.js.erb
index 0b6cee0df..d23422e24 100644
--- a/app/views/attachments/destroy.js.erb
+++ b/app/views/attachments/destroy.js.erb
@@ -1,26 +1,30 @@
-var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
-//modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  start
-var containerid=$('.remove-upload',attachment_html_obj).data('containerid');
-if(containerid==undefined){
-    $('#attachments_<%= j params[:attachment_id] %>').remove();
-    var count=$('#attachments_fields>span').length;
-    if(count<=0){
-        $("#upload_file_count").text('<%= l(:label_no_file_uploaded)%>');
-        $(".remove_all").remove();
+<% if @is_destroy%>
+    $("#attachment_<%= @attachment.id%>").remove();
+<%else%>
+    var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
+    //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  start
+    var containerid=$('.remove-upload',attachment_html_obj).data('containerid');
+    if(containerid==undefined){
+        $('#attachments_<%= j params[:attachment_id] %>').remove();
+        var count=$('#attachments_fields>span').length;
+        if(count<=0){
+            $("#upload_file_count").text('<%= l(:label_no_file_uploaded)%>');
+            $(".remove_all").remove();
+        }else{
+            $("#upload_file_count").html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
+        }
     }else{
-        $("#upload_file_count").html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
+        $('#attachments_<%= j params[:attachment_id] %>').remove();
+        var count=$('#attachments_fields'+containerid+'>span').length;
+        if(count<=0){
+            $('#upload_file_count'+containerid).text('<%= l(:label_no_file_uploaded)%>');
+            var remove_all_html_obj = $(".remove_all").filter(function(index){
+                return $(this).data('containerid')==containerid;
+            });
+            remove_all_html_obj.remove();
+        }else{
+            $('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
+        }
     }
-}else{
-    $('#attachments_<%= j params[:attachment_id] %>').remove();
-    var count=$('#attachments_fields'+containerid+'>span').length;
-    if(count<=0){
-        $('#upload_file_count'+containerid).text('<%= l(:label_no_file_uploaded)%>');
-        var remove_all_html_obj = $(".remove_all").filter(function(index){
-            return $(this).data('containerid')==containerid;
-        });
-        remove_all_html_obj.remove();
-    }else{
-        $('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
-    }
-}
-//modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  end
\ No newline at end of file
+    //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  end
+<% end%>
\ No newline at end of file
diff --git a/app/views/attachments/upload.js.erb b/app/views/attachments/upload.js.erb
index c3e7fc3ff..970c5b22d 100644
--- a/app/views/attachments/upload.js.erb
+++ b/app/views/attachments/upload.js.erb
@@ -11,7 +11,4 @@ fileSpan.find('a.remove-upload')
         })
         .off('click');
 $('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
-
-//var divattach = fileSpan.find('div.div_attachments');
-//divattach.html('<%= j(render :partial => 'tags/tagEx', :locals => {:obj => @attachment, :object_flag => "6"})%>');
 <% end %>
diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index 10f23d4f2..61c774a95 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -1,9 +1,10 @@
-<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
 
     <%= render :partial => 'form_course', :locals => {:f => f,  :topic => @message} %>
     <li>
-      <a href="javascript:void(0);"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
-      <a href="javascript:void(0);" name="submitbtn" class="blue_btn fr " style="margin-left: 55px">
+      <div class="ml55 fl" nhname="toolbar_container"></div>
+      <a href="javascript:void(0);"  nhname="cancelbtn" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
+      <a href="javascript:void(0);" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px">
         <%= l(:button_submit)%>
       </a>
       <div class="cl"></div>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index d7eb7c215..48e5a870d 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -1,26 +1,29 @@
+<div nhname="container_board">
+  <div class="project_r_h">
+    <h2 class="project_h2 fl">
+      <% if User.current.language == "zh"%>
+          <%= h @board.name %>
+      <% else %>
+          <%= l(:project_module_boards) %>
+      <% end %>
 
-
-<!--display the board-->
-<div class="project_r_h">
-  <h2 class="project_h2 fl">
-    <% if User.current.language == "zh"%>
-        <%= h @board.name %>
-    <% else %>
-        <%= l(:project_module_boards) %>
+    </h2>
+    <% if User.current.logged? %>
+    <a href="javascript:void(0)" class="green_btn fr newtalk " id="new_topic_btn" nhname="showbtn"><%= l(:label_message_new) %></a>
     <% end %>
-
-  </h2>
-  <a href="javascript:void(0)" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
+    <div class="cl"></div>
+  </div>
   <div class="cl"></div>
+  <div class=" talklist_box" >
+    <div class="talk_new ml15 mb10" nhname="about_talk" id="about_newtalk" style="display:none;" >
+      <ul>
+        <%= render :partial => 'course_new' %>
+      </ul>
+    </div><!--talknew end-->
+  </div>
 </div>
 <!-- 发布新帖部分 -->
-<div class="cl"></div>
 <div class=" talklist_box" >
-<div class="talk_new ml15 mb10"  name="container_board" id="about_newtalk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;" >
-  <ul>
-    <%= render :partial => 'course_new' %>
-  </ul>
-</div><!--talknew end-->
 
 <% if !User.current.logged?%>
     <div style="font-size: 14px;margin:20px;">
@@ -32,15 +35,19 @@
 <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
 <% if @topics.any? %>
     <% @topics.each do |topic| %>
-        <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>">
+        <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply">
           <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
           <div class="talkmain_txt fl mt5">
-            <% author = topic.author.to_s + "：" %>
-            <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
+            <% author = topic.author.to_s %>
+            <div style="max-width:60px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
+              <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl ",:title=>author,
+                          :style=>'max-width:60px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %>
+            </div>
+            <p style="float:left;color:#ff5722;">&nbsp;&nbsp;:</p>
 
-            <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
+            <p class="talkmain_tit fl fb break_word" title="<%=  h(topic.subject) %>" style="width:auto;float:left;max-width:415px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
             <% if topic.course_editable_by?(User.current) %>
-                <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');"  style="color: #426e9a;float: right;
+                <a href="javascript:void(0)" nhname="showbtn"  style="color: #426e9a;float: right;
                         margin-right: 10px;"><%= l(:button_edit) %></a>
             <% end %>
 
@@ -81,111 +88,94 @@
             <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
 
           </div>
-          <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => 'message_content',:class => ' c_dblue fr' %>
+          <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr" style="margin-right:10px;"><%= l(:button_reply) %></a>
 
           <div class="cl"></div>
 
-
-        </div><!--讨论主类容 end-->
-        <div class="talk_new ml15 mb10"  id="about_newtalk<%=topic.id%>"  style="display: none">
-          <ul>
-            <%= render :partial => 'edit',locals:  {:topic => topic} %>
-          </ul>
-        </div>
-        <div class="talkWrapBox">
-          <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
-          <% if !topic.locked? && authorize_for('messages', 'reply') %>
-              <em class="talkWrapArrow"></em>
-              <div class="cl"></div>
-              <div class="talkConIpt ml15 mb10" style="display: none" id="reply<%= topic.id %>" name="container_board">
-                <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
-
-                    <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-                    <%= toggle_link l(:button_cancel), "reply" + topic.id.to_s, :focus => 'message_content',:class => 'grey_btn fr ml10' %>
-                    <a href="javascript:void(0)" name="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
-                <% end %>
+          <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>"  style="display: none">
+            <ul>
+              <%= render :partial => 'edit',locals:  {:topic => topic} %>
+            </ul>
+          </div>
+          <div class="cl"></div>
+          <div class="talkWrapBox">
+            <% reply = Message.new(:subject => "RE: #{topic.subject}")%>
+            <% if !topic.locked? && authorize_for('messages', 'reply') %>
+              <div class="talkWrapMsg" nhname="about_talk_reply" style="display: none;">
+                <em class="talkWrapArrow"></em>
                 <div class="cl"></div>
-              </div>
-          <% end %>
-          <% replies_all = topic.children.
-                  includes(:author, :attachments, {:board => :project}).
-                  reorder("#{Message.table_name}.created_on DESC").offset(2).
-                  all %>
-          <% replies_show = topic.children.
-                  includes(:author, :attachments, {:board => :project}).
-                  reorder("#{Message.table_name}.created_on DESC").limit(2).
-                  all %>
-          <% unless replies_show.empty? %>
-              <% reply_count = 0 %>
-              <div class="talkWrapMsg">
-                <ul>
-                  <% replies_show.each do |message| %>
+                <div class="talkConIpt ml15 mb10" style="margin-left:30px;" id="reply<%= topic.id %>">
+                  <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'},
+                               :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
 
-                      <li>
-                        <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
-                        <div class="Msg_txt">
-                          <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
-                          <br/>
-                          <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
-
-                          <br/>
-                          <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
-                          <%= link_to(
-
-                                      l(:button_delete),
-                                      {:controller => 'messages', :action => 'destroy',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
-                                      :method => :post,
-                                      :data => {:confirm => l(:text_are_you_sure)},
-                                      :title => l(:button_delete),
-                                      :class => ' c_dblue fr'
-                              ) if message.course_destroyable_by?(User.current) %>
-                        </div>
-                        <div class="cl"></div>
-
-                      </li><!---留言内容-->
+                      <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+                      <input name="parent_topic" type="hidden" value=""/>
+                      <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
+                      <div style="padding-top:5px;" class="fr">
+                        <a href="javascript:void(0)" nhname="cancelbtn" class="grey_btn fr ml10" style=""><%= l(:button_cancel)%></a>
+                        <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style=""><%= l(:button_submit)%></a>
+                      </div>
                   <% end %>
-                </ul>
+                  <div class="cl"></div>
+                </div>
               </div>
-              <div class="talkWrapMsg" id="talkWrapMsg<%= topic.id %>" style="display: none">
-                <ul>
-                  <% replies_all.each do |message| %>
+            <% end %>
+            <% replies_all = topic.children.includes(:author, :attachments, {:board => :project}).
+                    reorder("#{Message.table_name}.created_on DESC").all %>
+            <% unless replies_all.empty? %>
+                <% replies_all_i = 0 %>
+                <div class="talkWrapMsg" nhname="nh_reply_div" id="nh_reply_div_<%= topic.id %>">
+                  <ul>
+                    <% replies_all.each do |message| %>
+                        <% replies_all_i=replies_all_i+1 %>
+                        <li nhname="reply_rec" style="display:<%= replies_all_i>2?'none':'' %>" id="topic<%=message.id%>">
+                          <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
+                          <div class="Msg_txt">
+                            <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
+                            <br/>
+                            <div class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></div>
+                            <input nhname="nh_content_val" value="<%= message.content %>" type="hidden"/>
+                            <br/><div class="cl"></div>
+                            <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
+                            <%= link_to(
 
-                      <li>
-                        <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
-                        <div class="Msg_txt">
-                          <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
-                          <br/>
-                          <p class="fl"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+                                        l(:button_delete),
+                                        {:controller => 'messages', :action => 'destroy',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
+                                        :method => :post,
+                                        :data => {:confirm => l(:text_are_you_sure)},
+                                        :title => l(:button_delete),
+                                        :class => ' c_dblue fr'
+                                ) if message.course_destroyable_by?(User.current) %>
+                            <%= link_to(
+                                        l(:button_reply),
+                                        'javascript:;',
+                                        :nhname =>'showbtn_child_reply',
+                                        :class => ' c_dblue fr',
+                                        :style => 'margin-right: 10px;',
+                                        'data-topic-id' =>message.id,
+                                        :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %>
+                          </div>
+                          <div class="cl"></div>
 
-                          <br/>
-                          <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
-                          <%= link_to(
+                        </li><!---留言内容-->
+                    <% end %>
+                  </ul>
+                </div>
+                <%if topic.replies_count>2 %>
+                    <div class="talkWrapMsg"><a nhname="reply_ex_btn" data-count="<%= topic.replies_count %>" data-init="0" class=" ml258" href="javascript:void(0)" id="showgithelp<%= topic.id%>" value="show_help" class="c_dblue lh23"  style="color: #0781b4;" >展开回复(<%= topic.replies_count.to_s%>)</a></div>
+                <% end %>
+            <% end %>
+          </div>
+          <div class="cl"></div>
+        </div><!--讨论主类容 end-->
 
-                                      l(:button_delete),
-                                      {:controller => 'messages', :action => 'destroy',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
-                                      :method => :post,
-                                      :data => {:confirm => l(:text_are_you_sure)},
-                                      :title => l(:button_delete),
-                                      :class => ' c_dblue fr'
-                              ) if message.course_destroyable_by?(User.current) %>
-                        </div>
-                        <div class="cl"></div>
-
-                      </li><!---留言内容-->
-                  <% end %>
-                </ul>
-              </div>
-              <%if replies_all.first %>
-                  <div class="talkWrapMsg"><a class=" ml258" href="javascript:void(0)" id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23"  style="color: #0781b4;" >展开回复(<%= topic.replies_count.to_s%>)</a></div>
-              <% end %>
-          <% end %>
-        </div>
     <% end %>
 <% else %>
     <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 <ul class="wlist">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+  <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+  <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => false, :flag => true %>
 </ul>
 <%# other_formats_links do |f| %>
 <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
@@ -197,58 +187,92 @@
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@course}: #{@board}") %>
 <% end %>
 </div>
+<div style="display:none;"><a href="#" id="nhjump"></a></div>
 <script type="text/javascript">
-    //submitProjectsBoard()
-    KindEditor.ready(function(K){
-        $("div[name='container_board']").each(function(){
-            var container=$(this);
-            var messege = $("p[aa='message_show']",container);
-            var subject = $("input[aa='subject']",container);
-            var textarea= $("textarea[aa='content']",container);
-            var form = $("form",container);
-            var editor = K.create(textarea, {
-                resizeType : 1,
-                allowPreviewEmoticons : false,
-                allowImageUpload : false,
-                width:"89%",
-                items : []
-            });
-//            form.submit(function(){
-//                alert(textarea.html());
-//            });
-//            $("a[name='submitbtn']",container).click(function(){
-//                form.submit();
-//            });
-
-            $("a[name='submitbtn']",container).click(function(){
-                textarea[0].value = editor.html() ;
-                var id = textarea[0].id.toString().substr(15);
-
-                if(subject.val() == "RE: ") {
-
-                    if (editor.html() == "") {
-                        messege.html("回复内容不能为空") ;
-                        messege.css('color', '#ff0000');
-                        messege.show();
-                    }
-                    else {
-                        messege.html("填写正确");
-                        messege.css('color', '#008000');
-                        messege.show();
-                        this.parentNode.submit();
-                    }
-                }
-                else {
-                    if(regexContent(id) && regexSubject(id)) {
-                        if (this.parentNode.name == 'message-form') {
-                            this.parentNode.submit();
-                        }
-                        else
-                            this.parentNode.parentNode.submit();
-                    }
+    $(function(){
+        $(".talkmain_box").each(function(){
+            var target = $("li[nhname='reply_rec']",$(this));
+            var btn = $("a[nhname='reply_ex_btn']",$(this));
+            var jumpobj = $("div[nhname='nh_reply_div']",$(this));
+            btn.click(function(){
+                if($(this).data('init')=='0'){
+                    $(this).data('init',1);
+                    $(this).html('收起回复('+$(this).data('count')+')');
+                    target.show();
+                }else{
+                    $(this).data('init',0);
+                    $(this).html('展开回复('+$(this).data('count')+')');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                    $("#nhjump").attr('href','#'+jumpobj.attr('id'));
+                    $("#nhjump")[0].click();
                 }
             });
+        });
+        KindEditor.ready(function(K){
+            $("div[nhname='container_board']").each(function(){
+                var container = $(this);
+                var about_talk = $("div[nhname='about_talk']",container);
+                var params = ({
+                    kindutil:K,
+                    showbtn:$("a[nhname='showbtn']",container),
+                    about_talk:about_talk,
+                    inputsubject:$("input[nhname='inputsubject']",about_talk),
+                    subjectmsg:$("p[nhname='subjectmsg']",about_talk),
+                    textarea:$("textarea[nhname='textarea']",about_talk),
+                    contentmsg:$("p[nhname='contentmsg']",about_talk),
+                    submitbtn:$("a[nhname='submitbtn']",about_talk),
+                    cancelbtn:$("a[nhname='cancelbtn']",about_talk),
+                    form:$("form[nhname='form']",about_talk),
+                    toolbar_container:$("div[nhname='toolbar_container']",about_talk),
+                    init_content_val:$("input[nhname='init_content_val']",about_talk)
+                });
+                nh_init_board(params);
+            });
+            $("div[mhname='container_board_reply']").each(function(){
+                var container = $(this);
+                var about_talk = $("div[nhname='about_talk_reply']",container);
+                var params = {
+                    type:'reply',
+                    kindutil:K,
+                    showbtn:$("a[nhname='showbtn_reply']",container),
+                    showbtn_child:$("a[nhname='showbtn_child_reply']",container),
+                    about_talk:about_talk,
+                    inputsubject:$("input[nhname='inputsubject']",about_talk),
+                    subjectmsg:$("p[nhname='subjectmsg']",about_talk),
+                    textarea:$("textarea[nhname='textarea']",about_talk),
+                    contentmsg:$("p[nhname='contentmsg']",about_talk),
+                    submitbtn:$("a[nhname='submitbtn']",about_talk),
+                    cancelbtn:$("a[nhname='cancelbtn']",about_talk),
+                    form:$("form[nhname='form']",about_talk),
+                    quote_show:$("div[nhname='quote_show']",about_talk),
+                    quote_input:$("textarea[nhname='quote_input']",about_talk),
+                    toolbar_container:$("div[nhname='toolbar_container']",about_talk),
+                    jumphref:$("#nhjump")
+                };
+                params.get_ref_str_call=function(btn){
+                    var div = btn.parent('div');
+                    var str = '<blockquote>'+$('a',div).filter(':first').html()+' 写到： <br/>'+$("input[nhname='nh_content_val']",div).val()+'</blockquote>';
+                    return str;
+                }
+                nh_init_board(params);
+            });
 
+            <% if( @params[:topic_id]!=nil && @params[:topic_id]!='' && @params[:page]==nil ) %>
+            var nh_dw_html = $("#topic<%=@params[:topic_id]%>");
+            if(nh_dw_html!=undefined && nh_dw_html.length!=0){
+                if(nh_dw_html.is(':hidden')){
+                    $("a[nhname='reply_ex_btn']",nh_dw_html.parent('ul').parent('div').parent('div')).click();
+                }
+                $("#nhjump").attr('href','#'+nh_dw_html.attr('id'));
+                $("#nhjump")[0].click();
+
+            }
+            <% end %>
+            <% if(!@flag.nil? && @flag=='true') %>
+            if($("#new_topic_btn")!=undefined)$("#new_topic_btn").click();
+            <% end %>
         });
     });
 </script>
\ No newline at end of file
diff --git a/app/views/boards/_edit.html.erb b/app/views/boards/_edit.html.erb
index 562319e56..909689edd 100644
--- a/app/views/boards/_edit.html.erb
+++ b/app/views/boards/_edit.html.erb
@@ -12,6 +12,7 @@
                            } do |f| %>
             <%= render :partial => 'form_project',
                      :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
+            <div class="ml55 fl" nhname="toolbar_container"></div>
             <a href="javascript:void(0)" nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
             <a href="javascript:void(0)" nhname='submitbtn' class="blue_btn fr c_white" ><%= l(:button_submit)%></a>
           <%#= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white"  %>
@@ -31,6 +32,7 @@
                                } do |f| %>
               <%= render :partial => 'form_course',
                          :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
+              <div class="ml55 fl" nhname="toolbar_container"></div>
               <a href="javascript:void(0)"  nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
               <a href="javascript:void(0)"  nhname='submitbtn' class="blue_btn fr c_white"><%= l(:button_submit)%></a>
 
diff --git a/app/views/boards/_form_course.html.erb b/app/views/boards/_form_course.html.erb
index cfef18f93..65e750b57 100644
--- a/app/views/boards/_form_course.html.erb
+++ b/app/views/boards/_form_course.html.erb
@@ -5,19 +5,19 @@
     <li style="display: none">
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585", :aa=>"subject" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
 
 
-      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
+      <p nhname="subjectmsg" class="ml55"></p>
     </li>
 <% else %>
     <li >
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585", :aa=>"subject" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
 
-      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
+      <p nhname="subjectmsg" class="ml55"></p>
     </li>
 <% end %>
 <li class="ml60 mb5">
@@ -34,11 +34,11 @@
   <div class="cl"></div>
 </li>
 <li>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <div nhname="quote_show" id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
   <% unless replying %>
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
-  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
   <div class="content">
     <% if replying%>
 
@@ -46,13 +46,14 @@
                         :width => '89%',
                         :height => 300,
                         :id => "message_content#{f.object.id}",
-                        :aa => 'content',
+                        :nhname => 'textarea',
                         :onkeyup => "regexContent('#{f.object.id}');",
                         :class => 'talk_text fl',
                         :placeholder => "最多3000个汉字(或6000个英文字符)",
                         :maxlength => 5000 %>
 
     <% else %>
+        <input nhname="init_content_val" value="<%=topic.content%>" type="hidden"/>
         <%= f.text_area :content,
                         :width => '90%',
                         :height => 300,
@@ -61,14 +62,14 @@
                         :id => "message_content#{f.object.id}",
                         :onkeyup => "regexContent('#{f.object.id}');",
                         :class => 'talk_text fl',
-                        :aa => 'content',
+                        :nhname => 'textarea',
                         :placeholder => "最多3000个汉字(或6000个英文字符)",
                         :maxlength => 5000 %>
 
     <% end %>
   </div>
   <div class="cl"></div>
-  <p id="message_content_span<%= f.object.id%>"  aa="message_show"  class="ml55"></p>
+  <p id="message_content_span<%= f.object.id%>"  nhname="contentmsg" class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>
diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index 5cf20a993..f6b41b53f 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
 <style>
     .comment{
         position: relative;
@@ -15,7 +14,7 @@
 <% replying ||= false %>
 <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
 <% if replying %>
-<li style="display: none">
+<li style="display: none;">
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
       <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}",:class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
@@ -47,12 +46,13 @@
   <div class="cl"></div>
 </li>
 <li>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <div nhname="quote_show" id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
   <% unless replying %>
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
-  <%= text_area :quote,:quote,:style => 'display:none' %>
-  <div class="content">
+  <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
+
+  <div class="content <%= replying ? '':'ml55' %>">
   <% if replying%>
 
       <%= f.text_area :content,
@@ -66,6 +66,7 @@
                                         :maxlength => 5000 %>
 
   <% else %>
+      <input nhname="init_content_val" value="<%=topic.content%>" type="hidden"/>
       <%= f.text_area :content,
                        :width => '90%',
                        :height => 300,
@@ -81,7 +82,11 @@
   <% end %>
   </div>
   <div class="cl"></div>
-  <p nhname="contentmsg" class="ml55"></p>
+  <% if replying%>
+      <p nhname="contentmsg"></p>
+  <% else %>
+      <p nhname="contentmsg" class="ml55"></p>
+  <%end %>
 </li>
 <div class="cl"></div>
 <li>
diff --git a/app/views/boards/_project_new_topic.html.erb b/app/views/boards/_project_new_topic.html.erb
index 05304e978..00a3d2016 100644
--- a/app/views/boards/_project_new_topic.html.erb
+++ b/app/views/boards/_project_new_topic.html.erb
@@ -1,7 +1,8 @@
-<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},:nhname=>'form', :html => {:multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %>
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},:html => {:nhname=>'form', :multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %>
 
     <%= render :partial => 'form_project', :locals => {:f => f,  :topic => @message} %>
     <li>
+      <div class="ml55 fl" nhname="toolbar_container"></div>
       <a href="javascript:void(0)"  nhname="cancelbtn" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
 
       <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index ae8dd5ed2..aed6b80e5 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -8,7 +8,7 @@
       <% end %>
     </h2>
     <% if User.current.logged? %>
-        <a href="javascript:void(0)" class="green_btn fr newtalk " nhname="showbtn"><%= l(:label_message_new) %></a>
+        <a href="javascript:void(0)" class="green_btn fr newtalk " id="new_topic_btn" nhname="showbtn"><%= l(:label_message_new) %></a>
     <% end %>
     <div class="cl"></div>
   </div>
@@ -20,7 +20,7 @@
   <% end %>
   <div class="cl"></div>
   <div class=" talklist_box" >
-    <div class="talk_new ml15 mb10" nhname="about_talk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;">
+    <div class="talk_new ml15 mb10" nhname="about_talk" style="display:none;">
       <ul>
         <%= render :partial => 'project_new_topic' %>
       </ul>
@@ -31,141 +31,175 @@
   <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
   <% if @topics.any? %>
     <% @topics.each do |topic| %>
-    <div nhname="container_board" ecname="container_board_reply">
-       <div class="talkmain_box" id="topic<%= topic.id %>" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
-         <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
-         <div class="talkmain_txt fl mt5">
-           <% author = topic.author.to_s + "：" %>
-           <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
-           <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
-           <% if topic.editable_by?(User.current) %>
-             <a href="javascript:void(0)" nhname="showbtn_reply" style="color: #426e9a;float: right;margin-right: 10px;"><%= l(:button_edit) %></a>
-           <% end %>
-           <%= link_to(
-                       l(:button_delete),
-                       {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
-                       :method => :post,
-                       :data => {:confirm => l(:text_are_you_sure)},
-                       :class => 'talk_edit fr',
-                       :style => ' margin-right: 10px;'
-               ) if topic.destroyable_by?(User.current) %>
-           <% if topic.sticky? %>
-               <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
-           <% end %>
-           <div class="cl"></div>
-           <div  class="project_board_content break_word" id="content_<%=topic.id%>">
-             <div id="contentmessage<%=topic.id %>" class="upload_img">
-               <%= topic.content.html_safe %>
-             </div>
-           </div>
-           <p style="display: none" id="project_show_<%= topic.id%>">
-             <a  id="expend_more_information<%= topic.id%>" style="color: #0781b4;"   href="javascript:void(0)"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</a>
-                <span class="g-arr-down">
-                    <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
-                </span>
-           </p>
-           <%= link_to_attachments_course topic, :author => false %>
-           <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
-         </div>
-         <% if User.current.logged? %>
-             <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => "about_newtalk#{topic.id}",:class => ' c_dblue fr' %>
-         <% end %>
-         <div class="cl"></div>
-       </div>
-       <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none">
-         <ul>
-           <%= render :partial => 'edit',locals:  {:topic => topic} %>
-         </ul>
-       </div>
-      <div class="cl"></div>
-    </div>
+      <div class="talkmain_box" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
+        <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
+        <div class="talkmain_txt fl mt5">
+          <% author = topic.author.to_s %>
+          <div style="max-width:60px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
+            <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl ",:title=>author,
+                        :style=>'max-width:60px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %>
+          </div>
+          <p style="float:left;color:#ff5722;">&nbsp;&nbsp;:</p>
 
-     <div class="talkWrapBox">
-       <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
-       <% if !topic.locked? && authorize_for('messages', 'reply') %>
-           <em class="talkWrapArrow"></em>
-           <div class="cl"></div>
-           <div class="talkConIpt ml15 mb10" style="display:none;" nhname="about_talk_reply" id="reply<%= topic.id %>">
-             <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'},
-                          :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
-                 <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-                 <a href="javascript:void(0)" nhname="cancelbtn" class="blue_btn fr ml10" style=""><%= l(:button_cancel)%></a>
-                 <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
-             <% end %>
-             <div class="cl"></div>
-           </div>
-       <% end %>
-     </div>
+          <p class="talkmain_tit fl fb break_word" title="<%=  h(topic.subject) %>" style="width:auto;float:left;max-width:415px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
+          <div style="float:right;max-width:110px;">
+            <% if topic.editable_by?(User.current) %>
+                <a href="javascript:void(0)" nhname="showbtn" style="color: #426e9a;float: right;margin-right: 10px;"><%= l(:button_edit) %></a>
+            <% end %>
+            <%= link_to(
+                        l(:button_delete),
+                        {:controller =>'messages',:action => 'destroy',  :id => topic.id, :board_id => topic.board_id,  :is_board=>'true'},
+                        :method => :post,
+                        :data => {:confirm => l(:text_are_you_sure)},
+                        :class => 'talk_edit fr',
+                        :style => ' margin-right: 10px;'
+                ) if topic.destroyable_by?(User.current) %>
+            <% if topic.sticky? %>
+                <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
+            <% end %>
+            <script>
+                $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
+            </script>
+          </div>
+          <div class="cl"></div>
+          <div  class="project_board_content break_word" id="content_<%=topic.id%>">
+            <div id="contentmessage<%=topic.id %>" class="upload_img">
+              <%= topic.content.html_safe %>
+            </div>
+          </div>
+          <p style="display: none;" id="project_show_<%= topic.id%>">
+            <a  id="expend_more_information<%= topic.id%>" style="color: #0781b4;"   href="javascript:void(0)"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</a>
+            <span class="g-arr-down">
+              <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
+            </span>
+          </p>
+          <%= link_to_attachments_course topic, :author => false %>
+          <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
+        </div>
+        <% if User.current.logged? %>
+          <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr" style="margin-right:10px;"><%= l(:button_reply) %></a>
+        <% end %>
+        <div class="cl"></div>
+        <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none">
+          <ul>
+            <%= render :partial => 'edit',locals:  {:topic => topic} %>
+          </ul>
+        </div>
+        <div class="cl"></div>
+        <div class="talkWrapBox">
+          <% reply = Message.new(:subject => "RE: #{topic.subject}")%>
+          <% if !topic.locked? && authorize_for('messages', 'reply') %>
+          <div class="talkWrapMsg" nhname="about_talk_reply" style="display: none;">
+            <em class="talkWrapArrow"></em>
+            <div class="cl"></div>
+            <div class="talkConIpt ml15 mb10" style="margin-left:30px;" id="reply<%= topic.id %>">
+              <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'},
+                              :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
+                <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+                <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
+                <div style="padding-top:5px;" class="fr">
+                  <a href="javascript:void(0)" nhname="cancelbtn" class="grey_btn fr ml10" style=""><%= l(:button_cancel)%></a>
+                  <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style=""><%= l(:button_submit)%></a>
+                </div>
+              <% end %>
+              <div class="cl"></div>
+            </div>
+          </div>
+          <% end %>
+        <div class="cl"></div>
+        <% replies_all = topic.children.includes(:author, :attachments, {:board => :project}).
+                reorder("#{Message.table_name}.id desc").all %>
+        <% unless replies_all.empty? %>
+          <div class="talkWrapMsg" nhname="nh_reply_div" id="nh_reply_div_<%= topic.id %>">
+            <ul>
+              <% replies_all_i = 0 %>
+              <% replies_all.each do |message| %>
+                <% replies_all_i=replies_all_i+1 %>
+                <li nhname="reply_rec" style="display:<%= replies_all_i>2?'none':'' %>">
+                  <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
+                  <div class="Msg_txt">
+                    <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
+                    <br/>
+                    <div class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></div>
+                    <input nhname="nh_content_val" type="hidden" value="<%= message.content %>"/>
+                    <br/><div class="cl"></div>
+                    <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
+                    <%= link_to(
 
+                                l(:button_delete),
+                                {:controller => 'messages', :action => 'destroy',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
+                                :method => :post,
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :title => l(:button_delete),
+                                :class => ' c_dblue fr'
+                        ) if message.course_destroyable_by?(User.current) %>
+                    <%= link_to(
+                                l(:button_reply),
+                                'javascript:;',
+                                :nhname =>'showbtn_child_reply',
+                                :class => ' c_dblue fr',
+                                :style => 'margin-right: 10px;',
+                                :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+              <% end %>
+            </ul>
+          </div>
+          <%if topic.replies_count>2 %>
+            <div class="talkWrapMsg">
+              <a nhname="reply_ex_btn" data-count="<%= topic.replies_count %>" data-init="0" href="javascript:void(0)" class="ml258 c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a>
+            </div>
+          <% end %>
+        <% end %>
+        </div>
+      </div>
     <% end %>
+  <% else %>
+      <p class="nodata"><%= l(:label_no_data) %></p>
+  <% end %>
+  <ul class="wlist">
+    <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => false, :flag => true %>
+  </ul>
+  <!--讨论主类容 end-->
+
+<%# other_formats_links do |f| %>
+  <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<%# end %>
+  <% html_title @board.name %>
+  <% content_for :header_tags do %>
+      <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
   <% end %>
 </div>
+<div style="display:none;"><a href="#" id="nhjump"></a></div>
 
 <script type="text/javascript">
-  function nh_check_field(params){
-      var result=true;
-
-      if($.trim(params.subject.val()) == ""){
-          params.subjectmsg.html('主题不能为空');
-          params.subjectmsg.css({color:'#ff0000'});
-          result=false;
-      }else{
-          params.subjectmsg.html('填写正确');
-          params.subjectmsg.css({color:'#008000'});
-      }
-      params.subjectmsg.show();
-
-      if($.trim(params.content.html()) == ""){
-          params.contentmsg.html('内容不能为空');
-          params.contentmsg.css({color:'#ff0000'});
-          result=false;
-      }else{
-          params.contentmsg.html('填写正确');
-          params.contentmsg.css({color:'#008000'});
-      }
-      params.contentmsg.show();
-
-      return result;
-  }
-  function nh_init_board(params){
-      params.showbtn.click(function(){//发帖/编辑/回复按钮的click
-          if(params.textarea.data('init') == undefined){
-              var editor = params.kindutil.create(params.textarea, {//初始化编辑器
-                  resizeType : 1,
-                  allowPreviewEmoticons : false,
-                  allowImageUpload : false,
-                  minWidth:"1px",
-                  width:"565px",
-                  items : []
-              });
-              params.submitbtn.click(function(){//提交按钮click
-                  var is_checked = nh_check_field({
-                      subject:params.inputsubject,
-                      subjectmsg:params.subjectmsg,
-                      content:editor,
-                      contentmsg:params.contentmsg,
-                  });
-                  if(is_checked){
-                      alert('submit');
-                      params.textarea.html(editor.html());
-//                  params.form.submit();
-                  }
-              });
-              params.cancelbtn.click(function(){//取消按钮click
-                  params.about_talk.toggle();//显示/隐藏编辑区
-                  params.inputsubject.focus();
-              });
-              params.textarea.data('init','1')
-          }
-          params.cancelbtn.click();//显示/隐藏编辑区
-      });
-  }
   $(function(){
+      $(".talkmain_box").each(function(){
+          var target = $("li[nhname='reply_rec']",$(this));
+          var btn = $("a[nhname='reply_ex_btn']",$(this));
+          var jumpobj = $("div[nhname='nh_reply_div']",$(this));
+          btn.click(function(){
+              if($(this).data('init')=='0'){
+                  $(this).data('init',1);
+                  $(this).html('收起回复('+$(this).data('count')+')');
+                  target.show();
+              }else{
+                  $(this).data('init',0);
+                  $(this).html('展开回复('+$(this).data('count')+')');
+                  target.hide();
+                  target.eq(0).show();
+                  target.eq(1).show();
+                  $("#nhjump").attr('href','#'+jumpobj.attr('id'));
+                  $("#nhjump")[0].click();
+              }
+          });
+      });
       KindEditor.ready(function(K){
           $("div[nhname='container_board']").each(function(){
               var container = $(this);
               var about_talk = $("div[nhname='about_talk']",container);
-              nh_init_board({
+              var params = ({
                   kindutil:K,
                   showbtn:$("a[nhname='showbtn']",container),
                   about_talk:about_talk,
@@ -175,15 +209,20 @@
                   contentmsg:$("p[nhname='contentmsg']",about_talk),
                   submitbtn:$("a[nhname='submitbtn']",about_talk),
                   cancelbtn:$("a[nhname='cancelbtn']",about_talk),
-                  form:$("form[nhname='form']",about_talk)
+                  form:$("form[nhname='form']",about_talk),
+                  toolbar_container:$("div[nhname='toolbar_container']",about_talk),
+                  init_content_val:$("input[nhname='init_content_val']",about_talk)
               });
+              nh_init_board(params);
           });
-          $("div[ecname='container_board_reply']").each(function(){
+          $("div[mhname='container_board_reply']").each(function(){
               var container = $(this);
               var about_talk = $("div[nhname='about_talk_reply']",container);
-              nh_init_board({
+              var params = {
+                  type:'reply',
                   kindutil:K,
                   showbtn:$("a[nhname='showbtn_reply']",container),
+                  showbtn_child:$("a[nhname='showbtn_child_reply']",container),
                   about_talk:about_talk,
                   inputsubject:$("input[nhname='inputsubject']",about_talk),
                   subjectmsg:$("p[nhname='subjectmsg']",about_talk),
@@ -191,9 +230,22 @@
                   contentmsg:$("p[nhname='contentmsg']",about_talk),
                   submitbtn:$("a[nhname='submitbtn']",about_talk),
                   cancelbtn:$("a[nhname='cancelbtn']",about_talk),
-                  form:$("form[nhname='form']",about_talk)
-              });
+                  form:$("form[nhname='form']",about_talk),
+                  quote_show:$("div[nhname='quote_show']",about_talk),
+                  quote_input:$("textarea[nhname='quote_input']",about_talk),
+                  toolbar_container:$("div[nhname='toolbar_container']",about_talk),
+                  jumphref:$("#nhjump")
+              };
+              params.get_ref_str_call=function(btn){
+                  var div = btn.parent('div');
+                  var str = '<blockquote>'+$('a',div).filter(':first').html()+' 写到： <br/>'+$("input[nhname='nh_content_val']",div).val()+'</blockquote>';
+                  return str;
+              }
+              nh_init_board(params);
           });
+          <% if(!@flag.nil? && @flag=='true') %>
+              if($("#new_topic_btn")!=undefined)$("#new_topic_btn").click();
+          <% end %>
       });
   });
 </script>
\ No newline at end of file
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 7ec7fd0fd..589a0f25d 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,9 +1,21 @@
+<style type="text/css">
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
+    .break_word {width:100%;}
+</style>
 <script type="text/javascript">
     //头部导航
     var menuids=["TopUserNav"] //Enter id(s) of SuckerTree UL menus, separated by commas
     function buildsubmenus(){
         for (var i=0; i<menuids.length; i++){
-            var ultags=document.getElementById(menuids[i]).getElementsByTagName("ul")
+            var div = document.getElementById(menuids[i]);
+            if(div == undefined)continue;
+            var ultags=div.getElementsByTagName("ul")
             for (var t=0; t<ultags.length; t++){
                 ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle"
                 ultags[t].parentNode.onmouseover=function(){
@@ -21,55 +33,184 @@
     else if (window.attachEvent)
         window.attachEvent("onload", buildsubmenus)
 </script>
-
-<script type="text/javascript">//侧导航
-
-window.onload = function () {
-    var topic_id = getParam('topic_id');
-    document.getElementById(topic_id).focus();
-}
-
-var getParam = function(name){
-    var search = document.location.search;
-    var pattern = new RegExp("[?&]"+name+"\=([^&]+)", "g");
-    var matcher = pattern.exec(search);
-    var items = null;
-    if(null != matcher){
-        try{
-            items = decodeURIComponent(decodeURIComponent(matcher[1]));
-        }catch(e){
-            try{
-                items = decodeURIComponent(matcher[1]);
-            }catch(e){
-                items = matcher[1];
-            }
-        }
-    }
-    return items;
-};
-
-function show_newtalk()
-{
-    $("#about_newtalk").toggle();
-
-
-
-}
-
-function show_newtalk1(id)
-{
-    $(id).toggle();
-    $(id).focus();
-
-
-}
-
-
-
-</script>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
 
 <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>
 <% elsif @course %>
     <%= render :partial => 'course_show', locals: {course: @course} %>
 <% end %>
+
+
+<script type="text/javascript">//侧导航
+
+//window.onload = function () {
+//    var topic_id = getParam('topic_id');
+//    document.getElementById(topic_id).focus();
+//}
+//
+//var getParam = function(name){
+//    var search = document.location.search;
+//    var pattern = new RegExp("[?&]"+name+"\=([^&]+)", "g");
+//    var matcher = pattern.exec(search);
+//    var items = null;
+//    if(null != matcher){
+//        try{
+//            items = decodeURIComponent(decodeURIComponent(matcher[1]));
+//        }catch(e){
+//            try{
+//                items = decodeURIComponent(matcher[1]);
+//            }catch(e){
+//                items = matcher[1];
+//            }
+//        }
+//    }
+//    return items;
+//};
+//
+//function show_newtalk()
+//{
+//    $("#about_newtalk").toggle();
+//
+//
+//
+//}
+//
+//function show_newtalk1(id)
+//{
+//    $(id).toggle();
+//    $(id).focus();
+//
+//
+//}
+
+function nh_check_field(params){
+    var result=true;
+    if(params.subject!=undefined){
+        if($.trim(params.subject.val()) == ""){
+            params.subjectmsg.html('主题不能为空');
+            params.subjectmsg.css({color:'#ff0000'});
+            result=false;
+        }else{
+            params.subjectmsg.html('填写正确');
+            params.subjectmsg.css({color:'#008000'});
+        }
+        params.subjectmsg.show();
+    }
+
+    if(params.content!=undefined){
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            if(params.content.isEmpty()){
+                params.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
+    }
+
+    return result;
+}
+function nh_init_board(params){
+    //发帖/编辑/回复按钮的click
+    params.showbtn.click(function(){
+        if(params.textarea.data('init') == undefined){
+            //初始化编辑器
+            var editor = params.kindutil.create(params.textarea, {
+                resizeType : 1,
+                allowPreviewEmoticons : false,
+                allowImageUpload : false,
+                minWidth:"1px",
+                width:"565px",
+                items : ['emoticons'],
+                afterChange:function(){//按键事件
+                    nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+                },
+                afterCreate:function(){
+                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
+                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+                    params.toolbar_container.append(toolbar);
+                }
+            });
+
+            //主题输入框按键事件
+            params.inputsubject.keyup(function(){
+                nh_check_field({subject:params.inputsubject,subjectmsg:params.subjectmsg});
+            })
+            //表单提交
+            params.form.submit(function(){
+                var is_checked = nh_check_field({
+                    issubmit:true,
+                    subject:params.inputsubject,
+                    subjectmsg:params.subjectmsg,
+                    content:editor,
+                    contentmsg:params.contentmsg,
+                    textarea:params.textarea
+                });
+                if(is_checked){
+                    //return true 居然不提交 fuck your sister
+                    $(this)[0].submit();
+//                    return true;
+                }
+                return false;
+            });
+            //提交按钮click
+            params.submitbtn.click(function(){
+                params.form.submit();
+            });
+            //取消按钮click
+            params.cancelbtn.click(function(){
+                params.about_talk.toggle();//显示/隐藏编辑区
+                if(params.about_talk.is(':hidden')){//隐藏时reset表单数据
+                    params.form[0].reset();
+                    if(params.type=='reply'){
+                        params.textarea.empty();
+                    }else{
+                        params.textarea.html(params.init_content_val.val());
+                    }
+                    var str = params.textarea.html();
+                    str=str.replace(new RegExp(/&lt;/g),'<');
+                    str=str.replace(new RegExp(/&gt;/g),'>');
+                    editor.html(str);
+                    params.subjectmsg.hide();
+                    params.contentmsg.hide();
+                    if(params.quote_show!=undefined)params.quote_show.empty();
+                    if(params.quote_input!=undefined)params.quote_input.empty();
+                }else{
+                    if(params.type=='reply'){
+                        params.jumphref.attr('href','#'+params.form.attr('id'));
+                        params.jumphref[0].click();
+                    }else params.inputsubject.focus();
+                }
+            });
+            params.textarea.data('init','1');//标记为已经初始化
+        }
+        params.cancelbtn.click();//显示/隐藏编辑区
+    });
+    if(params.type == 'reply'){
+        params.showbtn_child.click(function(){
+            if(params.textarea.data('init') == undefined){
+                params.showbtn.click();
+            }else{
+                params.cancelbtn.click();
+                if(params.about_talk.is(':hidden')){
+                    params.cancelbtn.click();
+                }
+            }
+            var parent_topic_id =  $(this).data('topic-id');
+            if(parent_topic_id!=undefined)$("input[name='parent_topic']",params.form).val(parent_topic_id);
+            var ref_str = params.get_ref_str_call($(this));
+            params.quote_show.html(ref_str);
+            params.quote_input.html(ref_str);
+        });
+    }
+}
+
+
+</script>
\ No newline at end of file
diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb
index 420a22f8a..f2972df44 100644
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@@ -46,8 +46,8 @@
 
 <div class="information_for_course" >
 	<p class="stats">
-		<%= content_tag('span',  link_to("#{@course.homeworks.count}", homework_course_path(@course)), :class => "info") %>
-		<%= content_tag('span',  l(:label_x_task, :count => @course.homeworks.count)) %>
+		<%= content_tag('span',  link_to("#{@course.homework_commons.count}", homework_common_index_path(:course => @course.id)), :class => "info") %>
+		<%= content_tag('span',  l(:label_x_task, :count => @course.homework_commons.count)) %>
 	</p>
 	<p class="stats">
 		<% files_count = @course.attachments.count %>
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index bb080b57b..0d250cf14 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -1,24 +1,5 @@
 <style>
-    table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-    ul,li{ list-style-type:none}
-    .cl{ clear:both; overflow:hidden; }
-    a{ text-decoration:none; text-align:center; }
-    a:hover{ text-decoration:underline;}
-    /**** 常用***/
-    .f_l{ float:left;}
-    .f_r{ float:right;}
-    .b_lblue{ background:#64bdd9;}
-    .b_dblue{ background:#55a1b9; cursor:pointer;}
-    .f_b{ font-weight: bold;}
-    .c_blue{ color:#64bdd9;}
-    .c_grey{ color:#999999;}
     .c_grey02{ color:#666666;}
-    .f_14{ font-size:14px;}
-    .c_dblue{ color:#3e6d8e;}
-    .w90{width:90px;}
-    .ml10{margin-left:10px;}
-    .ml5{margin-left:5px;}
-    .b_grey{ background:#a3a3a3;}
     .c_blue02{ color:#15bcce; font-weight: bold;}
     .w280{ display:block; width:280px;float:left;}
     .w70{ display:block;width:70px; text-align:center; float:left;}
@@ -26,9 +7,6 @@
     .c_blue03{ color:#0d90c4;}
 
 
-    /***弹框***/
-    /*#popbox_tscore{width:480px;position:absolute;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}*/
-    /*.alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;}*/
     .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  text-align: center; padding-top:5px;}
     .tscore_box{ width:350px; margin:15px auto;}
     .tscore_box li{ height:25px;}
@@ -40,11 +18,16 @@
     <ul class="tscore_box">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
       <% @member_score.student_homework_score[0].each do |homework_score| %>
-
-            <li><span class="c_grey02 w280"><%= homework_score.name %></span><span class="c_red w70"><%= format("%0.2f",homework_score[:score].nil? ? 0 : homework_score[:score]) %></span></li>
+            <li>
+              <span class="c_grey02 w280">
+                <%= homework_score.name %>
+              </span>
+              <span class="c_red w70">
+                <%= format("%0.2f",homework_score[:score].nil? ? 0 : homework_score[:score]) %>
+              </span>
+            </li>
        <% end %>
       <li><span class="c_blue03 w280">作业积分（总得分）</span><span class="c_red w70"><%= @member_score.student_homework_score[1] %></span></li>
     </ul>
 
-
   </div>
diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
deleted file mode 100644
index 7b74351cd..000000000
--- a/app/views/courses/homework.html.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_homework)%>
-  </h2>
-</div>
-<div class="talk_top">
-  <p class="fl">
-    <%= l(:label_totle)%><span><%= @obj_count%></span><%= l(:label_homework_count)%>
-  </p>
-  <%= link_to( l(:label_course_homework_new), new_homework_course_path(@course), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
-  <div class="cl"></div>
-</div>
-<% @bids.each do |bid|%>
-    <div class="problem_main">
-      <%= link_to(image_tag(url_to_avatar(bid.author), :width => "42", :height => "42"), user_path(bid.author), :class => "problem_pic fl") %>
-      <div class="problem_txt fl mt5">
-        <%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author),:class => 'problem_name fl') %>
-        <span class="fl"> <%= l(:label_user_create_project_homework) %>：</span>
-        <%= link_to(bid.name, course_for_bid_path(bid), :class => 'problem_tit fl fb c_dblue') %>
-        <div class="cl mb5"></div>
-        <p class="fl "><%= l(:lebel_homework_commit)%> ( <%= link_to bid.homeworks.count, course_for_bid_path(bid.id), :class => 'c_red'%> )</p>
-        <% if @is_teacher%>
-            <%= bid_anonymous_comment(bid)%>
-            <% if bid.homeworks.empty? %>
-            <%= link_to(l(:button_delete),bids_homework_path(:id => bid.id), :method => :delete, :confirm => l(:label_delete_confirm), :class => "fr mr10 work_edit") %>
-            <% end %>
-            <%= link_to(l(:button_edit),edit_bid_path(:course_id =>@course.id, :bid_id => bid.id), :class => "fr mr10 work_edit") %>
-        <% elsif @is_student%>
-            <%= student_anonymous_comment bid %>
-            <%= student_new_homework bid %>
-        <% end %>
-        <div class="cl"></div>
-        <script>
-            $(function(){if($("#bid_description_<%= bid.id%>_content").height()>38){$("#bid_show_more_des_button<%= bid.id%>").show();}});
-        </script>
-        <div  id="bid_description_<%= bid.id%>" class="news_description mt5">
-          <div id="bid_description_<%= bid.id%>_content" class="upload_img">
-            <%= bid.description.html_safe %>
-          </div>
-        </div>
-        <div class="news_foot c_red" id="bid_show_more_des_button<%= bid.id%>" onclick="bid_show_more_des(<%= bid.id%>);" style="cursor:pointer;display: none;">
-          <%= l(:button_more)%>...
-          <span class="g-arr-down"></span>
-        </div>
-        <span class="fl"><%= l(:label_end_time)%>：<%= bid.deadline%></span>
-        <% if betweentime(bid.deadline) < 0 %>
-            <span class='fr mr10 c_red '>
-              <%= l(:label_commit_limit)%>
-            </span>
-        <% else %>
-            <script type="text/javascript">
-                window.setInterval(function(){show_bid_dead_line(<%= bid.deadline.year%>,<%= bid.deadline.month%>,<%= bid.deadline.day + 1%>,"bid_deadline_<%= bid.id%>");},1000)
-            </script>
-            <div id="bid_deadline_<%= bid.id%>">
-            </div>
-        <% end %>
-      </div>
-      <div class="cl"></div>
-    </div>
-<% end%>
-
-<ul class="wlist">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-</ul>
-<div class="cl"></div>
diff --git a/app/views/courses/new_homework.html.erb b/app/views/courses/new_homework.html.erb
deleted file mode 100644
index 9ec73d519..000000000
--- a/app/views/courses/new_homework.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<%= labelled_form_for @homework, :html => { :multipart => true }, :url => {:controller => 'bids', :action => 'create_homework',:course_id => "#{params[:id] || params[:course_id]}"} do |f| %>
-	<%= render :partial => 'bids/new_homework_form', :locals => { :bid => @homework,:bid_id => "new_bid",:f => f,:edit_mode => false } %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index cc3bb33f1..0feca0d1b 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -1,11 +1,22 @@
 <div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_activity)%></h2>
+<% if @controller_name=='ActivityNotifys' %>
+  <a class="fl about_me" href="<%=course_path(@course)%>"><%= l(:label_activity)%></a>
+  <h2 class="fl project_h2">与我相关</h2>
+  <div class="fr mt10 mr5 c_grey02">
+    <label class="mr5" style="cursor:pointer;" data-href="<%= course_activity_notifys_path(@course) %>/chang_read_flag" nhname='nh_act_link_all'>全部标为已读</label>
+  </div>
+<% else %>
+  <h2 class="fl project_h2"><%= l(:label_activity)%></h2>
+  <% if User.current.logged? %>
+  <a class="fl about_me" href="<%=course_activity_notifys_path(@course)%>">与我相关</a>
+  <% end %>
+<% end %>
 </div>
 
 <% if @events_by_day != nil && @events_by_day.size >0 %>
     <% @events_by_day.keys.sort.reverse.each do |day| %>
         <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
-            <div class="problem_main">
+            <div class="problem_main" nhname="container">
               <a class="problem_pic fl">
                 <%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %>
               </a>
@@ -14,8 +25,19 @@
                 <%= link_to_user_header("(#{e.event_author})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName && e.respond_to?(:event_author) %>
                 <span class="fl"> &nbsp;</span>
                 <span class="fl"> <%= l(:label_new_activity) %>：</span>
-                <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) :
-                        (e.event_type.eql?("bid") ? homework_course_path(@course) : (e.event_type.eql?("message") || e.event_type.eql?("reply")  ?  course_boards_path(@course,:topic_id => e.id) : e.event_url)),:class => "problem_tit c_dblue fl fb"%>
+                <%
+                     link = (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) :
+                                (e.event_type.eql?("bid") ? homework_course_path(@course) :
+                                         (e.event_type.eql?("message") || e.event_type.eql?("reply")  ?
+                                                course_boards_path(@course,:topic_id => e.id,:parent_id=>(e.parent_id ? e.parent_id : e.id)) : e.event_url))
+                %>
+                <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), link,
+                            :class => "problem_tit c_dblue fl fb",'data-type'=>e.event_type,
+                            'data-notify-id'=>(e.respond_to?('get_notify_id') ? e.get_notify_id : ''),:nhname=>"nh_act_link",
+                            'data-href'=>(course_activity_notifys_path(@course)+"/chang_read_flag?an_id="+(e.respond_to?('get_notify_id') ? e.get_notify_id : '').to_s)%>
+                <%if @controller_name=='ActivityNotifys' && !e.get_notify_is_read%>
+                <span nhname="nh_act_flag" class="ml10 fl"><img src="/images/new.png" width="35" height="15"/></span>
+                <%end%>
                 <br />
                 <p class="mt5 break_word"><%= e.event_description.html_safe %>
                   <br />
@@ -28,7 +50,7 @@
         <% end%>
     <% end%>
 <% end%>
-<% if @obj_pages.next_page.nil? %>
+<% if @obj_pages.next_page.nil? && @controller_name!='ActivityNotifys' %>
 <div class="problem_main">
   <a class="problem_pic fl">
     <%= image_tag(url_to_avatar(@user), :width => "42", :height => "42") %>
@@ -51,3 +73,35 @@
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
 <div class="cl"></div>
+
+<script type="text/javascript">
+  $(function(){
+      $("div[nhname='container']").each(function(){
+          var container = $(this);
+          var btn = $("a[nhname='nh_act_link']",container);
+          if(btn.data('notify-id')>0){
+              btn.attr('target','_blank');
+              btn.click(function(){
+                  var flag = $("span[nhname='nh_act_flag']",container);
+                  if(flag!=undefined){
+                      var url = $(this).data('href');
+                      $.ajax({url:url,dataType:'text',success:function(data){
+                          if(data == 'true'){
+                              flag.remove();
+                          }
+                      }});
+                  }
+                  return true;
+              });
+          }
+      });
+      $("label[nhname='nh_act_link_all']").click(function(){
+          var url = $(this).data('href');
+          $.ajax({url:url,dataType:'text',success:function(data){
+              if(data == 'true'){
+                  $("span[nhname='nh_act_flag']").remove();
+              }
+          }});
+      });
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/courses/show_member_score.js.erb b/app/views/courses/show_member_score.js.erb
index 87e728901..013b478fc 100644
--- a/app/views/courses/show_member_score.js.erb
+++ b/app/views/courses/show_member_score.js.erb
@@ -6,8 +6,8 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'courses/show_me
 showModal('ajax-modal', '400px');
 //$('#ajax-modal').css('height','569px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
-"<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').before("<span>" +
+"<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' style='margin-left: 375px;' /></a></span>");
 //$('#ajax-modal').parent().removeClass();
 $('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed");
 $('#ajax-modal').parent().addClass("new-watcher");
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 6039b543b..043aea489 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -44,7 +44,7 @@
               <% end %>
             </div>
             <div class="cl"></div>
-            <div class="">
+            <div class="mt5">
               <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
               <%= link_to( l(:button_delete), attachment_path(file),
                            :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>
diff --git a/app/views/homework_common/_alert_anonyoms.html.erb b/app/views/homework_common/_alert_anonyoms.html.erb
new file mode 100644
index 000000000..3b199e0d8
--- /dev/null
+++ b/app/views/homework_common/_alert_anonyoms.html.erb
@@ -0,0 +1,42 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <% if @homework_detail_manual.comment_status == 1%>
+        <h2>开启匿评功能</h2>
+        <p>
+          开启匿评后学生将不能对作品进行
+          <span class="c_blue">修改、删除</span>
+          等操作，目前有
+          <span class="c_pink"><%= @totle_size%>个</span>
+          学生，共提交了
+          <span class="c_pink"><%= @cur_size %></span>
+          份作品，占
+          <span class="c_pink"><%= @percent %>%</span>，
+          是否确定开启匿评？
+        </p>
+    <% elsif @homework_detail_manual.comment_status == 2 %>
+        <h2>关闭匿评功能</h2>
+        <p>
+          关闭匿评后学生将不能对作品进行
+          <span class="c_blue">匿评</span>
+          ,且作品列表将会
+          <span class="c_blue">公开</span>，
+          目前分配了
+          <span class="c_pink"><%= @totle_size%>份</span>
+          匿评作品，已评了
+          <span class="c_pink"><%= @cur_size %></span>
+          份作品，占
+          <span class="c_pink"><%= @percent %>%</span>，
+          是否确定关闭匿评？
+        </p>
+    <% end %>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual%>');" style="margin-bottom: 20px;" >
+        确&nbsp;&nbsp;定
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+  </div>
+</div>
+
diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_common_form.html.erb
new file mode 100644
index 000000000..e3ef0d237
--- /dev/null
+++ b/app/views/homework_common/_homework_common_form.html.erb
@@ -0,0 +1,108 @@
+<ul class="hwork_new_basic mb10">
+  <li>
+    <label class="label02 mb20">
+      <span class="c_red">*</span>
+      &nbsp;<%= l(:field_name)%>：&nbsp;
+    </label>
+    <input  type="text" name="homework_common[name]" id="homework_name" class="w548 h26  fl" maxlength="<%= Bid::NAME_LENGTH_LIMIT%>" onkeyup="regex_homework_name();" value="<%= homework.name%>" >
+    <p id="homework_name_span" class="c_red ml110"></p>
+  </li>
+  <div class="cl"></div>
+  <li >
+    <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
+    <!--<textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>-->
+    <% if edit_mode %>
+        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
+    <% else %>
+        <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor' %>
+    <% end %>
+  </li>
+  <div class="cl"></div>
+  <li class="mt10">
+    <label class="label02">&nbsp;&nbsp;附件：&nbsp;</label>
+    <%= render :partial => 'attachments/new_form', :locals => {:container => homework} %>
+  </li>
+  <div class="cl"></div>
+  <li class="fl">
+    <label class="label02">
+      <span class="c_red">*</span>
+      &nbsp;<%= l(:label_limit_time)%>：&nbsp;
+    </label>
+    <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.end_time%>" >
+    <%= calendar_for('homework_end_time')%>
+    <div class="cl"></div>
+  </li>
+  <li class="fl ml100" style="display: none;">
+    <label class="label02">&nbsp;发布日期：&nbsp;</label>
+    <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
+    <%= calendar_for('homework_publish_time')%>
+    <div class="cl"></div>
+  </li>
+  <div class="cl"></div>
+</ul><!--hwork_new_basic end--->
+<div class="hwork_new_set" >
+  <p class="fl ml20 f14 mb10 c_orange">基本规则设置（总分为100分）</p>
+  <div class="cl"></div>
+    <ul class="ml10">
+      <li style="display: none;">
+        <label class="label02">迟交扣分：&nbsp;</label>
+        <%= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
+        <span class="fl mt5">&nbsp;分</span>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <label class="label02" >是否匿评：&nbsp;</label>
+        <%= f.check_box :homework_type, :class => "mb10 mt5 fl" %>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <label class="label02">评分比例：&nbsp;</label>
+        <%= select_tag :ta_proportion,options_for_select(ta_proportion_option,homework.homework_detail_manual.ta_proportion), {:class => "fl mb10 h26 w70"}  %>
+        <span class="ml5 fl mt5">×&nbsp;教辅评分</span>
+        <span class="ml5 fl mt5">&nbsp;&nbsp;+&nbsp;&nbsp;</span>
+        <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion* 100).to_i%>%" class="fl mb10 h26 w70" readonly>
+        <span class="ml5 fl mt5">×&nbsp;匿评得分</span>
+        <span class="ml5 fl mt5">=&nbsp;学生得分</span>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <label class="label02" >&nbsp;&nbsp;</label>
+        <span class=" fl  c_red">如果教师对学生作品进行了评分，则教师评分为学生最终得分。</span>
+        <div class="cl"></div>
+      </li>
+    </ul>
+</div><!--hwork_new_set end-->
+
+<div class="hwork_new_set" id="evaluation_setting" >
+  <p class="fl ml20 f14 mb10 c_orange">学生互评设置</p>
+  <div class="cl"></div>
+  <ul class="ml10">
+    <li style="display: none;">
+      <label class="label02">互评启动时间：&nbsp;</label>
+      <input  type="text" name="evaluation_start" id="evaluation_start_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_start%>" >
+      <%= calendar_for('evaluation_start_time')%>
+      <div class="cl"></div>
+    </li>
+    <li style="display: none;">
+      <label class="label02">互评结束时间：&nbsp;</label>
+      <input  type="text" name="evaluation_end" id="evaluation_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_end%>" >
+      <%= calendar_for('evaluation_end_time')%>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <label class="label02">匿评分配数：&nbsp;</label>
+      <input  type="text" name="evaluation_num" id="evaluation_num" class=" hwork_input02 fl"  value="<%= homework.homework_detail_manual.evaluation_num%>" maxlength="2" onkeyup="regex_evaluation_num()">
+      <p class="ml5 fl mt5" id="evaluation_num_notice">每个学生将收到<span class="c_red">&nbsp;3&nbsp;</span>份待匿评作品</p>
+      <div class="cl"></div>
+    </li>
+
+    <li style="display: none;">
+      <label class="label02">缺评扣分：&nbsp;</label>
+      <%= select_tag :absence_penalty,options_for_select(absence_penalty_option,homework.homework_detail_manual.absence_penalty), {:class => "fl mb10 h26 w70"}  %>
+      <span class="fl mt5">&nbsp;分</span>
+      <p class="ml5 fl mt5">学生漏评1个作品将扣<span class="c_red" id="absence_penalty_notice">&nbsp;2&nbsp;</span>分</p>
+      <div class="cl"></div>
+    </li>
+  </ul> <!-- h1 end--->
+</div><!--hwork_new_set end-->
\ No newline at end of file
diff --git a/app/views/homework_common/alert_anonymous_comment.js.erb b/app/views/homework_common/alert_anonymous_comment.js.erb
new file mode 100644
index 000000000..2b3248dc2
--- /dev/null
+++ b/app/views/homework_common/alert_anonymous_comment.js.erb
@@ -0,0 +1,7 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'alert_anonyoms') %>');
+showModal('ajax-modal', '500px');
+$('#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().addClass("anonymos");
\ No newline at end of file
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
new file mode 100644
index 000000000..f9d3f8b70
--- /dev/null
+++ b/app/views/homework_common/edit.html.erb
@@ -0,0 +1,16 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= error_messages_for 'homework_common' %>
+
+<div class="project_r_h">
+  <h2 class="project_h2">
+    <%= l(:label_course_homework_edit)%>
+  </h2>
+</div>
+<div class="hwork_new">
+  <%= form_for @homework do |f| %>
+      <%= render :partial => 'homework_common/homework_common_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%>
+</div><!--hwork_new end-->
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
new file mode 100644
index 000000000..87bf37f04
--- /dev/null
+++ b/app/views/homework_common/index.html.erb
@@ -0,0 +1,81 @@
+<div class="project_r_h">
+  <h2 class="project_h2">
+    <%= l(:label_homework)%>
+  </h2>
+</div>
+<div class="talk_top">
+  <p class="fl">
+    <%= l(:label_totle)%>
+    <span><%= @obj_count%></span>
+    <%= l(:label_homework_count)%>
+  </p>
+  <%= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
+  <div class="cl"></div>
+</div>
+<% @homeworks.each do |homework|%>
+    <div class="problem_main">
+      <%= link_to(image_tag(url_to_avatar(homework.user), :width => "42", :height => "42"), user_path(homework.user), :class => "problem_pic fl") %>
+      <div class="problem_txt fl mt5">
+        <%= link_to(homework.user.lastname+homework.user.firstname, user_path(homework.user),:class => 'problem_name fl') %>
+        <span class="fl"> <%= l(:label_user_create_project_homework) %>：</span>
+        <%= link_to(homework.name, student_work_index_path(:homework => homework.id), :class => 'problem_tit fl fb c_dblue') %>
+        <div class="cl mb5"></div>
+        <p class="fl ">
+          <%= l(:lebel_homework_commit)%>
+          ( <%= 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")  %>
+            <%= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %>
+        <% elsif @is_student%>
+            <%= student_anonymous_comment homework %>
+            <%= student_new_homework homework %>
+        <% end %>
+        <div class="cl"></div>
+        <script>
+            $(function(){if($("#bid_description_<%= homework.id%>_content").height()>360){$("#bid_show_more_des_button<%= homework.id%>").show();}});
+        </script>
+        <div  id="bid_description_<%= homework.id%>" class="news_description mt5">
+          <div id="bid_description_<%= homework.id%>_content" class="upload_img">
+            <%= homework.description.html_safe %>
+          </div>
+        </div>
+        <div class="news_foot c_red" id="bid_show_more_des_button<%= homework.id%>" onclick="bid_show_more_des(<%= homework.id%>);" style="cursor:pointer;display: none;">
+          <%= l(:button_more)%>...
+          <span class="g-arr-down"></span>
+        </div>
+
+        <div class="cl"></div>
+        <div class="mt5">
+          <% unless homework.attachments.empty?%>
+              <span class="tit_fb"  style="width: auto;"> 附件：</span>
+              <div class="fl mb5">
+                <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework.attachments} %>
+              </div>
+          <% end%>
+        </div>
+
+        <div class="cl"></div>
+
+        <span class="fl"><%= l(:label_end_time)%>：<%= homework.end_time%></span>
+        <% if betweentime(homework.end_time) < 0 %>
+            <span class='fr mr10 c_red '>
+              <%= l(:label_commit_limit)%>
+            </span>
+        <% else %>
+            <script type="text/javascript">
+                window.setInterval(function(){show_bid_dead_line(<%= homework.end_time.year%>,<%= homework.end_time.month%>,<%= homework.end_time.day + 1%>,"bid_deadline_<%= homework.id%>");},1000)
+            </script>
+            <div id="bid_deadline_<%= homework.id%>">
+            </div>
+        <% end %>
+      </div>
+      <div class="cl"></div>
+    </div>
+<% end%>
+
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+</ul>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb
new file mode 100644
index 000000000..b0fdc5299
--- /dev/null
+++ b/app/views/homework_common/new.html.erb
@@ -0,0 +1,17 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= error_messages_for 'homework_common' %>
+
+<div class="project_r_h">
+  <h2 class="project_h2">
+    <%= l(:label_course_homework_new)%>
+  </h2>
+</div>
+<div class="hwork_new">
+  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
+      <%= hidden_field_tag "course",@course.id%>
+      <%= render :partial => 'homework_common/homework_common_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
+      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
+      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+  <% end%>
+</div><!--hwork_new end-->
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/homework_common/start_anonymous_comment.js.erb b/app/views/homework_common/start_anonymous_comment.js.erb
new file mode 100644
index 000000000..cd4dafde8
--- /dev/null
+++ b/app/views/homework_common/start_anonymous_comment.js.erb
@@ -0,0 +1,10 @@
+<% if @statue == 1%>
+alert('启动成功');
+$("#<%= @homework.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "fr mr10 work_edit")%>');
+<% elsif @statue == 2 %>
+alert('启动失败\n作业总数大于等于2份时才能启动匿评');
+<% elsif @statue == 3%>
+alert("已开启匿评，请务重复开启");
+<% elsif @statue == 3%>
+alert("您没有权限开启匿评");
+<% end %>
\ No newline at end of file
diff --git a/app/views/homework_common/stop_anonymous_comment.js.erb b/app/views/homework_common/stop_anonymous_comment.js.erb
new file mode 100644
index 000000000..9a6131c64
--- /dev/null
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@@ -0,0 +1,2 @@
+$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('<span class="fr  pr_join_span mr10" title="匿评结束">匿评结束</span>');
+alert('关闭成功');
\ No newline at end of file
diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb
index e4d2658b1..46a2eff63 100644
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@@ -18,15 +18,15 @@
         <% if User.current.logged? -%>
 
             <li id="current_user_li">
-              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, :class => "uses_name"%>
+              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, target:"_blank", :class => "uses_name"%>
               <ul id="user_sub_menu" style="right: 0px;display: none;">
                 <% unless User.current.projects.empty? %>
                     <li id="my_projects_li">
-                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name}, :class => "parent" %>
-                      <ul id="my_projects_ul">
+                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name},target:"_blank", :class => "parent" %>
+                      <ul id="my_projects_ul" >
                         <% User.current.projects.each do |project| %>
                             <li title="<%=project.name%>">
-                              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
+                              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name }, target:"_blank" %>
                             </li>
                         <% end %>
                       </ul>
@@ -37,11 +37,11 @@
                     <% user_course = get_user_course User.current%>
                     <% unless user_course.empty? %>
                         <li  id="my_courses_li">
-                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id}, :class => "parent"  %>
+                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id},target:"_blank", :class => "parent"  %>
                           <ul id="my_courses_ul">
                             <% user_course.each do |course| %>
                                 <li title="<%=course.name%>">
-                                  <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id} %>
+                                  <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id},target:"_blank" %>
                                 </li>
                             <% end %>
                           </ul>
diff --git a/app/views/layouts/_user_courses_list.html.erb b/app/views/layouts/_user_courses_list.html.erb
index 38ccf72bf..ce9282ee7 100644
--- a/app/views/layouts/_user_courses_list.html.erb
+++ b/app/views/layouts/_user_courses_list.html.erb
@@ -3,14 +3,14 @@
       <%=link_to l(:label_my_course), user_courses_user_path(User.current.id) %>
       <ul class="course_sub_menu">
         <% course_index = 0 %>
-        <% cache User.current.courses.count do%>
+
         <%  User.current.courses.each do |course| %>
             <% if !course_endTime_timeout?(course) %>
                 <%= render :partial => 'layouts/user_homework_list', :locals => {:course => course,:course_index => course_index} %>
                 <% course_index += 1 %>
             <% end %>
         <% end %>
-       <% end %>
+
       </ul>
     </li>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/_user_homework_list.html.erb b/app/views/layouts/_user_homework_list.html.erb
index 446222bd3..12f37e04d 100644
--- a/app/views/layouts/_user_homework_list.html.erb
+++ b/app/views/layouts/_user_homework_list.html.erb
@@ -1,12 +1,5 @@
 <% if course %>
     <li id="homework_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%=course.name%>" onmouseover="homeworkSlipMenuOver(<%= course.id%>);" onmouseout="homeworkSlipMenuOut(<%= course.id%>);">
       <%= link_to course.name, course_path(course.id, host: Setting.host_course) %>
-      <ul class="homework_sub_menu" id="homework_loggedas_ul_<%= course.id%>" style="top:<%= course_index * 28.1%>px;">
-        <% course.homework_for_courses.map(&:bid).each do |bid| %>
-            <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=bid.name%>">
-              <%= link_to bid.name,  course_for_bid_path(bid, host: Setting.host_course), :target => "_blank" %>
-            </li>
-        <% end %>
-      </ul>
     </li>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/_user_project_list.html.erb b/app/views/layouts/_user_project_list.html.erb
index f7cf841f8..e38f9c4bd 100644
--- a/app/views/layouts/_user_project_list.html.erb
+++ b/app/views/layouts/_user_project_list.html.erb
@@ -2,13 +2,11 @@
     <li id="project_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name} %>
       <ul class="project_sub_menu" style="top:<%= hasCourse ? 35 : 0 %>px;">
-        <% cache User.current.projects.count do%>
         <% User.current.projects.each do |project| %>
             <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>">
               <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
             </li>
         <% end %>
-        <% end %>
       </ul>
     </li>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 070a99d08..382bcf590 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', 'courses'%>
-  <%= javascript_include_tag "course","header" %>
+  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses'%>
+  <%= javascript_include_tag "course","header","attachments" %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
@@ -116,9 +116,9 @@
           <%= link_to "(#{course_activity_count @course})", course_path(@course), :class => "subnav_num c_orange"%>
         </div>
         <div class="subNav">
-          <%= link_to l(:label_homework), homework_course_path(@course), :class => "f14 c_blue02"%>
-          <%= link_to "(#{@course.homeworks.count})", homework_course_path(@course), :class => "subnav_num c_orange"%>
-          <%= link_to( "+#{l(:label_course_homework_new)}", new_homework_course_path(@course), :class => 'subnav_green c_white') if is_teacher %>
+          <%= 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 %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>
diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index 7877782f6..a0267b9ec 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -36,8 +36,13 @@
               <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
               <br />
               <div class="cl mb5"></div>
-              <div  id="news_description_<%= news.id %>" class="news_description mt5">
-                <%= news.description.html_safe %>
+              <script>
+                  $(function(){if($("#news_description_<%= news.id%>_content").height()>360){$("#news_foot_<%= news.id%>").show();}});
+              </script>
+              <div  id="news_description_<%= news.id%>" class="news_description mt5">
+                <div id="news_description_<%= news.id%>_content" class="upload_img">
+                  <%= news.description.html_safe %>
+                </div>
               </div>
               <div class="news_foot c_red"  style="cursor:pointer;display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>">
                 <%= l(:button_more)%>...
diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index 89405b8ab..6fab364b5 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -3,10 +3,10 @@
 <% end %>
 
 <div class="resource_sum" id="IE_resource_sum_css">
-<% @attach_array.each do |k|%>
+<% @attach_array.each_with_index do |k, index|%>
 	<div class="line_block" >
 		<p>
-			<%= @str_arr.shift %>
+			<%= @str_arr[index] %>
 		</p>
 
 		<div class="table1">
@@ -24,7 +24,7 @@
 		</div>
 
 		<div class="table1">
-          <% if @str_arr.shift == @str_arr[2]%>
+          <% if index == 2%>
 		<% k.each do |c1|%>
 			<div class="table_row1 <%= cycle 'odd', 'even' %>">
 				<div class="filename table_cell1 filename1" >
@@ -94,4 +94,4 @@
         }
 	});
 </script>
-<% html_title(l(:label_stores_index)) -%>
\ No newline at end of file
+<% html_title(l(:label_stores_index)) -%>
diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb
new file mode 100644
index 000000000..bdfcff6e1
--- /dev/null
+++ b/app/views/student_work/_add_score.html.erb
@@ -0,0 +1,22 @@
+<%= form_for('new_form', :remote => true, :method => :post,:url => add_score_student_work_path(work.id)) do |f|%>
+    <li >
+      <span class="tit_fb"> 评价：</span>
+      <%= f.text_area 'user_message', :class => 'hwork_ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <span class="tit_fb mt2"> 评分：</span>
+      <input type="number" name="score" id="score_<%= work.id%>" value="<%= score.nil? ? 60 : score.score%>" min="0" max="100" size="4" data-units="dollars" />
+      <span class=" ml5">分</span>
+      <div class="cl"></div></li>
+    <li >
+      <% if @is_teacher%> <!-- 老师才可以上传批阅结果 -->
+          <span class="tit_fb"> 批阅结果：</span>
+          <div>
+            <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
+          </div>
+      <%end%>
+      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();">提交</a>
+      <div class="cl"></div>
+    </li>
+<% end%>
\ No newline at end of file
diff --git a/app/views/student_work/_add_score_reply.html.erb b/app/views/student_work/_add_score_reply.html.erb
new file mode 100644
index 000000000..2866b2da6
--- /dev/null
+++ b/app/views/student_work/_add_score_reply.html.erb
@@ -0,0 +1,4 @@
+<%= form_for('', :remote => true, :method => :post,:url => add_score_reply_student_work_index_path(:score_id => score.id)) do |f|%>
+    <%= f.text_area 'message', :class => 'ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
+    <a href="javascript:void(0);" class="fr blue_n_btn" onclick="$('#add_score_reply_<%= score.id%>').find('form').submit();">回复</a>
+<% end%>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
new file mode 100644
index 000000000..5a339dc03
--- /dev/null
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -0,0 +1,26 @@
+<!-- 匿评作品列表，显示某一个作品的信息 -->
+<ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
+  <% is_my_work = student_work.user == User.current%>
+  <li class="hwork_num">
+    <% if is_my_work%>
+     <span>
+        <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+     </span>
+    <% end%>
+  </li>
+  <li class="hwork_name">
+    <% if is_my_work%>
+        <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name %>
+    <% else%>
+        <%= link_to "匿名","javascript:void(0)"%>
+    <% end%>
+  </li>
+  <li class=" hwork_tit_e" style="width: 410px">
+    <%= link_to student_work.name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
+  </li>
+  <% my_score = student_work_score(student_work,User.current) %>
+  <li class=" hwork_code <%= my_score.nil? ? 'c_grey' : 'c_red'%>">
+    <%= my_score.nil? ? "--" : format("%.2f",my_score.score)%>
+  </li>
+  <div class="cl"></div>
+</ul><!---hwork_ul end-->
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_work_title.html.erb b/app/views/student_work/_evaluation_work_title.html.erb
new file mode 100644
index 000000000..0be6228bb
--- /dev/null
+++ b/app/views/student_work/_evaluation_work_title.html.erb
@@ -0,0 +1,12 @@
+<li class="hwork_num ">
+  <span class="f14 f_b c_dark fl ">学号</span>
+</li>
+<li class="hwork_name f14 fb c_dark">
+  <span class="c_dark f14 fb fl ">学生姓名</span>
+</li>
+<li class="hwork_tit_e">
+  <span class="c_dark f14 fb fl">作品名称</span>
+</li>
+<li class="w70 mr5" >
+  <%= link_to "我的评分","javascript:void(0)",:class => "c_dark f14 fb fl"%>
+</li>
\ No newline at end of file
diff --git a/app/views/student_work/_jour_replay.html.erb b/app/views/student_work/_jour_replay.html.erb
new file mode 100644
index 000000000..77fb476bf
--- /dev/null
+++ b/app/views/student_work/_jour_replay.html.erb
@@ -0,0 +1,20 @@
+<div class="ping_back  mt10" id="jour_replay_<%= jour.id%>">
+  <%= link_to image_tag(url_to_avatar(jour.user), :width => "32", :height => "32"), user_path(jour.user),:class => "st_img fl" %>
+  <div class="ping_back_tit">
+    <a href="javascript:void(0);" class="c_blue fl" >
+      <%= link_to jour.user.show_name, user_path(jour.user), :title => jour.user.show_name, :class => "c_blue fl" %>
+    </a>
+    <% if jour.user==User.current || User.current.admin? %>
+        <%= link_to(l(:label_bid_respond_delete), destroy_score_reply_student_work_index_path(:jour_id => jour.id),
+                    :remote => true, :confirm => l(:text_are_you_sure),  :title => l(:button_delete), :class => "fr c_purple")  %>
+    <% end %>
+    <span class=" fr c_grey mr10">
+        <%=format_time jour.created_on %>
+      </span>
+    <div class="cl mb5"></div>
+    <p class="break_word">
+      <%= jour.notes%>
+    </p>
+  </div><!---ping_box_tit end--->
+  <div class="cl"></div>
+</div><!---ping_back end--->
\ No newline at end of file
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
new file mode 100644
index 000000000..4e9f337c0
--- /dev/null
+++ b/app/views/student_work/_show.html.erb
@@ -0,0 +1,72 @@
+<div class="show_hwork_arrow"></div>
+<div class="show_hwork">
+<ul>
+  <li class="fl">
+    <span class="tit_fb">上交时间：</span>
+    <%=format_time @work.created_at %>
+  </li>
+
+  <% if !@is_teacher && @work.user == User.current && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1) %>
+      <!-- 我的作业 && (非匿评作业 || 为开启匿评)，显示编辑和删除按钮 -->
+      <li class="fr" >
+        <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
+      </li>
+      <li class="fr" >
+        <%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
+      </li>
+  <% end%>
+  <% if (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3) && @work.user != User.current%>
+      <!-- 普通作业或者编程作业，或者是匿评结束阶段，显示点赞按钮 -->
+      <li class="fr" id="student_work_praise_<%= @work.id%>">
+        <%= render :partial => 'student_work_praise' %>
+      </li>
+  <% end%>
+  <div class="cl"></div>
+
+  <!--<li >-->
+    <!--<span class="tit_fb"> 参与人员：</span>-->
+    <!--程梦雯&nbsp;&nbsp;王强-->
+  <!--</li>-->
+  <% if @work.project%>
+      <li >
+        <span class="tit_fb"> 关联项目：</span>
+        <%= link_to( @work.project.name, project_path(@work.project.id), :class => "c_blue02" )%>
+      </li>
+  <% end%>
+  <li >
+    <span class="tit_fb ">内容：</span>
+    <div class="show_hwork_p break_word">
+      <%= textilizable @work.description%>
+    </div>
+    <div class="cl"></div>
+  </li>
+  <li >
+    <span class="tit_fb"> 附件：</span>
+    <% if @work.attachments.empty?%>
+        <span style="color: #999999">尚未提交附件</span>
+    <% else%>
+        <div class="fl">
+          <%= render :partial => 'work_attachments', :locals => {:attachments => @work.attachments} %>
+        </div>
+    <% end%>
+  </li>
+  <div class="cl"></div>
+
+  <% if @is_teacher || (@homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
+      <!-- 老师 || 匿评作业 && 开启匿评状态 && 不是当前用户自己的作品 -->
+      <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
+        <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
+      </div>
+  <% end%>
+</ul>
+
+<div class="ping_box mt10" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+  <%@work.student_works_scores.order("created_at desc").each do |score|%>
+      <div id="work_score_<%= score.id%>">
+        <%= render :partial => 'student_work_score',:locals => {:score => score}%>
+      </div>
+  <% end%>
+</div><!---ping_box end--->
+<a href="javascript:void(0);" class="fr c_blue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
+<div class="cl"></div>
+</div><!---show_hwork end--->
\ No newline at end of file
diff --git a/app/views/student_work/_student_work.html.erb b/app/views/student_work/_student_work.html.erb
new file mode 100644
index 000000000..e8fb2ce3a
--- /dev/null
+++ b/app/views/student_work/_student_work.html.erb
@@ -0,0 +1,38 @@
+<!-- 作品列表，显示某一个作品的信息 -->
+<ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
+  <li class="hwork_num">
+    <span>
+      <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+    </span>
+  </li>
+  <li class=" hwork_name ">
+    <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name%>
+  </li>
+  <li class=" hwork_tit">
+    <%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
+  </li>
+  <li class=" hwork_code <%= student_work.teacher_score.nil? ? 'c_grey' : 'c_red'%> mr18">
+    <%= student_work.teacher_score.nil? ? "--" : format("%.2f",student_work.teacher_score)%>
+  </li>
+  <li class=" hwork_code <%= student_work.teaching_asistant_score.nil? ? 'c_grey' : 'c_red'%> mr18">
+    <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.2f",student_work.teaching_asistant_score)%>
+  </li>
+  <li class=" hwork_code02 <%= student_work.student_score.nil? ? 'c_grey' : 'c_red'%> mr18 student_score_info" >
+    <%= student_work.student_score.nil? ? "--" : format("%.2f",student_work.student_score)%>
+    <% unless student_work.student_score.nil?%>
+        <span class="c_blue">
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
+        </span>
+        <div class="info_ni">
+          现共有
+          <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>&nbsp;</span>
+          名学生进行了匿评，平均分为
+          <span class="c_red">&nbsp;<%= format("%.2f",student_work.student_score)%>&nbsp;</span>分。
+        </div>
+    <% end%>
+  </li>
+  <li class=" hwork_code <%= student_work.final_score.nil? ? 'c_grey' : 'c_red'%>">
+    <%= student_work.final_score.nil? ? "--" : format("%.2f",student_work.final_score)%>
+  </li>
+  <div class="cl"></div>
+</ul><!---hwork_ul end-->
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_attachment_form.html.erb b/app/views/student_work/_student_work_attachment_form.html.erb
new file mode 100644
index 000000000..7802f6eb6
--- /dev/null
+++ b/app/views/student_work/_student_work_attachment_form.html.erb
@@ -0,0 +1,35 @@
+<div class="fl">
+  <span id="attachments_fields<%= work.id%>" xmlns="http://www.w3.org/1999/html">
+  </span>
+  <div class="cl"></div>
+  <span class="add_attachment" style="font-weight:normal;">
+    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => "_file#{work.id}",
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => "addInputFiles_board(this, '#{work.id}');",
+                       :style => 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all),
+                               :containerid => "#{work.id}"
+                       } %>
+    <span id="upload_file_count<%= work.id%>">
+      <%= l(:label_no_file_uploaded) %>
+    </span>
+    (<%= l(:label_max_size) %>:
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+  </span>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
diff --git a/app/views/student_work/_student_work_praise.html.erb b/app/views/student_work/_student_work_praise.html.erb
new file mode 100644
index 000000000..f03bbdcc1
--- /dev/null
+++ b/app/views/student_work/_student_work_praise.html.erb
@@ -0,0 +1,5 @@
+<% if is_praise_homework User.current.id,@work.id  %>
+    <%= link_to "赞(#{praise_homework_count @work.id})",praise_student_work_student_work_path(@work), :remote => true,:class => 'orange_btn', :style => 'font-size:12px;'%>
+<% else %>
+    <%= link_to "赞(#{praise_homework_count @work.id})","javascript:void(0)",:class => 'grey_btn', :style => 'font-size:12px;'%>
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_score.html.erb b/app/views/student_work/_student_work_score.html.erb
new file mode 100644
index 000000000..c6ff0adae
--- /dev/null
+++ b/app/views/student_work/_student_work_score.html.erb
@@ -0,0 +1,32 @@
+<ul class="ping_box_ul ping_line">
+  <% show_real_name = @is_teacher || score.user == User.current || score.user.allowed_to?(:as_teacher,@course) %>
+  <%= link_to image_tag(url_to_avatar(show_real_name ? score.user : ""), :width => "34", :height => "34"), show_real_name ? user_path(score.user) : "javascript:void(0)",:class => "ping_pic fl" %>
+  <div class="ping_box_tit">
+    <%= link_to show_real_name ? score.user.show_name : "匿名", show_real_name ? user_path(score.user) : "javascript:void(0)", :title => show_real_name ? score.user.show_name : "匿评用户", :class => "c_blue fl" %>
+    <span class="ml5 fl">（<%= student_work_score_role score%>）</span>
+    <span class="ml20 fl">评分：</span>
+    <a href="javascript:void(0);" class="c_orange fl" ><%= score.score%>分</a>
+    <a href="javascript:void(0);" class="fr c_purple mr5" onclick="$('#add_score_reply_<%= score.id%>').slideToggle();">回复</a>
+          <span class=" fr c_grey mr20">
+            <%=format_time score.created_at %>
+          </span>
+    <div class="cl mb5"></div>
+    <p class="break_word">
+      <%= score.comment%>
+    </p>
+    <div class="cl"></div>
+    <%= render :partial => 'work_attachments', :locals => {:attachments => score.attachments} %>
+    <div class="cl"></div>
+    <div id="add_score_reply_<%= score.id%>" class="undis">
+      <%= render :partial => 'add_score_reply',:locals => {:score => score}%>
+    </div>
+    <div class="cl"></div>
+
+    <div id="replay_histroy_<%= score.id%>">
+      <% score.journals_for_messages.order("created_on desc").each do |jour|%>
+          <%= render :partial => 'jour_replay',:locals => {:jour => jour}%>
+      <% end%>
+    </div>
+  </div>
+  <div class="cl"></div>
+</ul>
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb
new file mode 100644
index 000000000..8162ea971
--- /dev/null
+++ b/app/views/student_work/_student_work_title.html.erb
@@ -0,0 +1,33 @@
+<li class="hwork_num ">
+  <a href="javascript:void(0);" class=" f14 f_b c_dark fl" >学号</a>
+</li>
+<li class=" hwork_name f14 fb c_dark">
+  学生姓名
+</li>
+<li class="hwork_tit">
+  <span class="c_dark f14 fb fl">作品名称</span>
+</li>
+<li class="mr5 w70">
+  <%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl hwork_code"%>
+  <% if @show_all && @order == "teacher_score"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
+</li>
+<li class="mr5 w70">
+  <%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl hwork_code"%>
+  <% if @show_all && @order == "teaching_asistant_score"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
+</li>
+<li class="mr5 ml15 w40">
+  <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
+  <% if @show_all && @order == "student_score"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
+</li>
+<li class="ml30">
+  <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "final_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
+  <% if @show_all && @order == "final_score"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
+</li>
\ No newline at end of file
diff --git a/app/views/student_work/_work_attachments.html.erb b/app/views/student_work/_work_attachments.html.erb
new file mode 100644
index 000000000..f303897bc
--- /dev/null
+++ b/app/views/student_work/_work_attachments.html.erb
@@ -0,0 +1,8 @@
+<% attachments.each_with_index do |attachment,i| %>
+    <div id="attachment_<%= attachment.id%>">
+      <%= link_to_short_attachment attachment, :class => 'link_file', :download => true -%>
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author %>
+      <span class="ml5">(<%= number_to_human_size attachment.filesize %>)</span>
+      <div class="cl"></div>
+    </div>
+<% end -%>
diff --git a/app/views/student_work/add_score.js.erb b/app/views/student_work/add_score.js.erb
new file mode 100644
index 000000000..5e6c4fe6d
--- /dev/null
+++ b/app/views/student_work/add_score.js.erb
@@ -0,0 +1,29 @@
+$("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'add_score',:locals => {:work => @work,:score => @score}) %>");
+$('#score_<%= @work.id%>').peSlider({range: 'min'});
+
+<% if @is_new%>
+    $("#score_list_<%= @work.id%>").prepend("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
+<% else %>
+    $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
+<% end%>
+$("#score_list_<%= @work.id%>").removeAttr("style");
+
+<% if @is_teacher %>
+    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'student_work',:locals => {:student_work => @work}) %>");
+<% else %>
+    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work}) %>");
+<% end%>
+
+
+$(function(){
+    $(".student_score_info").bind("mouseover",function(e){
+        //alert($(this).html());
+        $(this).find("div").show();
+        $(this).find("div").css("top",e.pageY);
+        $(this).find("div").css("left",e.pageX);
+    });
+    $(".student_score_info").bind("mouseout",function(e){
+        //alert($(this).html());
+        $(this).find("div").hide();
+    });
+});
diff --git a/app/views/student_work/add_score_reply.js.erb b/app/views/student_work/add_score_reply.js.erb
new file mode 100644
index 000000000..2c6f1c9bf
--- /dev/null
+++ b/app/views/student_work/add_score_reply.js.erb
@@ -0,0 +1,6 @@
+$("#add_score_reply_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'add_score_reply', :locals => {:score => @score}) %>");
+<% if @status && @status == 1%>
+    $("#replay_histroy_<%= @score.id%>").prepend("<%= escape_javascript(render :partial => 'jour_replay', :locals => {:jour => @jour}) %>");
+<% else%>
+    alert("回复内容不能为空");
+<% end%>
\ No newline at end of file
diff --git a/app/views/student_work/destroy_score_reply.js.erb b/app/views/student_work/destroy_score_reply.js.erb
new file mode 100644
index 000000000..895e501bf
--- /dev/null
+++ b/app/views/student_work/destroy_score_reply.js.erb
@@ -0,0 +1 @@
+$("#jour_replay_<%= @jour.id%>").remove();
\ No newline at end of file
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
new file mode 100644
index 000000000..f63c1792b
--- /dev/null
+++ b/app/views/student_work/edit.html.erb
@@ -0,0 +1,60 @@
+<div class="project_r_h">
+  <h2 class="project_h2">编辑作品</h2>
+</div>
+<div class="Newwork">
+  <!--<div id="tb_" class="hwork_tb_">-->
+    <!--<ul>-->
+      <!--<li id="tb_1" class="hwork_hovertab" onclick="x:HoverLi(1);" >-->
+        <!--课程名称课程名称课程名</li>-->
+      <!--<li id="tb_2" class="hwork_normaltab" onclick="i:HoverLi(2);">-->
+        <!--成员</li>-->
+    <!--</ul>-->
+  <!--</div>-->
+  <div class="hwork_ctt">
+    <div class="hwork_dis" id="tbc_01">
+      <%= labelled_form_for @work 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>
+
+        <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" 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"%>
+        <div class="cl"></div>
+        </p>
+      </div><!---创建作业内容结束-->
+      <% end%>
+
+    </div>
+  </div>
+</div>
+</div><!--新建作业结束-->
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
new file mode 100644
index 000000000..1cd665569
--- /dev/null
+++ b/app/views/student_work/index.html.erb
@@ -0,0 +1,125 @@
+<div class="project_r_h">
+  <div id="menu_r">
+    <ul class="menu_r">
+      <li><a href="javascript:void(0);" class="parent">作业批次</a>
+        <ul>
+          <% @homework_commons.each_with_index { |homework_common,index |%>
+              <li>
+                <%= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
+              </li>
+          <%}%>
+        </ul>
+      </li><!---level1 end--->
+    </ul><!---menu_r end--->
+  </div>
+</div><!--contentbox end-->
+
+<div class="to_top" id="goTopBtn" style="display: none;">
+  返<br/>回<br/>顶<br/>部
+</div>
+<div class="cl"></div>
+
+<div id="contentbox">
+  <div id="tb_" class="hwork_tb_">
+    <ul>
+      <li id="tb_1" class="hwork_hovertab"  onclick="course_setting(1)">全部作品</li>
+      <li id="tb_2" class="hwork_normaltab" onclick="course_setting(2)">作业信息</li>
+    </ul>
+  </div>
+<div class="cl"></div>
+
+<div class="ctt">
+  <div class="dis" id="tbc_01">
+    <div class="code_list">
+      <span class="fl mt3">
+        <%= link_to "所有作品(<span class='c_red'>#{@stundet_works.count}</span>)".html_safe,student_work_index_path(:homework => @homework.id), :class => "fl"%>
+      </span>
+      <% if @show_all%>
+        <input  type="text" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName($(this),'<%= student_work_index_path(:homework => @homework.id)%>',event);">
+        <a class="student_work_search fl" onclick="SearchByName($(this).prev(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
+      <% end%>
+      <% if @is_teacher%>
+          <div class="fr">
+            <% if @homework.student_works.empty?%>
+                <%= link_to "附件", "javascript:void(0)", class: "down_btn fr", :onclick => "alert('没有学生提交作业，无法下载附件')" %>
+            <% else%>
+                <%= link_to "附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json),
+                            remote: true, class: "down_btn fr", :id => "download_homework_attachments" %>
+            <% end%>
+
+            <%= link_to l(:label_list), student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'down_btn fr'%>
+            <span class="mt3 fr " style="color:#136b3b;">导出全部：</span>
+          </div>
+      <% end%>
+      <div class="cl"></div>
+    </div><!---code_list end--->
+    <ul class="hwork_ul">
+      <% if @is_evaluation.nil?%>
+          <%= render :partial => 'student_work_title'%>
+      <% else%>
+          <%= render :partial => 'evaluation_work_title'%>
+      <% end%>
+    </ul><!---hwork_ul end-->
+    <div class="cl"></div>
+
+    <% @stundet_works.each do |student_work|%>
+        <%= render :partial => (@is_evaluation ? 'evaluation_work' :'student_work'),:locals => {:student_work => student_work}%>
+        <div id="about_hwork_<%= student_work.id%>" ></div>
+    <% end%>
+
+    <div class="cl"></div>
+  </div><!---tbc_01 end-->
+
+  <div class="undis" id="tbc_02">
+    <div class="problem_main mt10">
+      <%= link_to(image_tag(url_to_avatar(@homework.user), :width => "42", :height => "42"), user_path(@homework.user), :class => "problem_pic fl") %>
+      <div class="problem_txt fl mt5">
+        <h4 class="r_txt_tit mb5">
+            <%= @homework.name%>
+        </h4>
+        <% if @is_teacher%>
+            <%= homework_anonymous_comment(@homework)%>
+            <%= link_to(l(:button_edit),edit_homework_common_path(@homework), :class => "fr mr10 work_edit") %>
+        <% else%>
+            <%= student_anonymous_comment @homework %>
+            <%= student_new_homework @homework %>
+        <% end %>
+
+        <div class="cl"></div>
+        <div  id="bid_description_<%= @homework.id%>" class="mt5 upload_img">
+          <%= @homework.description.html_safe %>
+        </div>
+
+        <div class="cl"></div>
+        <div class="mt5">
+          <% unless @homework.attachments.empty?%>
+              <span class="tit_fb"  style="width: auto;"> 附件：</span>
+              <div class="fl mb5">
+                <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => @homework.attachments} %>
+              </div>
+          <% end%>
+        </div>
+
+        <div class="cl"></div>
+        <span class="fl">截止时间：<%= @homework.end_time%></span>
+        <div >
+          <% if betweentime(@homework.end_time) < 0 %>
+            <span class='fr mr10 c_red '>
+              <%= l(:label_commit_limit)%>
+            </span>
+          <% else %>
+              <script type="text/javascript">
+                  window.setInterval(function(){show_bid_dead_line(<%= @homework.end_time.year%>,<%= @homework.end_time.month%>,<%= @homework.end_time.day + 1%>,"bid_deadline_<%= @homework.id%>");},1000)
+              </script>
+              <div id="bid_deadline_<%= @homework.id%>">
+              </div>
+          <% end %>
+        </div>
+      </div> <!--problem_txt end-->
+      <div class="cl"></div>
+    </div><!--problem_main end-->
+  </div><!---tbc_02 end-->
+
+
+</div><!--ctt end-->
+</div><!--contentbox end-->
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
new file mode 100644
index 000000000..7d685131f
--- /dev/null
+++ b/app/views/student_work/new.html.erb
@@ -0,0 +1,51 @@
+<div class="project_r_h">
+  <h2 class="project_h2">创建作品</h2>
+</div>
+<div class="Newwork">
+  <div class="hwork_ctt">
+    <div class="hwork_dis" id="tbc_01">
+      <%= form_for(@stundet_work,
+                   :html => { :multipart => true },
+                   :url => {:controller => 'student_work',
+                            :action => 'create',
+                            :homework => @homework.id
+                   }) do |f|%>
+          <div class="N_con">
+            <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();" %>
+              <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" >
+              <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;&nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+              <%= f.text_area "description", :class => "w620 hwork_txt ", :maxlength => 3000, :placeholder => "最多3000个汉字", :onkeyup => "regexStudentWorkDescription();"%>
+              <div class="cl"></div>
+              <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' %>
+            </p>
+            <div class="cl"></div>
+            <p class="ml80 ">
+              <a href="javascript:void(0)" class="blue_btn fl c_white" 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"%>
+            <div class="cl"></div>
+            </p>
+          </div><!---创建作业内容结束-->
+      <% end%>
+    </div>
+  </div>
+</div><!--新建作业结束-->
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/student_work/praise_student_work.js.erb b/app/views/student_work/praise_student_work.js.erb
new file mode 100644
index 000000000..c58eb5a2f
--- /dev/null
+++ b/app/views/student_work/praise_student_work.js.erb
@@ -0,0 +1 @@
+$('#student_work_praise_<%= @work.id%>').html('<%= escape_javascript(render :partial => 'student_work/student_work_praise')%>');
\ No newline at end of file
diff --git a/app/views/student_work/show.js.erb b/app/views/student_work/show.js.erb
new file mode 100644
index 000000000..fa12e097d
--- /dev/null
+++ b/app/views/student_work/show.js.erb
@@ -0,0 +1,7 @@
+if($("#about_hwork_<%= @work.id%>").children().length > 0)
+  {$("#about_hwork_<%= @work.id%>").html("");}
+else
+  {
+      $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show') %>");
+      $('#score_<%= @work.id%>').peSlider({range: 'min'});
+  }
\ No newline at end of file
diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb
index c63daf574..82b69ab63 100644
--- a/app/views/users/_course_form.html.erb
+++ b/app/views/users/_course_form.html.erb
@@ -27,7 +27,7 @@
                         <%= l(:label_homework) %>
                         (
                         <span class="">
-                            <%= link_to (membership.course.homeworks.count), {:controller => 'courses', :action => 'homework', :id => membership.course.id} %>
+                            <%= link_to (membership.course.homework_commons.count), homework_common_index_path(:course => membership.course.id) %>
                         </span>
                         )
                         &nbsp;&nbsp;
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 6083b547c..40122fba7 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -45,7 +45,7 @@
             <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %>
             <% act = e.act %>
             <% unless act.nil? %>
-                <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest' %>
+                <% if e.act_type == 'JournalsForMessage' || e.act_type == 'HomeworkCommon' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest' %>
 
                     <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
                     <tr>
@@ -119,52 +119,28 @@
                             <div style="display: inline-block; float: right; margin-top: 0px"></div>
                           </td>
                         </tr>
-                    <% when 'Bid' %>
+                    <% when 'HomeworkCommon' %>
                         <tr>
-                          <% if act.reward_type == 3 && @show_course == 1 %>
-                              <% if e.user == User.current %>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
-                                    </strong>
+                          <% if e.user == User.current %>
+                              <td colspan="2" valign="top">
+                                <strong>
+                                  <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
+                                </strong>
                                                     <span class="font_lighter">
                                                         <%= l(:label_i_new_activity) %>
                                                     </span>
-                                    <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
-                                  </td>
-                              <% else %>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to(h(e.user), user_path(e.user_id)) %>
-                                    </strong>&nbsp;
+                                <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), student_work_index_path(:homework => e.act_id) %>
+                              </td>
+                          <% else %>
+                              <td colspan="2" valign="top">
+                                <strong>
+                                  <%= link_to(h(e.user), user_path(e.user_id)) %>
+                                </strong>&nbsp;
                                                     <span class="font_lighter">
                                                         <%= l(:label_new_activity) %>
                                                     </span>&nbsp;
-                                    <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
-                                  </td>
-                              <% end %>
-                          <% else %>
-                              <% if e.user == User.current %>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
-                                    </strong>
-                                                    <span class="font_lighter">
-                                                      <%= l(:label_i_new_activity) %>
-                                                    </span>
-                                    <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
-                                  </td>
-                              <% else %>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to(h(e.user), user_path(e.user_id)) %>
-                                    </strong>&nbsp;
-                                                    <span class="font_lighter">
-                                                      <%= l(:label_new_activity) %>
-                                                    </span>&nbsp;
-                                    <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
-                                  </td>
-                              <% end %>
+                                <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), student_work_index_path(:homework => e.act_id) %>
+                              </td>
                           <% end %>
                         </tr>
                         <tr>
@@ -177,7 +153,7 @@
                           <td>
                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_at)).to_s %>
                                               </span>
                             </div>
                             <!--<div style="display: inline-block; float: right; margin-top: 0px">-->
diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb
index 111c0abb1..d51bcc8f7 100644
--- a/app/views/welcome/_course_list.html.erb
+++ b/app/views/welcome/_course_list.html.erb
@@ -25,7 +25,7 @@
             <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
         <% end %>
         (<%= course.members.count %>人)
-        <% files_count = course.attachments.count %>
+        <% files_count = visable_attachemnts_incourse(course).count %>
         <% if files_count > 0%>
             (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>公开资料)
         <% end %>
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 476471897..143c32dbe 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -140,9 +140,7 @@
               <%break if Time.new.strftime("%Y").to_i - year_now >= 2%>
               <% all_new_hot_course += find_all_new_hot_course(course_count-all_new_hot_course.count, @school_id, year_now, course_term)%>
           <% end%>
-          <% cache all_new_hot_course.max().created_at do %>
-             <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
-          <% end %>
+         <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
         </ul>
       </div>
   <% else %>
@@ -175,9 +173,7 @@
                   <%break if Time.new.strftime("%Y").to_i - year_now >= 2%>
                   <% all_new_hot_course += find_all_new_hot_course(9-(all_new_hot_course.count + cur_school_course.count), @school_id, year_now, course_term)%>
               <% end%>
-              <% cache all_new_hot_course.max().created_at do %>
-                <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
-              <% end %>
+            <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
           <% end %>
         </ul>
       </div>
@@ -195,7 +191,6 @@
   </h3>
   <span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
   <% topics = find_new_forum_topics(10) %>
-  <%# cache topics.maximum(:created_at) do%>
   <div class="d-p-projectlist-box">
     <ul class="d-p-projectlist">
 
@@ -233,8 +228,7 @@
 
     </ul>
   </div>
-  <%# end %>
 </div>
 <div class="clearfix"></div>
 
-<%= render partial: 'link_to_another' %>
\ No newline at end of file
+<%= render partial: 'link_to_another' %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 869df52a6..c03b0de76 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -68,7 +68,6 @@
 </div>
 
 <div style="clear:both"></div>
-<% cache :expire_in => 2.hours do%>
 <div id="J_Slide" class="d-p-index-box d-p-index-hot">
 	<h3 style="margin-left: 5px; color: #e8770d;"><strong> <%= l(:lable_hot_projects)%> </strong></h3>
 	<span style="margin-top: -20px;float: right; display: block;"> <% if User.current.logged? %>
@@ -113,7 +112,6 @@
 		</ul>
 	</div>
 </div>
-<% end %>
 <div class="right" style="float: right; width: 48%; padding-top: 8px;">
 	<ul class="welcome-message-list">
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
@@ -123,7 +121,6 @@
 		</div>
 		<div class="welcome-box-list-new memo_activity">
 			<% topics = find_new_forum_topics(12) %>
-            <% cache topics.maximum(:created_at) do%>
 		    <% topics.includes(:forum, :last_reply, :author).each do |topic|%>
                 <li class="message-brief-intro" style="line-height:1.4em;">
                     <div class='memo_title text_nowrap'>
@@ -153,10 +150,9 @@
                     </div>
                 </li>
               <% end %>
-            <% end %>
 		</div>
 	</ul>
 </div>
 
 <div class="clearfix"></div>
-<%= render partial: 'link_to_another' %>
\ No newline at end of file
+<%= render partial: 'link_to_another' %>
diff --git a/config/configuration.yml b/config/configuration.yml
index 45e307157..390754a87 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -90,7 +90,6 @@ default:
       user_name: "huang.jingquan@163.com"
       password: 'xinhu1ji2qu366'
 
-  cookie_domain: ".trustie.net"
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.
   # Your Redmine instance needs to have write permission on this
@@ -104,7 +103,7 @@ default:
   # autologin_cookie_name: the name of the cookie (default: autologin)
   # autologin_cookie_path: the cookie path (default: /)
   # autologin_cookie_secure: true sets the cookie secure flag (default: false)
-  autologin_cookie_name:
+  autologin_cookie_name: "autologin_trustie"
   autologin_cookie_path:
   autologin_cookie_secure:
 
@@ -201,7 +200,7 @@ default:
 # specific configuration options for production environment
 # that overrides the default ones
 production:
-  # CJK support
+  cookie_domain: ".trustie.net"
   rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
   email_delivery:
     delivery_method: :smtp
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 73a97c035..7653a0c4e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -12,7 +12,10 @@ zh:
   notice_account_wrong_password: 密码错误
   name_can_be_empty: 可以不填写真实姓名[保密所需]
   notice_successful_create: 创建成功
+  notice_failed_create: 创建失败
   notice_successful_update: 更新成功
+  notice_successful_edit: 修改成功
+  notice_failed_edit: 修改失败
   notice_successful_delete: 删除成功
   notice_failed_delete: 删除失败
   notice_successful_connection: 连接成功
@@ -109,7 +112,7 @@ zh:
   field_project: 项目
   field_issue: 问题
 
-  field_notes: 说明
+  field_notes: 内容
   field_is_closed: 已关闭的问题
   field_is_default: 默认值
 
@@ -881,7 +884,6 @@ zh:
   button_copy_and_follow: 复制并转到新问题
   button_annotate: 追溯
 
-  button_edit: 编辑
   button_configure: 配置
   button_quote: 引用
   button_duplicate: 副本
@@ -1224,7 +1226,7 @@ zh:
   no_attachmens_allowed: 提交作业不能为空
 
   button_bidding_homework: 参加竞标 #huang
-  field_homework_type: 提交形式    #bai
+  field_homework_type: ""    #bai
   label_homework_respond: 作业情况
 
   label_bid_me: 我要应标
@@ -1544,6 +1546,7 @@ zh:
   label_course_new_homework: 新建作业
   label_course_homework_list: 作业列表
   label_course_homework_new: 发布作业
+  label_course_homework_edit: 修改作业
   label_course_news_new: 发布通知
   label_fork_homework_new: 选为作业
   #wang
@@ -1800,7 +1803,9 @@ zh:
   excel_mail: 电子邮箱
   excel_homework_name: 作品名
   excel_t_score: 教师评分
+  excel_ta_score: 教辅评分
   excel_n_score: 匿名评分
+  excel_f_score: 成绩
   excel_commit_time: 提交时间
   excel_homework_score: 作业积分
   excel_class: "班级:"
diff --git a/config/routes.rb b/config/routes.rb
index 9a8e71156..e166e37e5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,9 +26,6 @@
 # Example: :via =>  :get ====> :via => :get
 
 RedmineApp::Application.routes.draw do
-
-  #match '/discuss_demos/new',:to => 'discuss_demo#create',:via =>[:post]
-  #match '/discuss_demo/show',:to => 'discuss_demo#show'
   mount Mobile::API => '/api'
 
   resources :homework_users
@@ -80,6 +77,28 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  resources :homework_common, :except => [:show]do
+    member do
+      get 'start_anonymous_comment'
+      get 'stop_anonymous_comment'
+      get 'alert_anonymous_comment'
+    end
+    collection do
+
+    end
+  end
+
+  resources :student_work do
+    member do
+      post 'add_score'
+      get 'praise_student_work'
+    end
+    collection do
+      post 'add_score_reply'
+      get 'destroy_score_reply'
+    end
+  end
+
   resources :contest_notification
 
   resources :open_source_projects do
@@ -110,6 +129,7 @@ RedmineApp::Application.routes.draw do
     match 'courselist'
     match 'zip'
     match 'mailer'
+    match 'view_office'
   end
   ##new added by linchun #以发布应用的形式参与竞赛
   resources :softapplications do
@@ -123,13 +143,6 @@ RedmineApp::Application.routes.draw do
     end
   end
 
-  #resources :notificationcomments do
-  #
-  #end
-
-  #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
-  # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
-  # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
     resources :contestnotifications do
@@ -172,13 +185,6 @@ RedmineApp::Application.routes.draw do
   match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
   match '/contestnotifications/preview', :to => 'previews#contestnotification', :as => 'preview_contestnotifications', :via => [:get, :post, :put]
 
-  #resource :previews, only: [] do
-  #  collection do
-  #    match 'news', :via => [:get, :post, :put]
-  #    match 'issue', :via => [:get, :post, :put]
-  #  end
-  #end
-
   resources :stores do
     collection do
       match 'search', :via =>  [:get, :post]
@@ -251,7 +257,7 @@ RedmineApp::Application.routes.draw do
   post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
   post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
   # boards end
-  delete 'bids/homework', :to => 'bids#homework_destroy'
+  # delete 'bids/homework', :to => 'bids#homework_destroy'
 
   # Misc issue routes. TODO: move into resources
   match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
@@ -283,7 +289,6 @@ RedmineApp::Application.routes.draw do
       match 'user_projects', :to => 'users#user_projects',  :via => :get
       match 'user_activities', :to => 'users#user_activities',  :via => :get, :as => "user_activities"
       match 'user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "user_newfeedback"
-      match 'watch_calls', :to => 'users#watch_bids', :via => [:get , :post]
       match 'info', :to => 'users#info', :via => [:get , :post], :as => 'user_info'
       match 'user_watchlist', :to => 'users#user_watchlist',  :via => :get, :as => "user_watchlist" #add by huang
       match 'user_fanslist', :to => 'users#user_fanslist',  :via => :get, :as => "user_fanslist" #add by huang
@@ -317,7 +322,6 @@ RedmineApp::Application.routes.draw do
   end
   match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
   match 'users/:id/user_projects', :to => 'users#user_projects',  :via => :get
-  #match 'user/:id/watch_calls', :controller => 'users', :action => 'watch_bids', :via => [:get , :post]
 
   #end
   match 'my/account',  :via => [:get, :post]
@@ -357,14 +361,6 @@ RedmineApp::Application.routes.draw do
   post 'appliedproject/applied', :to => 'applied_project#applied_join_project', :as => 'appliedproject'
   delete 'appliedproject/applied', :to => 'applied_project#unapplied_join_project'
 
-  resources :bids, :only=>[:edit,:update,:show] do
-    member do
-      match 'homework_ajax_modal'
-      get 'start_anonymous_comment', as: 'start_anonymous_comment'
-      get 'stop_anonymous_comment', as: 'stop_anonymous_comment'
-      get 'alert_anonymous_comment'
-    end
-  end
   resources :projects do
     member do
       match 'change_project_type', :via =>  [:get, :post]
@@ -380,9 +376,6 @@ RedmineApp::Application.routes.draw do
       get 'invite_members_by_mail', :action=> 'invite_members_by_mail'
       get 'send_mail_to_member', :action => 'send_mail_to_member'
       match 'user_watcherlist', :to => 'projects#watcherlist',  :via => :get, :as => "watcherlist" #add by huang
-      get 'homework', :action => 'homework', :as => 'homework'
-      get 'new_homework', :action => 'new_homework', :as => 'new_homework'
-      #get 'news', :action => 'news', :as => 'news'
       #end
       post 'modules'
       post 'archive'
@@ -400,19 +393,7 @@ RedmineApp::Application.routes.draw do
     match '/member', :to => 'projects#member',  :as => 'member', :via => :get
     match '/file', :to => 'projects#file',  :as => 'file', :via => :get
     match '/statistics', :to => 'projects#statistics',  :as => 'statistics', :via => :get
-    #   match '/investor', :controller => 'projects', :action => 'investor',  :as => 'investor', :via => :get
-    match '/homework', :to => 'projects#homework', :as => 'homework', :via => :get
-    
-    #   match '/activity', :controller => 'activities', :action => 'index',  :as => 'activity', :via => :get
-    #   match '/repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository', :via => :get
-    #   match '/', :controller => 'projects', :action => 'show', :as => 'project_show', :via => :get
-    #   get 'projects/:project_id/show', :to => 'projects#show', :as => 'project_show'
-    #   get 'projects/:project_id/repository', :to => 'repositories#show', :as => 'project_repository'
-
-    #   match '/show', :controller => 'projects', :action => 'show',  :as => 'project_show', :via => :get
     match '/watcherlist', :to=>'projects#watcherlist', :as => 'watcherlist', :via => :get  #add by huang
-    # matche '/news', :controller => 'news', :action => 'index', :as => 'news', :via => :get
-    #end
 
     resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
       collection do
@@ -683,8 +664,6 @@ RedmineApp::Application.routes.draw do
     member do
       get 'settings(/:tab)', :action => 'settings', :as => 'settings'
       get 'search_member', :action => 'search_member'
-      get 'homework', :action => 'homework', :as => 'homework'
-      get 'new_homework', :action => 'new_homework', :as => 'new_homework'
       get 'file', :action => 'file', :as => 'file'
       get 'feedback', :action => 'feedback', :as => 'course_feedback'
       get 'member', :controller => 'courses', :action => 'member', :as => 'member'
@@ -731,6 +710,12 @@ RedmineApp::Application.routes.draw do
     resources :news, :except => [:show, :edit, :update, :destroy]
     resources :boards
     match '/homework', :to => 'courses#homework', :as => 'homework', :via => :get
+    resources :activity_notifys do
+      collection do
+        match 'chang_read_flag', :via => :get
+      end
+     end
+
   end   # end of resources :courses
   match 'courses/:id/feedback', :to => 'courses#feedback',  :via => :get, :as => 'course_feedback'
   match '/courses/search',  :via => [:get, :post]
@@ -756,7 +741,6 @@ RedmineApp::Application.routes.draw do
   match 'delete_avatar', :to => 'avatar#delete_image',:via => :post
   # Endof Tao's code
   get 'robots.txt', :to => 'welcome#robots'
-  #match 'welcome/course', :to => 'welcome#course'
   ##############测试留言功能    fq
   post 'words/new', :to => 'words#new'
   post 'words/create', :to => 'words#create'
@@ -767,70 +751,21 @@ RedmineApp::Application.routes.draw do
   get 'words/more', :to => 'words#more'
   get 'words/back', :to=> 'words#back'
   get 'words/destroyJournal', :to => 'words#destroyJournal'
-  ############## fq
-  post 'calls/create', :to => 'bids#create'
-  delete 'calls/destroy', :to => 'bids#destroy'
-  match 'calls/new', :to => 'bids#new', :via => [:get , :post]
-  get 'calls/more', :to => 'bids#more'
-  get 'calls/back', :to=> 'bids#back'
-  match 'calls/new_bid', :to => 'bids#new_bid'
-  match 'contest/new_contest', :to => 'bids#new_contest' #huang
-  match 'calls/:id/show_project', :to => 'bids#show_project', :as => 'project_for_bid'
-  match 'calls/:id/show_course', :to => 'bids#show_courseEx', :as => 'course_for_bid'  # nwb added
-  match 'calls/:id/new_exercise_book', :to => 'homework_attach#new', :as => 'new_exercise_book'
-  match 'calls/:id/add', :to => 'bids#add'
-  match 'calls/:id/delete', :to => 'bids#delete'
-  match 'calls/:id/add_homework', :to => 'bids#add_homework', :via =>  :post
-  match 'calls/:id/new_submit_homework', :to => 'bids#new_submit_homework', :via =>  :get, :as => 'new_submit_homework'
   match 'words/add_project_respond', :to => 'words#add_project_respond'
   match 'words/:id/leave_project_message', :to => 'words#leave_project_message'
-
   match 'projects/:id/feedback', :to => 'projects#feedback',  :via => :get, :as => 'project_feedback'
-  match 'calls/create_bid', :to => 'bids#create_bid'
-  match 'contest/create_contest', :to => 'bids#create_contest' #huang
-  match 'calls/create_homework', :to => 'bids#create_homework'
-  match 'calls/:id/homework_respond', :to => 'bids#homework_respond'
-  match 'calls/:id/homework_statistics', :to => 'bids#homework_statistics'
-  match 'calls/:id/fork', :to => 'bids#fork', :as => 'fork'
-  match 'calls/:id/create_fork', :to => 'bids#create_fork'
-
-  match 'calls/:id/show_course', :to => 'bids#show_course', :as => 'show_course'
-  match 'calls/:id/show_bid_project', :to => 'bids#show_bid_project', :as => 'show_bid_project'
-  match 'calls/:id/show_bid_user', :to => 'bids#show_bid_user', :as => 'show_bid_user'
-
   match 'project/:id/share', :to => 'projects#share', :as => 'share_show' #share
 
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'
   post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
   delete 'join_in/join_group', :to => 'courses#unjoin_group'
-  post 'calls/:id/join_in_contest', :to => 'bids#join_in_contest', :as => 'join_in_contest'
-  delete 'calls/:id/join_in_contest', :to => 'bids#unjoin_in_contest'
-  match 'calls/:id/show_participator', :to => 'bids#show_participator'  # bai
-  match 'calls/:id/update_contest', :to => 'bids#update_contest'    # bai
-  match 'calls/:id/settings', :to => 'bids#settings'    # bai
 
   delete 'attachment/:id', :to => 'attachments#delete_homework'
   match 'new_join', :to => 'courses#new_join', :as => 'try_join'
   match 'new_join_group', :to => 'courses#new_join_group', :as => 'try_join_group'
-  match 'new_join_in_contest', :to => 'bids#new_join', :as => 'try_join_in_contest'
+  # match 'new_join_in_contest', :to => 'bids#new_join', :as => 'try_join_in_contest'
   match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post
-  match 'calls/:id/manage',:to => 'bids#manage',:via => [:get,:post]
-
-
-  #added by william
-  # match 'calls/:id/set_results',:controller => 'bids', :action => 'set_results',:via => [:get,:post],:as => 'set_results'
-  # match 'calls/:id/set_prizes',:controller => 'bids',:action => 'set_prizes',:as => 'set_prizes'
-  match 'calls/:id/set_reward',:to => 'bids#set_reward',:as => 'set_reward'
-
-  # added by young
-  match 'calls', :to => 'bids#index'
-
-  match 'calls/:id', :to => 'bids#show', :as => 'respond'
-  # modified by longjun
-  # bids#contests is not exist
-  # match 'contest', :to => 'bids#contests', :as => 'contest' #modified @20140403
-  # end longjun
 
   ########################
   ##added by wen##########
@@ -838,7 +773,6 @@ RedmineApp::Application.routes.draw do
   get 'welcome/search', to: 'welcome#search'
   get 'school/index', to: 'school#index'
   get 'school/:school_id', to: 'welcome#course', :as => 'school_course_list'
-  #get 'course/:school_id', to: 'welcome#course'
   post 'school/get_options/:province', :to => 'school#get_options'
   get 'school/get_options/:province', :to => 'school#get_options'
 
diff --git a/db/migrate/20150519012744_create_homework_commons.rb b/db/migrate/20150519012744_create_homework_commons.rb
new file mode 100644
index 000000000..eaf39bfa0
--- /dev/null
+++ b/db/migrate/20150519012744_create_homework_commons.rb
@@ -0,0 +1,20 @@
+class CreateHomeworkCommons < ActiveRecord::Migration
+  def up
+    create_table :homework_commons 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.timestamps
+    end
+  end
+
+  def down
+    drop_table :homework_commons
+  end
+end
diff --git a/db/migrate/20150519014600_create_homework_detail_manuals.rb b/db/migrate/20150519014600_create_homework_detail_manuals.rb
new file mode 100644
index 000000000..29548cab2
--- /dev/null
+++ b/db/migrate/20150519014600_create_homework_detail_manuals.rb
@@ -0,0 +1,19 @@
+class CreateHomeworkDetailManuals < ActiveRecord::Migration
+  def up
+    create_table :homework_detail_manuals 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.timestamps
+    end
+  end
+
+  def down
+    drop_table :homework_detail_manuals
+  end
+end
diff --git a/db/migrate/20150519014639_create_homework_detail_programings.rb b/db/migrate/20150519014639_create_homework_detail_programings.rb
new file mode 100644
index 000000000..707da164c
--- /dev/null
+++ b/db/migrate/20150519014639_create_homework_detail_programings.rb
@@ -0,0 +1,15 @@
+class CreateHomeworkDetailProgramings < ActiveRecord::Migration
+  def up
+    create_table :homework_detail_programings do |t|
+      t.string :language
+      t.text  :standard_code, :limit => 4294967295
+      t.integer :homework_common_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :homework_detail_programings
+  end
+end
diff --git a/db/migrate/20150519020031_create_homework_tests.rb b/db/migrate/20150519020031_create_homework_tests.rb
new file mode 100644
index 000000000..8106c51f5
--- /dev/null
+++ b/db/migrate/20150519020031_create_homework_tests.rb
@@ -0,0 +1,15 @@
+class CreateHomeworkTests < ActiveRecord::Migration
+  def up
+    create_table :homework_tests do |t|
+      t.text :input
+      t.text  :output
+      t.integer :homework_common_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :homework_tests
+  end
+end
diff --git a/db/migrate/20150519022200_create_student_works.rb b/db/migrate/20150519022200_create_student_works.rb
new file mode 100644
index 000000000..4ae0449e0
--- /dev/null
+++ b/db/migrate/20150519022200_create_student_works.rb
@@ -0,0 +1,21 @@
+class CreateStudentWorks < ActiveRecord::Migration
+  def up
+    create_table :student_works do |t|
+      t.string :name
+      t.text  :description
+      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.timestamps
+    end
+  end
+
+  def down
+    drop_table :student_works
+  end
+end
diff --git a/db/migrate/20150519023821_create_student_works_evaluation_distributions.rb b/db/migrate/20150519023821_create_student_works_evaluation_distributions.rb
new file mode 100644
index 000000000..a46b9f0f1
--- /dev/null
+++ b/db/migrate/20150519023821_create_student_works_evaluation_distributions.rb
@@ -0,0 +1,14 @@
+class CreateStudentWorksEvaluationDistributions < ActiveRecord::Migration
+  def up
+    create_table :student_works_evaluation_distributions do |t|
+      t.integer :student_work_id
+      t.integer  :user_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :student_works_evaluation_distributions
+  end
+end
diff --git a/db/migrate/20150519030544_create_student_works_scores.rb b/db/migrate/20150519030544_create_student_works_scores.rb
new file mode 100644
index 000000000..0c4721276
--- /dev/null
+++ b/db/migrate/20150519030544_create_student_works_scores.rb
@@ -0,0 +1,16 @@
+class CreateStudentWorksScores < ActiveRecord::Migration
+  def up
+    create_table :student_works_scores do |t|
+      t.integer :student_work_id
+      t.integer :user_id
+      t.integer :score
+      t.text :comment
+      t.integer :reviewer_role
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :student_works_scores
+  end
+end
diff --git a/db/migrate/20150601032112_about_homework.rb b/db/migrate/20150601032112_about_homework.rb
new file mode 100644
index 000000000..fe3ca1c12
--- /dev/null
+++ b/db/migrate/20150601032112_about_homework.rb
@@ -0,0 +1,126 @@
+#encoding=UTF-8
+class AboutHomework < ActiveRecord::Migration
+  def up
+    Bid.where("reward_type = 3").each do |bid|
+      transaction do
+        if bid.courses.first
+          # 作品基础属性
+          homework = HomeworkCommon.new
+          homework.name = bid.name
+          homework.description = bid.description
+          homework.user_id =  bid.author_id
+          homework.end_time = bid.deadline
+          homework.publish_time = bid.deadline
+          bid.open_anonymous_evaluation == 1 ? homework.homework_type = 1 : homework.homework_type = 0
+          homework.late_penalty = 0
+          homework.course_id = bid.courses.first.id
+          homework.created_at = bid.created_on
+          homework.updated_at = bid.updated_on
+          homework.save
+
+          #个人动态
+          bid.acts.each do |act|
+            act.act_type = homework.class.to_s
+            act.act_id = homework.id
+            act.save
+          end
+
+          #作业附件
+          bid.attachments.each do |attach|
+            attach.container = homework
+            attach.save
+          end
+
+          # 匿评作业相关属性
+          homework_detail_manual = HomeworkDetailManual.new
+          homework_detail_manual.ta_proportion = 0.6
+          homework_detail_manual.comment_status = bid.comment_status + 1
+          homework_detail_manual.evaluation_start = bid.created_on
+          homework_detail_manual.evaluation_end = bid.created_on
+          homework_detail_manual.evaluation_num = bid.evaluation_num
+          homework_detail_manual.absence_penalty = 0
+          homework_detail_manual.homework_common = homework
+          homework_detail_manual.save
+
+          #作品列表
+          bid.homeworks.each do |homework_attach|
+            student_work = StudentWork.new
+            student_work.name = homework_attach.name
+            student_work.description = homework_attach.description
+            student_work.user_id = homework_attach.user_id
+            student_work.project_id = homework_attach.project_id
+            student_work.homework_common = homework
+            student_work.save
+
+            #作品文件
+            homework_attach.attachments.each do |attach|
+              attach.container = student_work
+              attach.save
+            end
+
+            #作品匿评列表
+            homework_attach.homework_evaluations.each do |homework_evaluation|
+              student_work_evaluation = StudentWorksEvaluationDistribution.new
+              student_work_evaluation.user_id = homework_evaluation.user_id
+              student_work_evaluation.student_work = student_work
+              student_work_evaluation.save
+            end
+
+            #评分评论相关
+            stars_reates = homework_attach.rates(:quality)
+            if stars_reates
+              stars_reates.each do |reate|
+                student_work_score = StudentWorksScore.new
+                student_work_score.user_id = reate.rater_id
+                student_work_score.score = reate.stars * 20
+                student_work_score.student_work = student_work
+                rater = User.find reate.rater_id
+                if rater
+                  member = rater.members.where("course_id = ?",bid.courses.first.id).first
+                  if member
+                    role =  member.roles.first.name
+                    case role
+                      when "Teacher"
+                        student_work_score.reviewer_role = 1
+                      when "Manager"
+                        student_work_score.reviewer_role = 1
+                      when "TeachingAsistant"
+                        student_work_score.reviewer_role = 2
+                      when "Student"
+                        student_work_score.reviewer_role = 3
+                    end
+                  else
+                    student_work_score.reviewer_role = 3
+                  end
+                else
+                  student_work_score.reviewer_role = 3
+                end
+
+                jour = homework_attach.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id = #{reate.rater_id}").order("created_on DESC").first
+                if jour
+                  student_work_score.comment = jour.notes
+                  student_work_score.save
+                  #老师反馈附件
+                  homework_attach.attachments.each do |attach|
+                    attach.container = student_work_score
+                    attach.save
+                  end
+                else
+                  student_work_score.save
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def down
+    HomeworkCommon.destroy_all
+    HomeworkDetailManual.destroy_all
+    StudentWork.destroy_all
+    StudentWorksScore.destroy_all
+    StudentWorksEvaluationDistribution.destroy_all
+  end
+end
diff --git a/db/migrate/20150602021020_add_score_to_work.rb b/db/migrate/20150602021020_add_score_to_work.rb
new file mode 100644
index 000000000..446a5a4f7
--- /dev/null
+++ b/db/migrate/20150602021020_add_score_to_work.rb
@@ -0,0 +1,60 @@
+class AddScoreToWork < ActiveRecord::Migration
+  require 'bigdecimal'
+
+  def up
+    count = StudentWork.all.count / 10 + 1
+    transaction do
+      for i in 1 ... count do i
+        StudentWork.page(i).per(10).each do |work|
+          teacher_score = work.student_works_scores.where(:reviewer_role => 1).order("created_at desc")
+          unless teacher_score.empty?
+            work.teacher_score = teacher_score.first.score
+          end
+
+          teaching_asistant_score = work.student_works_scores.where(:reviewer_role => 2)
+          unless teaching_asistant_score.empty?
+            work.teaching_asistant_score = teaching_asistant_score.average(:score).try(:round, 2).to_f
+          end
+
+          student_socre = work.student_works_scores.where(:reviewer_role => 3)
+          unless student_socre.empty?
+            work.student_score = student_socre.average(:score).try(:round, 2).to_f
+          end
+
+          if work.teacher_score.nil?
+            if work.teaching_asistant_score.nil? #教辅评分为空，最终评分为学生匿评
+              work.final_score = work.student_score
+            elsif work.student_score.nil? #学生匿评评分为空，最终评分为教辅评分
+              work.final_score = work.teaching_asistant_score
+            else #都不为空，按比例来
+              final_ta_score = BigDecimal.new("#{work.teaching_asistant_score}") * BigDecimal.new("0.6")
+              final_s_score = BigDecimal.new("#{work.student_score}") * BigDecimal.new('0.4')
+              final_score = final_ta_score + final_s_score
+              work.final_score = format("%.2f",final_score.to_f)
+            end
+          else #教师评分不为空，最终评分为教师评分
+            work.final_score = work.teacher_score
+          end
+          work.save
+        end
+      end
+    end
+
+
+  end
+
+  def down
+    count = StudentWork.all.count / 10 + 1
+    transaction do
+      for i in 1 ... count do i
+        StudentWork.page(i).per(10).each do |work|
+          work.teacher_score = nil
+          work.teaching_asistant_score = nil
+          work.student_score = nil
+          work.final_score = nil
+          work.save
+        end
+      end
+    end
+  end
+end
diff --git a/db/migrate/20150602055730_remove_bid_activity.rb b/db/migrate/20150602055730_remove_bid_activity.rb
new file mode 100644
index 000000000..759091118
--- /dev/null
+++ b/db/migrate/20150602055730_remove_bid_activity.rb
@@ -0,0 +1,7 @@
+class RemoveBidActivity < ActiveRecord::Migration
+  def change
+    Activity.where(:act_type => "Bid").each do |act|
+      act.destroy
+    end
+  end
+end
diff --git a/db/migrate/20150604153000_create_activity_notifies.rb b/db/migrate/20150604153000_create_activity_notifies.rb
new file mode 100644
index 000000000..ff9b78389
--- /dev/null
+++ b/db/migrate/20150604153000_create_activity_notifies.rb
@@ -0,0 +1,17 @@
+class CreateActivityNotifies < ActiveRecord::Migration
+  def change
+    create_table :activity_notifies 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", ["notify_to"], :name => "index_an_notify_to"
+    add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
+    add_index "activity_notifies", ["activity_container_id","activity_container_type"], :name => "index_an_activity_container_id"
+  end
+end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index f8d638a5f..68f00c1cd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,1469 +1,1569 @@
-# 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 => 20150514133640) 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
-  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 "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_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_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 "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 "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_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_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 "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 "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 "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 "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 "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_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"
-  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 "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 => 20150604153000) 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
+  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_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_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 "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 "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
+  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
+  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 "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 "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 "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_works", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    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
+  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_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"
+  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 "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
diff --git a/lib/tasks/office.rake b/lib/tasks/office.rake
new file mode 100644
index 000000000..3e4c0a286
--- /dev/null
+++ b/lib/tasks/office.rake
@@ -0,0 +1,20 @@
+namespace :office do
+  desc "conver any files to html"
+  task :conver => :environment do
+    all_count = Attachment.count
+    i = 0
+    Attachment.find_each do |a|
+      i += 1
+      puts "process [#{i}/#{all_count}] => id #{a.id}"
+      saved_path = File.join(Rails.root, "files", "convered_office")
+      unless Dir.exist?(saved_path)
+        Dir.mkdir(saved_path)
+      end
+      convered_file = File.join(saved_path, a.disk_filename + ".html")
+      office = Trustie::Utils::Office.new(a.diskfile)
+      if office.conver(convered_file)
+        puts "process ok: #{convered_file} "
+      end
+    end
+  end
+end
diff --git a/lib/trustie/utils/office.rb b/lib/trustie/utils/office.rb
new file mode 100644
index 000000000..1bc18cb84
--- /dev/null
+++ b/lib/trustie/utils/office.rb
@@ -0,0 +1,42 @@
+module Trustie
+  module Utils
+    class Office
+
+      def initialize(file)
+        @file = file
+      end
+
+      def office?
+        %w(doc docx ppt pptx xls xlsx pdf).any?{|word| @file.downcase.end_with?(word)}
+      end
+
+      def conver(saved_file, force=false)
+        if force || !File.exist?(saved_file)
+          if File.exist? @file
+            if office?
+              begin
+                resource = RestClient::Resource.new(
+                 'http://192.168.80.107/Any2HtmlHandler.ashx',
+                  :timeout => -1,
+                  :open_timeout => -1
+                )
+                req = resource.post :txtDes => File.new(@file, 'rb')
+                File.open(saved_file, "wb+") do |f|
+                  f.write(req.body)
+                end
+                return true
+              rescue =>e
+                puts e.message
+              end
+            end
+          else
+            puts "can't find file #{@file}"
+          end
+        end
+        false
+      end
+
+    end
+  end
+end
+
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index fbec91afb..d97f1cd2e 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -260,7 +260,7 @@ K.options = {
 	items : [ 'emoticons',
 		'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
 		'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'link',"more"
+		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media',"more"
 	],
 	noDisableItems : ['source', 'fullscreen'],
 	colorTable : [
diff --git a/public/assets/kindeditor/plugins/media/media.js b/public/assets/kindeditor/plugins/media/media.js
index 58034662a..6d0d3a387 100644
--- a/public/assets/kindeditor/plugins/media/media.js
+++ b/public/assets/kindeditor/plugins/media/media.js
@@ -9,9 +9,9 @@
 
 KindEditor.plugin('media', function(K) {
 	var self = this, name = 'media', lang = self.lang(name + '.'),
-		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowMediaUpload = K.undef(self.allowMediaUpload, false),
 		allowFileManager = K.undef(self.allowFileManager, false),
-		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, false),
 		extraParams = K.undef(self.extraFileUploadParams, {}),
 		filePostName = K.undef(self.filePostName, 'imgFile'),
 		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
@@ -22,10 +22,8 @@ KindEditor.plugin('media', function(K) {
 				//url
 				'<div class="ke-dialog-row">',
 				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
-				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
-				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:200px;" /> &nbsp;(<a href="http://www.youku.com/help/view/fid/4#q2">支持优酷的flash地址</a>)',
 				'<span class="ke-button-common ke-button-outer">',
-				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
 				'</span>',
 				'</div>',
 				//width
@@ -38,11 +36,6 @@ KindEditor.plugin('media', function(K) {
 				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
 				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
 				'</div>',
-				//autostart
-				'<div class="ke-dialog-row">',
-				'<label for="keAutostart">' + lang.autostart + '</label>',
-				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
-				'</div>',
 				'</div>'
 			].join('');
 			var dialog = self.createDialog({
@@ -72,14 +65,8 @@ KindEditor.plugin('media', function(K) {
 							heightBox[0].focus();
 							return;
 						}
-						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
-								src : url,
-								type : K.mediaType(url),
-								width : width,
-								height : height,
-								autostart : autostartBox[0].checked ? 'true' : 'false',
-								loop : 'true'
-							});
+
+						var html = '<embed src="'+url+'" allowFullScreen="true" quality="high" width="'+width+'" height="'+height+'" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>';
 						self.insertHtml(html).hideDialog().focus();
 					}
 				}
diff --git a/public/assets/kindeditor/plugins/media/media.old.js b/public/assets/kindeditor/plugins/media/media.old.js
new file mode 100644
index 000000000..58034662a
--- /dev/null
+++ b/public/assets/kindeditor/plugins/media/media.old.js
@@ -0,0 +1,170 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				//autostart
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
diff --git a/public/images/course/arrow.png b/public/images/course/arrow.png
new file mode 100644
index 000000000..2081ddf8d
Binary files /dev/null and b/public/images/course/arrow.png differ
diff --git a/public/images/course/arrow_up.jpg b/public/images/course/arrow_up.jpg
new file mode 100644
index 000000000..6bf285a19
Binary files /dev/null and b/public/images/course/arrow_up.jpg differ
diff --git a/public/images/new.png b/public/images/new.png
new file mode 100644
index 000000000..91d15f3b1
Binary files /dev/null and b/public/images/new.png differ
diff --git a/public/images/public_icon.png b/public/images/public_icon.png
index 68be31f5d..1fa463e4e 100644
Binary files a/public/images/public_icon.png and b/public/images/public_icon.png differ
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 828be910d..d9100b0bb 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -897,8 +897,31 @@ $(function(){
 
             }
         }
+    });
+    $('#download_homework_attachments').bind('ajax:complete', function (event, data, status, xhr) {
+        if(status == 'success'){
+            var res = JSON.parse(data.responseText);
+            if(res.length<1){
+                return;
+            }
+            if(res.length==1){
+                location.href = '/zipdown/download?file='+res[0].file;return;
+            }
+            document.getElementById('light').style.display='block';
+            $container = $('#light .upload_box_ul');
+            $container.empty();
+            for(var i = 0; i <res.length; ++i){
+                var des = '';
+                if(res.count > 1){
+                    des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载';
+                } else {
+                    des = '第'+res[i].index+'个学生的作品下载';
+                }
+                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="/zipdown/download?file='+res[i].file+'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
 
-    })
+            }
+        }
+    });
 });
 
 
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 972ee858f..0570ec437 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -1,158 +1,182 @@
 //配置课程信息
-function course_setting(id) {
+function course_setting(id)
+{
     //alert(id);
-    $('#tb_' + id).removeClass().addClass("hwork_hovertab");
-    $('#tbc_0' + id).removeClass().addClass("dis");
-    $('#tb_' + (3 - id)).removeClass().addClass("hwork_normaltab");
-    $('#tbc_0' + (3 - id)).removeClass().addClass("undis");
+    $('#tb_'+id).removeClass().addClass("hwork_hovertab");
+    $('#tbc_0'+id).removeClass().addClass("dis");
+    $('#tb_'+(3-id)).removeClass().addClass("hwork_normaltab");
+    $('#tbc_0'+(3-id)).removeClass().addClass("undis");
 }
 
-$(function() {
-    $("img").removeAttr("align");
+$(function(){
+   $("img").removeAttr("align");
 });
 
 ///////////////////////////////////////////////////////////////
 //添加分班
-function add_group(url, course_id) {
-        var group_name = $('#group_name').val();
-        $.get(
-            url, {
-                valid: "name",
-                value: group_name,
-                course_id: course_id
-            },
-            function(data) {
-                if (data.valid) {
-                    $("#add_group_name").submit();
-                } else {
-                    alert(data.message);
-                }
-            }
-        );
-    }
-    //修改分班:修改分班时得考虑什么都不改但是点击确定的情况
-
-function edit_group(id, url, course_id, group_id) {
-    var group_name = $('#' + id).val();
+function add_group(url,course_id) {
+    var group_name = $('#group_name').val();
     $.get(
-        url, {
+        url,
+        { valid: "name",
+        value: group_name,
+        course_id: course_id },
+        function (data) {
+            if (data.valid) {
+                $("#add_group_name").submit();
+            }
+            else
+            {
+                alert(data.message);
+            }
+        }
+    );
+}
+//修改分班:修改分班时得考虑什么都不改但是点击确定的情况
+function edit_group(id,url,course_id,group_id)
+{
+    var group_name = $('#'+id).val();
+    $.get(
+        url,
+        {
             valid: "name",
             value: group_name,
             course_id: course_id,
             group_id: group_id
         },
-        function(data) {
+        function (data) {
             if (data.valid) {
-                $("#update_group_" + group_id).submit();
-            } else {
+                $("#update_group_"+group_id).submit();
+            }
+            else
+            {
                 alert(data.message);
             }
         }
     );
 }
 
-function hidden_homework_score_form() {
-        hideModal($("#user_score"));
+function hidden_homework_score_form()
+{
+    hideModal($("#user_score"));
+}
+///////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////新建课程相关
+//验证课程名称
+function regex_course_name()
+{
+    var name = $.trim($("#course_name").val());
+    if(name.length == 0)
+    {
+        $("#course_name_notice").show();
+        return false;
     }
-    ///////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////新建课程相关
-    //验证课程名称
-
-function regex_course_name() {
-        var name = $.trim($("#course_name").val());
-        if (name.length == 0) {
-            $("#course_name_notice").show();
-            return false;
-        } else {
-            $("#course_name_notice").hide();
+    else
+    {
+        $("#course_name_notice").hide();
+        return true;
+    }
+}
+//验证课程学时
+function regex_course_class_period()
+{
+    var class_period = $.trim($("#class_period").val());
+    var regex = /^\d*$/;
+    if(class_period.length == 0)
+    {
+        $("#course_class_period_notice").html("学时总数不能为空");
+        $("#course_class_period_notice").show();
+        return false;
+    }
+    else if (regex.test(class_period)) {
+        if(parseInt(class_period) > 0)
+        {
+            $("#course_class_period_notice").html("");
+            $("#course_class_period_notice").hide();
             return true;
         }
-    }
-    //验证课程学时
-
-function regex_course_class_period() {
-        var class_period = $.trim($("#class_period").val());
-        var regex = /^\d*$/;
-        if (class_period.length == 0) {
-            $("#course_class_period_notice").html("学时总数不能为空");
-            $("#course_class_period_notice").show();
-            return false;
-        } else if (regex.test(class_period)) {
-            if (parseInt(class_period) > 0) {
-                $("#course_class_period_notice").html("");
-                $("#course_class_period_notice").hide();
-                return true;
-            } else {
-                $("#course_class_period_notice").html("学时总数必须大于0");
-                $("#course_class_period_notice").show();
-                return false;
-            }
-        } else {
-            $("#course_class_period_notice").html("学时总数必须为数字");
+        else
+        {
+            $("#course_class_period_notice").html("学时总数必须大于0");
             $("#course_class_period_notice").show();
             return false;
         }
     }
-    //验证密码
-
-function regex_course_password() {
-        var class_period = $.trim($("#course_course_password").val());
-        var regex = /^\w+$/;
-        if (class_period.length == 0) {
-            $("#course_course_password_notice").html("课程密码不能为空");
-            $("#course_course_password_notice").show();
-            return false;
-        } else if (regex.test(class_period)) {
-            $("#course_course_password_notice").html("");
-            $("#course_course_password_notice").hide();
-            return true;
-        } else {
-            $("#course_course_password_notice").html("课程密码有非法字符");
-            $("#course_course_password_notice").show();
-            return false;
-        }
+    else
+    {
+        $("#course_class_period_notice").html("学时总数必须为数字");
+        $("#course_class_period_notice").show();
+        return false;
     }
-    //提交新建课程
-
-function submit_new_course() {
-    if (regex_course_name() && regex_course_class_period() && regex_course_password()) {
+}
+//验证密码
+function regex_course_password()
+{
+    var class_period = $.trim($("#course_course_password").val());
+    var regex = /^\w+$/;
+    if(class_period.length == 0)
+    {
+        $("#course_course_password_notice").html("课程密码不能为空");
+        $("#course_course_password_notice").show();
+        return false;
+    }
+    else if (regex.test(class_period)) {
+        $("#course_course_password_notice").html("");
+        $("#course_course_password_notice").hide();
+        return true;
+    }
+    else
+    {
+        $("#course_course_password_notice").html("课程密码有非法字符");
+        $("#course_course_password_notice").show();
+        return false;
+    }
+}
+//提交新建课程
+function submit_new_course()
+{
+    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
+    {
         $("#new_course").submit();
     }
 }
 
-function submit_edit_course(id) {
-    if (regex_course_name() && regex_course_class_period() && regex_course_password()) {
-        $("#edit_course_" + id).submit();
+function submit_edit_course(id)
+{
+    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
+    {
+        $("#edit_course_"+id).submit();
     }
 }
 
 ///////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////课程讨论区
 function regexSubject(id) {
-    var subjectid = "#message_subject" + id;
+    var subjectid = "#message_subject" + id ;
     var content = $.trim($(subjectid).val());
     var message = "#subject_span" + id;
     if (content.length == 0) {
         $(message).text("主题不能为空");
         $(message).css('color', '#ff0000');
-        return false;
-    } else {
+        return  false;
+    }
+    else {
         $(message).text("填写正确");
         $(message).css('color', '#008000');
         return true;
     }
     return false;
 }
-
 function regexContent(id) {
     var contentid = "#message_content" + id;
-    var message = "#message_content_span" + id;
+    var message = "#message_content_span"+ id;
     var content = $.trim($(contentid).val());
     if (content.length == 0) {
         $(message).text("描述不能为空");
         $(message).css('color', '#ff0000');
-        return false;
-    } else {
+        return  false;
+    }
+    else {
         $(message).text("填写正确");
         $(message).css('color', '#008000');
         return true;
@@ -171,242 +195,318 @@ function submitProjectsBoard(id) {
 
 ///////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////// 课程通知
-function regexTitle() {
+function regexTitle()
+{
     var name = $("#news_title").val();
-    if (name.length == 0) {
+    if(name.length ==0)
+    {
         $("#title_notice_span").text("标题不能为空");
-        $("#title_notice_span").css('color', '#ff0000');
+        $("#title_notice_span").css('color','#ff0000');
         $("#news_title").focus();
         return false;
-    } else if (name.length <= 60) {
+    }
+    else if(name.length <= 60)
+    {
         $("#title_notice_span").text("填写正确");
-        $("#title_notice_span").css('color', '#008000');
+        $("#title_notice_span").css('color','#008000');
         return true;
-    } else {
+    }
+    else
+    {
         $("#title_notice_span").text("标题超过60个字符");
-        $("#title_notice_span").css('color', '#ff0000');
+        $("#title_notice_span").css('color','#ff0000');
         $("#news_title").focus();
         return false;
     }
 }
 
-function regexDescription() {
+function regexDescription()
+{
     var name = news_description_editor.html();
-    if (name.length == 0) {
+    if(name.length ==0)
+    {
         $("#description_notice_span").text("描述不能为空");
-        $("#description_notice_span").css('color', '#ff0000');
+        $("#description_notice_span").css('color','#ff0000');
         $("#description_notice_span").focus();
         return false;
-    } else if (name.length >= 6000) {
+    }
+    else if(name.length >=6000){
         $("#description_notice_span").text("描述最多3000个汉字(或6000个英文字符)");
-        $("#description_notice_span").css('color', '#ff0000');
+        $("#description_notice_span").css('color','#ff0000');
         $("#description_notice_span").focus();
         return false;
-    } else {
+    }
+    else
+    {
         $("#description_notice_span").text("填写正确");
-        $("#description_notice_span").css('color', '#008000');
+        $("#description_notice_span").css('color','#008000');
         return true;
     }
 }
 
-function submitNews() {
-    if (regexTitle() && regexDescription()) {
+function submitNews()
+{
+    if(regexTitle() && regexDescription())
+    {
         news_description_editor.sync();
         $("#news-form").submit();
     }
 }
 
-function submitFocus(obj) {
+function submitFocus(obj)
+{
     $(obj).focus();
 }
 
-function submitComment() {
+function submitComment()
+{
     comment_editor.sync();
     $("#add_comment_form").submit();
 }
 
 /////////////////////////////////////////////////课程讨论区
-function course_board_submit_message_replay() {
-    if (MessageReplayVevify()) {
-        message_content_editor.sync(); //提交内容之前要sync，不然服务器端取不到值
+function course_board_submit_message_replay()
+{
+    if(MessageReplayVevify())
+    {
+        message_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
         $("#message_form").submit();
     }
 }
 
-function course_board_canel_message_replay() {
+function course_board_canel_message_replay()
+{
     $("#reply").hide(200);
     $("#message_quote").html("");
 }
 
 function MessageReplayVevify() {
-        var content = message_content_editor.html(); //$.trim($("#message_content").val());
-        if (content.length == 0) {
-            $("#message_content_span").text("回复不能为空");
-            $("#message_content_span").css('color', '#ff0000');
-            return false;
-        } else {
-            $("#message_content_span").text("填写正确");
-            $("#message_content_span").css('color', '#008000');
-            return true;
-        }
+    var content = message_content_editor.html();//$.trim($("#message_content").val());
+    if (content.length == 0) {
+        $("#message_content_span").text("回复不能为空");
+        $("#message_content_span").css('color', '#ff0000');
+        return  false;
     }
-    //////////////////////////////////////////////////
+    else {
+        $("#message_content_span").text("填写正确");
+        $("#message_content_span").css('color', '#008000');
+        return true;
+    }
+}
+//////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////
 //验证搜索时输入名字
-function regexName(content) {
-        var name = $.trim($("#name").val());
-        if (name.length == 0) {
-            $("#project_name_span").text(content);
-            $("#project_name_span").css('color', '#ff0000');
-            $("#project_name_span").focus();
-            return false;
-        } else {
-            $("#project_name_span").text("");
-            return true;
-        }
+function regexName(content)
+{
+    var name = $.trim($("#name").val());
+    if(name.length == 0)
+    {
+        $("#project_name_span").text(content);
+        $("#project_name_span").css('color','#ff0000');
+        $("#project_name_span").focus();
+        return false;
     }
-    //提交搜索
-
-function submitSerch(content) {
-    if (regexName(content)) {
-        $("#course_search_form").submit();
+    else
+    {
+        $("#project_name_span").text("");
+        return true;
     }
 }
+//提交搜索
+function submitSerch(content)
+{
+    if(regexName(content)){$("#course_search_form").submit();}
+}
 
 //验证搜索时输入名字
-function regexQ(content) {
-        var name = $.trim($("#q").val());
-        if (name.length == 0) {
-            $("#course_member_name_span").text(content);
-            $("#course_member_name_span").css('color', '#ff0000');
-            $("#course_member_name_span").focus();
-            return false;
-        } else {
-            $("#course_member_name_span").text("");
-            return true;
-        }
+function regexQ(content)
+{
+    var name = $.trim($("#q").val());
+    if(name.length == 0)
+    {
+        $("#course_member_name_span").text(content);
+        $("#course_member_name_span").css('color','#ff0000');
+        $("#course_member_name_span").focus();
+        return false;
     }
-    //提交课程成员搜索
-
-function submitMemberSerch(content) {
+    else
+    {
+        $("#course_member_name_span").text("");
+        return true;
+    }
+}
+//提交课程成员搜索
+function submitMemberSerch(content)
+{
     //if(regexQ(content)){$("#course_member_search_form").submit();}
     $("#course_member_search_form").submit();
 }
 
 //课程描述显示更多信息
-function show_more_msg() {
-        $("#course_description").toggleClass("course_description_none");
-    }
-    //作业描述显示更多信息
-
-function news_show_more_des(id) {
-    $('#news_description_' + id).toggleClass("news_description_none");
+function show_more_msg()
+{
+    $("#course_description").toggleClass("course_description_none");
 }
-
-function bid_show_more_des(id) {
+//作业描述显示更多信息
+function news_show_more_des(id)
+{
+  $('#news_description_' + id).toggleClass("news_description_none");
+}
+function bid_show_more_des(id)
+{
     $("#bid_description_" + id).toggleClass("news_description_none");
 }
 
 //课程作业结束时间倒计时
-function show_bid_dead_line(year, month, day, divname) {
-        var now = new Date();
-        var endDate = new Date(year, month - 1, day);
-        var leftTime = endDate.getTime() - now.getTime();
-        var leftsecond = parseInt(leftTime / 1000);
-        var day1 = Math.floor(leftsecond / (60 * 60 * 24));
-        var hour = Math.floor((leftsecond - day1 * 24 * 60 * 60) / 3600);
-        var minute = Math.floor((leftsecond - day1 * 24 * 60 * 60 - hour * 3600) / 60);
-        var second = Math.floor(leftsecond - day1 * 24 * 60 * 60 - hour * 3600 - minute * 60);
-        $("#" + divname).html("<form name='formnow' class='fr'>" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + day1 + "' > 天" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + hour + "' > 小时" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + minute + "' > 分" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + second + "' > 秒" + "</form>" + "<p class='fr'>作品提交还剩：</p>");
-    }
-    //验证新建作业的名字
+function show_bid_dead_line(year,month,day,divname)
+{
+    var now = new Date();
+    var endDate = new Date(year, month-1, day);
+    var leftTime=endDate.getTime()-now.getTime();
+    var leftsecond = parseInt(leftTime/1000);
+    var day1=Math.floor(leftsecond/(60*60*24));
+    var hour=Math.floor((leftsecond-day1*24*60*60)/3600);
+    var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60);
+    var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60);
+    $("#"+divname).html("<form name='formnow' class='fr'>"
+    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+day1+"' > 天"
+    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+hour+"' > 小时"
+    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+minute+"' > 分"
+    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+second+"' > 秒"
+    + "</form>"
+    + "<p class='fr'>作品提交还剩：</p>");
+}
+//验证新建作业的名字
+function regex_homework_name()
+{
+    var name = $.trim($("#homework_name").val());
 
-function regex_bid_name() {
-    var name = $.trim($("#bid_name").val());
-
-    if (name == "") {
-        $("#bid_name_span").text("名称不能为空");
+    if(name=="")
+    {
+        $("#homework_name_span").text("名称不能为空");
         return false;
-    } else {
-        $("#bid_name_span").text("");
+    }
+    else
+    {
+        $("#homework_name_span").text("");
         return true;
     }
 }
 
 //验证匿评数量
-function regex_evaluation_num() {
-    var evaluation_num = $.trim($("#bid_evaluation_num").val());
+function regex_evaluation_num()
+{
+    var evaluation_num = $.trim($("#evaluation_num").val());
     var regex = /^\d+$/;
-    if ($("#bid_open_anonymous_evaluation").attr("checked") == "checked") {
-        if (evaluation_num == "") {
-            $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
-            return false;
-        } else if (regex.test(evaluation_num)) {
-            if (evaluation_num > 0) {
-                $("#bid_evaluation_num_span").text("");
-                return true;
-            } else {
-                $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
-                return false;
-            }
-        } else {
-            $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
+    if(evaluation_num=="")
+    {
+        $("#evaluation_num_notice").html("匿评分配数量不能为空");
+        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
+        return false;
+    }
+    else if(regex.test(evaluation_num))
+    {
+        if(evaluation_num > 0)
+        {
+            $("#evaluation_num_notice").html("每个学生将收到<span class='c_red'>&nbsp;"+ parseInt(evaluation_num) + "&nbsp;</span>份待匿评作品");
+            $("#evaluation_num_notice").removeClass("c_red");
+            return true;
+        }
+        else
+        {
+            $("#evaluation_num_notice").html("匿评分配数量必须为大于0");
+            $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
             return false;
         }
-    } else {
-        return true;
+    }
+    else
+    {
+        $("#evaluation_num_notice").html("匿评分配数量只能为数字");
+        $("#evaluation_num_notice").removeClass("c_red").addClass("c_red");
+        return false;
     }
 }
 
 //点击是否开启匿评单选框效果
-$(function() {
-    $("#bid_open_anonymous_evaluation").click(function() {
-        if ($("#bid_open_anonymous_evaluation").attr("checked") == "checked") {
-            $("#bid_evaluation_num_li").slideDown();
-        } else {
-            $("#bid_evaluation_num_li").slideUp();
+$(function(){
+    $("#homework_common_homework_type").click(function(){
+        if($("#homework_common_homework_type").attr("checked") == "checked")
+        {
+            $("#evaluation_setting").slideDown();
+            $("#ta_proportion").removeAttr("disabled");
+        }
+        else
+        {
+            $("#evaluation_setting").slideUp();
+            $("#ta_proportion").attr("disabled","disabled");
         }
     });
+
+    $("#absence_penalty").change(function(){
+        $("#absence_penalty_notice").html("&nbsp;"+ $("#absence_penalty").val() +"&nbsp;");
+    });
+
+    $("#ta_proportion").change(function(){
+        var ta_proportion = $("#ta_proportion").val();
+        $("#student_proportion").val((100 - parseInt(ta_proportion * 100)) + "%");
+    });
+});
+//第一次加载时，如果未开启匿评作业，隐藏显示匿评配置信息
+$(function(){
+    if($("#homework_common_homework_type").attr("checked") == "checked")
+    {
+        $("#evaluation_setting").show();
+        $("#ta_proportion").removeAttr("disabled");
+    }
+    else
+    {
+        $("#evaluation_setting").hide();
+        $("#ta_proportion").attr("disabled","disabled");
+    }
 });
 
-//老师提交新建作业
-function submit_new_bid(id) {
-    if (regex_bid_name() && regex_evaluation_num()) {
-        bid_description_editor.sync();
-        $("#" + id).submit();
+//老师提交 新建/修改 作业
+function submit_homework(id)
+{
+    if(regex_homework_name()&&regex_evaluation_num())
+    {
+        homework_description_editor.sync();
+        $("#"+id).submit();
     }
 }
 
-function show_window(id1, id2, top, left) {
-    $('#' + id1).css('top', top);
-    $('#' + id1).css('left', left);
-    $('#' + id1).css('display', 'block');
-    $('#' + id2).css('display', 'block');
+function show_window (id1,id2,top,left) {
+    $('#'+ id1).css('top',top);
+    $('#'+ id1).css('left',left);
+    $('#'+ id1).css('display','block');
+    $('#' + id2).css('display','block');
 }
 
-function close_window(id1, id2) {
-    $('#' + id1).css('display', 'none');
-    $('#' + id2).css('display', 'none');
+function close_window(id1,id2){
+    $('#' + id1).css('display','none');
+    $('#' + id2).css('display','none');
 }
 
 //隐藏提示狂
-function hidden_atert_form(cur_page, cur_type) {
+function hidden_atert_form(cur_page,cur_type)
+{
     hideModal($("#popbox"));
 }
 
 //当课程描述长度小于112px时，不显示更多按钮
-$(function() {
-    if ($("#course_description_content").height() > 112) {
+$(function(){
+    if($("#course_description_content").height()>112)
+    {
         $("#lg-foot").show();
     }
 });
 
 //将右侧的最小高度设置成左侧高度，美化界面
 // firefox pre标签换行
-$(document).ready(function() {
-    $("#RSide").css("min-height", $("#LSide").height() - 30);
+$(document).ready(function () {
+    $("#RSide").css("min-height",$("#LSide").height()-30);
     var userAgent = navigator.userAgent.toLowerCase();
     var browser = {
         version: (userAgent.match(/.+(?:rv|it|ra|ie)[/: ]([d.]+)/) || [])[1],
@@ -415,55 +515,39 @@ $(document).ready(function() {
         msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
         mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
     };
-    if (browser.mozilla || browser.opera) {
+    if (browser.mozilla || browser.opera){
         $("pre").addClass("break_word_firefox");
-    } else {
+    }
+    else{
         $("pre").addClass("break_word");
     }
 });
 
 // 日历选择日期后关闭
-function regexDeadLine() {
+function regexDeadLine()
+{
     ('#ui-datepicker-div').hide;
 }
 
 //新建、修改课程明码显示
-$(function() {
+$(function(){
     $("#psw_btn").click(function() {
-        alert("密码: " + $("#course_course_password").val());
-    });
-});
-
-//课程通知更多按钮显示
-$(function() {
-    $('.news_description').each(function() {
-        if ($(this).height() >= 38) {
-            $('#news_foot_' + $(this).attr('id').replace('news_description_', '')).css("display", "block");
-        }
-    });
-
-    $(".news_description img").one('load', function() {
-        var node = $(this).parents('.news_description');
-        if (node && node.height() >= 38) {
-            $('#news_foot_' + node.attr('id').replace('news_description_', '')).css("display", "block");
-        }
-    }).each(function() {
-        if (this.complete) {
-            $(this).load();
-        }
+        alert("密码: "+$("#course_course_password").val());
     });
 });
 
 //查找TAG资源
-function search_tag_attachment(url, tag_name, q, course_id, sort) {
+function search_tag_attachment(url,tag_name,q,course_id,sort)
+{
     //alert("111");
     $.get(
-        url, {
+        url,
+        {
             tag_name: tag_name,
             q: q,
-            course_id: course_id
+            course_id:course_id
         },
-        function(data) {
+        function (data) {
 
         }
     );
@@ -472,22 +556,27 @@ function search_tag_attachment(url, tag_name, q, course_id, sort) {
 // 课程讨论区
 function showhelpAndScrollToMessage(id, id1, count) {
     $('#' + id).toggle();
-    if (cookieget("repositories_visiable") == "true") {
-        cookiesave("repositories_visiable", false, '', '', '');
-    } else {
-        cookiesave("repositories_visiable", true, '', '', '');
+    if(cookieget("repositories_visiable") == "true")
+    {
+        cookiesave("repositories_visiable", false,'','','');
+    }
+    else
+    {
+        cookiesave("repositories_visiable", true,'','','');
     }
     var information = $(id1);
     var val = information.attr("value");
-    if (val == "show_help") {
-        $(id1).text("收起回复(" + count + ")");
+    if(val=="show_help")
+    {
+        $(id1).text("收起回复(" + count + ")" );
         information.attr("value", "hide_help");
-    } else {
+    }
+    else
+    {
         $(id1).text("展开回复(" + count + ")");
         information.attr("value", "show_help");
     }
 }
-
 function show_more_reply(contentid, id2, id3) {
     $(contentid).toggleClass("course_description_none");
     var information = $(id2);
@@ -497,9 +586,218 @@ function show_more_reply(contentid, id2, id3) {
         $(id2).text("[收起]");
         information.attr("value", "hide_more");
         arrow.attr("src", "/images/jiantouup.jpg")
-    } else {
+    }
+    else {
         $(id2).text("[展开]");
         information.attr("value", "show_more");
         arrow.attr("src", "/images/jiantou.jpg")
     }
 }
+
+///////////////////////////////////////////////
+//学生作品
+function show_project()
+{
+    $("#about_project").slideToggle();
+}
+
+//验证作品名称
+function regexStudentWorkName()
+{
+    var name = $.trim($("#student_work_name").val());
+
+    if(name=="")
+    {
+        $("#student_work_name_span").text("作品名称不能为空");
+        return false;
+    }
+    else
+    {
+        $("#student_work_name_span").text("");
+        return true;
+    }
+}
+
+function regexStudentWorkDescription()
+{
+    var name = $.trim($("#student_work_description").val());
+
+    if(name=="")
+    {
+        $("#student_work_description_textarea").text("作品描述不能为空");
+        return false;
+    }
+    else
+    {
+        $("#student_work_description_textarea").text("");
+        return true;
+    }
+}
+
+//提交新建作品
+function new_student_work()
+{
+    if(regexStudentWorkName()&&regexStudentWorkDescription())
+    {$("#new_student_work").submit();}
+}
+
+function edit_student_work(id)
+{
+    if(regexStudentWorkName()&&regexStudentWorkDescription())
+    {$("#edit_student_work_" + id).submit();}
+}
+
+//滑动打分
+$.fn.peSlider = function(settings){
+    //configurable options (none so far)
+    var o = $.extend({},settings);
+    if( !$('body').is('[role]') ){ $('body').attr('role','application'); }
+    return $(this).each(function(){
+        var thisLabel = $('label[for=' + $(this).attr('id') + ']').attr('id', $(this).attr('id') + '-label').attr('id');
+        var thisUnits = $(this).attr('data-units') || '';
+        var slider = $('<div></div>');
+        if( $(this).is('input') ){
+            var input = $(this);
+            var thisUnits = input.attr('data-units');
+            var friendlyVal = input.val() + ' ' + thisUnits;
+            var sliderOptions = $.extend(o,{
+                min: parseFloat(input.attr('min')),
+                max: parseFloat(input.attr('max')),
+                value: parseFloat(input.val())
+            });
+            slider
+                .insertBefore(input)
+                .slider(sliderOptions)
+                .bind('slide', function(e, ui){
+                    input.val(ui.value);
+                    friendlyVal = input.val() + ' ' + thisUnits;
+                    slider.find('a').attr({
+                        'aria-valuenow': ui.value,
+                        'aria-valuetext': friendlyVal
+                    });
+                })
+                .find('a')
+                .attr({
+                    'role': 'slider',
+                    'aria-valuemin': input.attr('min'),
+                    'aria-valuemax': input.attr('max'),
+                    'aria-valuenow': input.val(),
+                    'aria-valuetext': friendlyVal,
+                    'aria-labelledby': thisLabel
+                });
+            input
+                .keyup(function(){
+                    var inVal = parseFloat(input.val());
+                    if( !isNaN(inVal) ){
+                        slider.slider('value', inVal);
+                        input.val(slider.slider('value'));
+                    }
+                })
+                .change(function(){
+                    var inVal = parseFloat(input.val());
+                    if( !isNaN(inVal) ){
+                        slider.slider('value', inVal);
+                        input.val(slider.slider('value'));
+                    }
+                })
+                .blur(function(){
+                    var inVal = parseFloat(input.val());
+                    if( isNaN(inVal) ){
+                        input.val(0);
+                    }
+                });
+            if( !settings.step ){
+                var step = Math.round( parseFloat(input.attr('max')) / slider.width());
+                if(step > 1){ slider.slider('option','step',step); }
+            }
+        }
+    });
+};
+
+//返回顶部
+$(function(){goTopEx();});
+
+var Sys = {};
+var ua = navigator.userAgent.toLowerCase();
+var s;
+(s = ua.match(/msie ([\d.]+)/)) ? Sys.ie = s[1] :
+    (s = ua.match(/firefox\/([\d.]+)/)) ? Sys.firefox = s[1] :
+        (s = ua.match(/chrome\/([\d.]+)/)) ? Sys.chrome = s[1] :
+            (s = ua.match(/opera.([\d.]+)/)) ? Sys.opera = s[1] :
+                (s = ua.match(/version\/([\d.]+).*safari/)) ? Sys.safari = s[1] : 0;
+
+function goTopEx() {
+    var obj = document.getElementById("goTopBtn");
+    if(obj != null)
+    {
+        var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
+        function getScrollTop() {
+            var xsun = document.documentElement.scrollTop;
+            if (Sys.chrome) {
+                xsun=document.body.scrollTop;
+            }
+            return xsun;
+        }
+        function setScrollTop(value) {
+            if (Sys.chrome) {
+                document.body.scrollTop = value;
+            }
+            else {
+                document.documentElement.scrollTop = value;
+            }
+        }
+        window.onscroll = function () { getScrollTop() > 0 ? obj.style.display = "" : obj.style.display = "none"; };
+        obj.onclick = function () {
+            var goTop = setInterval(scrollMove, 10);
+            function scrollMove() {
+                setScrollTop(getScrollTop() / 1.1);
+                if (getScrollTop() < 1) clearInterval(goTop);
+            }
+        }
+    }
+}
+
+//匿评评分提示
+$(function(){
+    $(".student_score_info").bind("mouseover",function(e){
+         //alert($(this).html());
+        $(this).find("div").show();
+        $(this).find("div").css("top",e.pageY);
+        $(this).find("div").css("left",e.pageX);
+    });
+    $(".student_score_info").bind("mouseout",function(e){
+         //alert($(this).html());
+        $(this).find("div").hide();
+    });
+});
+
+//匿评弹框取消按钮
+function clickCanel(){hideModal("#popbox02");}
+//匿评弹框确定按钮
+function clickOK(path)
+{
+    clickCanel();
+    $.ajax({
+        type: "GET",
+        url: path,
+        data: 'text',
+        success: function (data) {
+        }
+    });
+}
+//查询
+function SearchByName(obj,url,event)
+{
+    var keycode = (event.keyCode ? event.keyCode : event.which);
+    if(keycode == '13'){
+        location.href = url + "&name=" + obj.val();
+    }
+}
+function SearchByName(obj,url)
+{
+    location.href = url + "&name=" + obj.val();
+}
+
+$(function(){
+    $("#about_project label").eq(1).remove();
+});
\ No newline at end of file
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5c586b757..67d67d69b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2794,4 +2794,4 @@ div.repos_explain{
 	padding-bottom: 20px;
 }
 .upload_img img{max-width: 100%;}
-#activity .upload_img img{width: 580px;}
+#activity .upload_img img{max-width: 580px;}
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 5333b91a7..7d4436704 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -19,7 +19,7 @@ a:hover.project_name{ color:#016f33;}
 a.project_txt02{ color:#0781b4; width:618px; display:block; float:left;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 a:hover.project_txt{ color:#066e9a;}
 .noline{ border-bottom:none;}
-.news_description{max-height: 38px;overflow:hidden; }
+.news_description{max-height: 360px;overflow:hidden; }
 .news_description_none{max-height: none;}
 a.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;}
 a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
@@ -53,9 +53,9 @@ a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
 a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
 a:hover.problem_pic{border:1px solid #64bdd9;}
 .problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
-a.problem_name{ color:#ff5722;}
+a.problem_name{ color:#ff5722;max-width:60px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
 a:hover.problem_name{ color:#d33503;}
-a.problem_tit{ color:#0781b4; max-width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.problem_tit{ color:#0781b4; max-width:410px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 a:hover.problem_tit{ color:#09658c; }
 .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 /****翻页***/
@@ -127,14 +127,14 @@ a.re_de{ color:#6883b6; margin-left:15px;}
 
 /* 作业列表 */
 .ttl{ }
-.ctt{height:820px;clear:both; }
+.ctt{clear:both; }
 #contentbox{float:right;clear:both;width:670px;/*滑动门的宽度*/}
 /* TAB 切换效果 */
 .tb_{ background-color: #eaeaea; height:40px; }
 .tb_ ul{height:40px; }
 .tb_ li{float:left;height:34px;width: 90px;cursor:pointer; font-size:14px; padding-top:6px; text-align:center; }
-a.tb_all{ margin-left:212px; font-size:12px; display:block; height:23px; padding-top:4px; width:90px; color:#7a7a7a; border:1px solid #cbcbcb; background:#fff; text-align: center;}
-a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
+a.tb_all{ float:right; font-size:12px; display:block; height:18px; padding-top:2px;  width:90px; color:#ff5d31; border:1px solid #ff5d31; background:#fff; text-align: center;}
+a:hover.tb_all{ background:#ff5d31; color:#fff; text-decoration:none;}
 
 .work_tb_{ background-color: #eaeaea; height:40px; }
 a.work_edit{color: #64bdd9; display:block; padding:1px 5px; border:1px solid #64bdd9;}
@@ -288,6 +288,18 @@ a:hover.member_btn{ background:#329cbd;}
 .ni_con p{ color:#808181;}
 .ni_con a:hover{ text-decoration:none;}
 a.xls{ margin-left:5px; color:#136b3b;}
+
+/* 开启匿评弹框 */
+.anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+.ni_con { width:425px; margin:25px 30px;}
+.ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
+.ni_con p{ color:#808181; }
+.ni_con a:hover{ text-decoration:none;}
+.ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
+a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
+a:hover.tijiao{ background:#0f99a9;}
+.c_pink{ color:#e65d5e;}
+
 /* 学生列表*/
 .st_list{ width:670px;}
 .st_search{ }
@@ -343,7 +355,6 @@ a:hover.st_add{ color:#ff8e15;}
 .upload_box{ width:430px; margin:15px auto;}
 
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-.r_txt_tit{width:500px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
 
 blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: break-all;word-wrap: break-word;}
 .respond-form{display: none;margin: auto;clear: both;}
@@ -354,7 +365,7 @@ blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: br
 #attachments_fields input.description {margin-left: 4px;width: 100px;}
 #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
-#attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;}
+#attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px; white-space: nowrap; text-overflow:ellipsis;}
 span.add_attachment {font-size: 80%;line-height: 2.5em;}
 #attachments_fields span {display: block;white-space: nowrap;}
 .file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);}
@@ -392,7 +403,7 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .ui-progressbar-value{margin:-1px;height:100%}
 .ui-widget-header{border:1px solid #628db6;background:#759fcf url(jquery/images/ui-bg_gloss-wave_35_759fcf_500x100.png) 50% 50% repeat-x;color:#fff;font-weight:bold}
 .ui-corner-left,.ui-corner-tl{-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px}
-.link_file{ background:url(../images/pic_file.png) 0 7px no-repeat !important; padding-left:20px !important; color:#64bdd9 !important; }
+.link_file{ background:url(../images/pic_file.png) 0 3px no-repeat !important; padding-left:20px !important; color:#64bdd9 !important; }
 a:hover.link_file_board{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !important; padding-left:20px !important; color:#64bdd9 !important; }
 
@@ -491,10 +502,7 @@ blockquote {
 }
 a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;}
 .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}
-
-a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; }
-a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
+.r_txt_tit{max-width:450px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
 
 /*日历选择图*/
 img.ui-datepicker-trigger {
@@ -549,6 +557,20 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px; }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}
 
+/* 20150423作业评分*/
+.ml14{ margin-left:14px;}
+.w548{ width:552px;}
+.w547{ width:544px;}
+.w196{ width:182px;}
+.w459{ width:459px;}
+.hwork_new_set{border:1px dashed #CCC; background:#f5f5f5; text-align:center; padding:10px 0; margin-bottom:10px;}
+.hwork_new_grey{background:#dbdbdb; width:610px; padding:10px 20px; margin:0 auto; text-align:left; margin-bottom:5px;}
+.hwork_new_left{ width:220px; float:left; }
+.hwork_new_right{ width:350px; float:left; margin-left:40px;}
+.w305{ width:305px;}
+.icon_add{  background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
+
 /* 20150505讨论区*/
 .w664{ width:664px;}
 .w140{ width:140px;}
@@ -562,7 +584,7 @@ a.talkmain_name{ color:#ff5722;}
 a:hover.talkmain_name{ color:#d33503;}
 .talkmain_tit{ color:#0781b4; width:450px; display:block; }
 .talklist_main{   }
-.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}
+/*.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}*/
 .talkConIpt{ background:#f2f2f2; }
 .talkWrapBox{ width:610px; margin-left:60px; }
 .inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px;  margin-bottom:5px;color:#666;}
@@ -583,14 +605,82 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 /*.talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}*/
 #about_newtalk{ display:none;}
 
-
-
-
-
-
-
-
-
+.ml14{ margin-left:14px;}
+.w548{ width:552px;}
+.w547{ width:544px;}
+.w196{ width:196px;}
+.w459{ width:459px;}
+.hwork_new_set{border:1px dashed #CCC; background:#f5f5f5; text-align:center; padding:10px 0; margin-bottom:10px;}
+.hwork_new_grey{background:#dbdbdb; width:610px; padding:10px 20px; margin:0 auto; text-align:left; margin-bottom:5px;}
+.hwork_new_left{ width:220px; float:left; }
+.hwork_new_right{ width:350px; float:left; margin-left:40px;}
+.w305{ width:305px;}
+.icon_add{background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
+
+/* 20150506上传头像*/
+.uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666;  text-align:center;}
+.showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
+.mr2{ margin-right:2px;}
+.uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
+
+/* 20150512作品展示*/
+.hwork_ul{ height:24px; padding-top:10px;}
+.hwork_ul li{ float:left;}
+.w300{ width:300px;}
+.w80{ width:80px;}
+.t_c{ text-align:center;}
+
+.hwork_tit{ width:210px; float:left; }
+.hwork_tit a{ width:205px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.hwork_code{ width:56px; text-align:center;  }
+.hwork_code02{ width:60px; text-align:center;  }
+.hwork_tit_e{ width:420px; float:left; }
+.hwork_tit_e a{ width:405px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.hwork_num{ width:90px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.mr18{ margin-right:18px;}
+a.hwork_center{ display:block; width:60px;  margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
+.hwork_name{ display:block;width:80px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
+.show_hwork ul li{ margin-bottom:5px;}
+.show_hwork_arrow{ position:relative; top:2px; left:25px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}
+.tit_fb{ font-weight:bold; width:66px; text-align:right; display:block; float:left;}
+.ml160{ margin-left:160px;}
+.show_hwork_p{ width:580px; float:left;}
+.hwork_ping_text{ float:left; border:1px solid #e4e4e4; padding:5px; width:568px; height:50px;}
+.ping_box{ width:626px; padding:10px; background:#f5f3f3;  }
+a.ping_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid #e3e3e3;}
+a:hover.ping_pic{border:1px solid #64bdd9;}
+.ping_box_tit{ float:left; width:575px; margin-left:10px;}
+.ping_box_ul{}
+.ping_line{ border-bottom:1px dashed #CCCCCC; padding-bottom:8px; margin-bottom:8px;}
+.ping_text{border:1px solid #CCCCCC; margin:5px; padding:5px; width:560px; height:50px; }
+.ping_back_tit{ float:left; width:523px; margin-left:10px; }
+a.down_btn{ border:1px solid #CCC; color:#999; padding:0px 5px; font-size:12px; text-align:center; display:block;}
+a:hover.down_btn{ background:#14ad5a; color:#fff; border:1px solid #14ad5a;}
+.fr{ float:right;}
+.li_min_search{ float:right; margin-right:-10px;}
+.info_ni{ width:100px; padding:5px;position: absolute;display:none;-moz-border-radius:3px;  -webkit-border-radius:3px;  border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left;}
+/*返回顶部*/
+.to_top{width: 19px;height: 74px;position: fixed;top: 50px;right: 1px;color: white;background: #15bccf; line-height: 1.2; padding-top: 10px;padding-left: 5px;font-size: 14px;cursor: pointer;}
+
+/* 评分插件 */
+input#score{ width:40px;}
+.ui-slider{position:relative;width:200px;float:left;margin-right:10px;height:14px; margin-top:2px;background:#e2e2e2; }
+.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:0.5em;height:1.6em;top:-.2em;margin-left:-.5em;cursor:pointer;background:#64bdd9;}
+.ui-slider .ui-slider-handle:hover,.ui-slider .ui-slider-handle:focus{background:#64bdd9;}
+.ui-slider .ui-slider-handle:active{background-image:none;}
+.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;top:0;height:100%;background:#64bdd9;left:0;}
+
+.filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px;}
+.evaluation{position: relative;}
+.evaluation_submit{position: absolute;right: 0px;bottom: 5px;}
+.student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; }
+
+/* 与我相关 */
+.new_icon{background:url(../images/new_icon.png) 0px 0px no-repeat; width:35px; height:15px; display:block;}
+a.about_me{ width:80px;text-align:center;font-size:16px; color:#64bdd9; margin:10px 0 0 10px;}
+a:hover.about_me{ color:#0781b4;}
 
 
 
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index c8d18609f..306520f96 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -6,6 +6,8 @@ table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
 a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
+a:hover {text-decoration: none;  }
+textarea {resize: none;}
 
 /*常用*/
 select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }
@@ -16,7 +18,7 @@ table{ background:#fff;}
 .no_line{ border-bottom:none;}
 .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; cursor:pointer;}
+.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/new_project/public_icon.png) 135px -193px no-repeat;}
 
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}
@@ -34,6 +36,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .fmYh{font-family:"MicroSoft Yahei";}
 .font999{ color:#999;}
 .fontRed{color:#770000;}
+.text_c{ text-align:center;}
 
 /* Float & Clear */
 .cl{ clear:both; overflow:hidden; }
@@ -56,6 +59,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml35{margin-left: 35px;}
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
@@ -77,11 +81,13 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px;}
+.mt30{ margin-top: 30px;}
 .mb5{ margin-bottom:5px;}
 .mb10{ margin-bottom:10px;}
 .mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
 .w20{ width:20px;}
+.w40{width: 40px;}
 .w45{ width: 45px;}
 .w60{ width:60px;}
 .w70{ width:70px;}
@@ -134,6 +140,7 @@ a.c_green{ color:#28be6c;}
 .b_grey{ background: #F5F5F5;}
 .b_dgrey{ background: #CCC;}
 .c_orange{color:#e8770d;}
+.c_dark{ color:#2d2d2d;}
 .c_lorange{ color:#ff9900;}
 .c_purple{color: #6883b6;}
 .c_blue{ color:#15bccf;}
@@ -154,7 +161,7 @@ a.green_btn{background:#28be6c;color:#fff;font-size:14px; font-weight:normal; pa
 a:hover.green_btn{ background:#14ad5a;}
 .blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;}
 a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;}
-a:hover.blue_btn{ background:#329cbd;}
+a:hover.blue_btn{ background:#329cbd;cursor: pointer;}
 a.orange_btn{  background:#ff5722;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center; }
 a:hover.orange_btn{ background:#d63502;}
 
@@ -170,6 +177,9 @@ a:hover.bgreen_u_btn{background:#1abc9c; color:#fff;}
 .blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
 a.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
 a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
+.blue_n_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;}
+a.blue_n_btn{background:#64bdd9;color:#fff;font-weight:normal; padding:2px 10px; text-align:center;}
+a:hover.blue_n_btn{ background:#329cbd;}
 
 .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
@@ -186,6 +196,7 @@ a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
 .pic_mes{ display:block; background:url(../images/new_project/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;}
 .pic_img{ display:block; background:url(../images/new_project/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; }
 .pic_del{ display:block; background:url(../images/new_project/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; }
+.pic_del:hover{  background:url(../images/new_project/public_icon.png) -32px -235px no-repeat; }
 .pic_stats{display:block; background:url(../images/new_project/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
 .pic_files{display:block; background:url(../images/new_project/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;}
 .pic_text{display:block; background:url(../images/new_project/public_icon.png) 0px -609px no-repeat; width:20px; height:18px;}