diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b1aae9b26..d14bccc4e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -507,7 +507,8 @@ class ApplicationController < ActionController::Base
     # render_404
   # end
 
-  def self.model_object(model)
+  def self.
+      model_object(model)
     self.model_object = model
   end
 
diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb
index dcab1b360..dcd549d76 100644
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@@ -144,7 +144,7 @@ class BlogCommentsController < ApplicationController
     if params[:parent_id]
       @blogComment.content = params[:blog_comment][:content]
       parent = BlogComment.find params[:parent_id]
-      @blogComment.reply_id = params[:reply_id]
+      @blogComment.reply_id = params[:id]
       parent.children << @blogComment
     else
       @quote = params[:quote][:quote] || ""
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index ceb63d7b0..099e9404a 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -161,6 +161,7 @@ class BoardsController < ApplicationController
           if @project
             render :action => 'show', :layout => 'base_projects'
           elsif @course
+            @left_nav_type = 2
             @params=params
             render :action => 'show', :layout => 'base_courses'
           end
@@ -185,6 +186,7 @@ class BoardsController < ApplicationController
     @board = @project.boards.build
     @board.safe_attributes = params[:board]
     if @project.project_type == 1
+      @left_nav_type = 2
       render :layout => 'base_courses'
     end
   end
@@ -206,6 +208,7 @@ class BoardsController < ApplicationController
 
   def edit
     if @project.project_type == 1
+      @left_nav_type = 2
       render :layout => 'base_courses'
     end
   end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 5966b310f..9226b904c 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -19,8 +19,8 @@ class CommentsController < ApplicationController
   default_search_scope :news
   include ApplicationHelper
   model_object News
-  before_filter :find_model_object
-  before_filter :find_project_from_association
+  before_filter :find_model_object, :except => [:reply, :quote]
+  before_filter :find_project_from_association, :except => [:reply, :quote]
   before_filter :authorize
 
   def create
@@ -73,7 +73,46 @@ class CommentsController < ApplicationController
 
   def destroy
     @news.comments.find(params[:comment_id]).destroy
-    redirect_to news_url(@news)
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+        return
+      end
+    else
+      redirect_to news_url(@news)
+    end
+  end
+
+  def quote
+    @comment = Comment.find(params[:id])
+    respond_to do | format|
+      format.js
+    end
+  end
+
+  def reply
+    comment = Comment.find(params[:id])
+    @news = News.find comment.commented_id
+    new_comment = @news.comments.build(:author_id => User.current.id, :reply_id => params[:id], :comments => params[:content], :parent_id => comment.id)
+    @user_activity_id = params[:user_activity_id]
+    if new_comment.save
+      update_course_activity(@news.class,@news.id)
+      update_user_activity(@news.class,@news.id)
+      update_org_activity(@news.class,@news.id)
+      if @user_activity_id
+        respond_to do |format|
+          format.js
+          return
+        end
+      else
+        respond_to do |format|
+          format.html {
+            redirect_to news_path(@news)
+          }
+        end
+      end
+    end
   end
 
   private
@@ -87,5 +126,4 @@ class CommentsController < ApplicationController
     @news
   end
 
-
 end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 665273ae0..41ea9c45e 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -301,7 +301,6 @@ class CoursesController < ApplicationController
   def member
     ## 有角色参数的才是课程，没有的就是项目
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
-
       @render_file = 'new_member_list'
       @score_sort_by = "desc"
       @sort_type = params[:sort_type] ? params[:sort_type] : "score"
@@ -414,6 +413,9 @@ class CoursesController < ApplicationController
   end
 
   def settings
+    #添加成员消息状态
+    join_course_messages = CourseMessage.where("user_id =? and course_message_type =? and course_id =? and status = ? and viewed =?", User.current.id, 'JoinCourse', @course.id, 1, 0)
+    join_course_messages.update_all(:viewed => true)
     if User.current.allowed_to?(:as_teacher,@course)
       @select_tab = params[:tab]
       @issue_custom_fields = IssueCustomField.sorted.all
@@ -905,6 +907,7 @@ class CoursesController < ApplicationController
     end
     @type = params[:type]
 
+    @left_nav_type = 1
     respond_to do |format|
       format.js
       format.html{render :layout => 'base_courses'}
@@ -936,6 +939,7 @@ class CoursesController < ApplicationController
       end
       @jour = paginateHelper @jours,10
       @state = false
+      @left_nav_type = 6
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
         format.api
@@ -1119,6 +1123,14 @@ class CoursesController < ApplicationController
     end
   end
 
+  #统计
+  def statistics_course
+    @left_nav_type = 9
+    respond_to do |format|
+      format.html {render :layout => 'base_courses'}
+    end
+  end
+
   private
   def update_quotes attachment
     if attachment.copy_from
diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index c3964c567..e3caaf9fb 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -29,6 +29,7 @@ class ExerciseController < ApplicationController
       exercises = @course.exercises.where("exercise_status <> 1").order("created_at asc")
     end
     @exercises = paginateHelper exercises,20 #分页
+    @left_nav_type = 8
     respond_to do |format|
       format.html
     end
@@ -72,6 +73,7 @@ class ExerciseController < ApplicationController
     end
     # @percent = get_percent(@exercise,User.current)
     @exercise_questions = @exercise.exercise_questions
+    @left_nav_type = 8
     respond_to do |format|
       format.html {render :layout => 'base_courses'}
     end
@@ -118,6 +120,7 @@ class ExerciseController < ApplicationController
   end
 
   def edit
+    @left_nav_type = 8
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
   end
@@ -159,6 +162,7 @@ class ExerciseController < ApplicationController
     @exercise = Exercise.find(params[:id])
     exercise_questions = @exercise.exercise_questions
     @exercise_questions = paginateHelper exercise_questions, 5
+    @left_nav_type = 8
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
     end
@@ -379,6 +383,7 @@ class ExerciseController < ApplicationController
     else
       @exercise_users_list = []
     end
+    @left_nav_type = 8
     respond_to do |format|
       format.html
       format.xls {
@@ -566,6 +571,7 @@ class ExerciseController < ApplicationController
     eu = get_exercise_user(@exercise.id, @user.id)
     eu.update_attributes(:score => score)
     @exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", @user.id, @exercise.id).first
+    @left_nav_type = 8
     respond_to do |format|
       format.html {render :layout => 'base_courses'}
     end
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index f06725d01..ed2b2ebfa 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -366,6 +366,7 @@ class FilesController < ApplicationController
 
       @tag_list = attachment_tag_list @all_attachments
 
+      @left_nav_type = 5
       render :layout => 'base_courses'
     elsif params[:org_subfield_id]
       if params[:sort]
@@ -445,6 +446,7 @@ class FilesController < ApplicationController
     @versions = @project.versions.sort
     @course_tag = @project.project_type
     if @project.project_type == 1
+      @left_nav_type = 5
       render :layout => 'base_courses'
     end
   end
@@ -812,6 +814,7 @@ class FilesController < ApplicationController
       @attachtype = params[:type].to_i
       @contenttype = params[:contentType].to_s
      # render layout:  'base_courses'
+      @left_nav_type = 5
       respond_to do |format|
         format.js
         format.html {
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 6724f42bb..2020915f8 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -39,6 +39,7 @@ class HomeworkCommonController < ApplicationController
       end
     end
 
+    @left_nav_type = 3
     respond_to do |format|
       format.js
       format.html
@@ -60,6 +61,7 @@ class HomeworkCommonController < ApplicationController
     @is_in_course = params[:is_in_course].to_i
     @course_activity = params[:course_activity].to_i
     if @is_in_course == 1 || @course_activity == 1
+      @left_nav_type = 3
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
       end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 049842e37..921d7d12b 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -432,15 +432,14 @@ class IssuesController < ApplicationController
 
   def add_journal
     if User.current.logged?
-      @jour = Journal.new
-      @jour.user_id = User.current.id
-      @jour.notes = params[:notes]
-      @jour.journalized = @issue
-      @jour.save_attachments(params[:attachments])
-      @jour.save
+      jour = Journal.new
+      jour.user_id = User.current.id
+      jour.notes = params[:notes]
+      jour.journalized = @issue
+      jour.save_attachments(params[:attachments])
+      jour.save
       update_user_activity(@issue.class,@issue.id)
       update_forge_activity(@issue.class,@issue.id)
-      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
 
       @user_activity_id = params[:user_activity_id]
       if params[:issue_id]
@@ -474,7 +473,6 @@ class IssuesController < ApplicationController
   def reply
     @issue = Issue.find(params[:id])
     @jour = Journal.find(params[:journal_id])
-    @tempContent = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @jour.user.realname.blank? ?  @jour.user.login: @jour.user.realname)} <br/>#{@jour.notes.html_safe}</blockquote>".html_safe
     respond_to do |format|
       format.js
     end
@@ -483,17 +481,17 @@ class IssuesController < ApplicationController
   #给issue添加journ。回复内容包含 对某个被回复的journ的内容
   def add_reply
     if User.current.logged?
-      jour = Journal.new
-      jour.user_id = User.current.id
-      jour.notes = params[:quote]+params[:notes]
+      jour = Journal.find(params[:journal_id])
       @issue = Issue.find params[:id]
-      jour.journalized = @issue
-      jour.save
-      update_user_activity(@issue.class,@issue.id)
-      update_forge_activity(@issue.class,@issue.id)
+      new_jour = @issue.journals.build(:user_id => User.current.id, :reply_id => params[:journal_id], :notes => params[:content], :parent_id => jour.id)
+      @user_activity_id = params[:user_activity_id]
+      if new_jour.save
+        update_user_activity(@issue.class,@issue.id)
+        update_forge_activity(@issue.class,@issue.id)
 
-      respond_to do |format|
-        format.html{redirect_to issue_url(@issue)}
+        respond_to do |format|
+          format.js
+        end
       end
     end
   end
@@ -502,8 +500,9 @@ class IssuesController < ApplicationController
   def delete_journal
      @issue = Issue.find(params[:id])
      Journal.destroy(params[:journal_id])
-    respond_to do |format|
-      format.html{redirect_to issue_url(@issue)}
+     @user_activity_id = params[:user_activity_id]
+     respond_to do |format|
+      format.js
     end
   end
 
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index f5ad89832..fae350a6a 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -124,6 +124,7 @@ class MessagesController < ApplicationController
 
         end
       else
+        @left_nav_type = 2
         respond_to do |format|
           format.html {
             layout_file = @project ? 'base_projects' : 'base_courses'
@@ -140,15 +141,15 @@ class MessagesController < ApplicationController
   def reply
     if params[:parent_id]
       parent = Message.find params[:parent_id]
+      @topic = params[:activity_id].nil? ? parent : Message.find(params[:activity_id].to_i)
       @reply = Message.new
       @reply.author = User.current
       @reply.board = parent.board
       @reply.content = params[:content]
-      @reply.subject = "RE: #{parent.subject}"
-      @reply.reply_id = params[:reply_id]
+      @reply.subject = "RE: #{@topic.subject}"
+      @reply.reply_id = params[:id]
       # @reply.reply_id = params[:id]
       parent.children << @reply
-      @topic = params[:activity_id].nil? ? parent : Message.find(params[:activity_id].to_i)
       @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
       @is_course = params[:is_course] if params[:is_course]
       @is_board = params[:is_board] if params[:is_board]
@@ -241,6 +242,7 @@ class MessagesController < ApplicationController
           if @project
             layout_file = 'base_projects'
           elsif @course
+            @left_nav_type = 2
             layout_file = 'base_courses'
           elsif @org_subfield
             @organization = @org_subfield.organization
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 76b229dbf..190c3852b 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -56,7 +56,7 @@ class NewsController < ApplicationController
                          :order => "#{News.table_name}.created_on DESC",
                          :offset => @page * 10,
                          :limit => 10)
-
+      @left_nav_type = 4
       respond_to do |format|
         format.html {
           @news = News.new # for adding news inline
@@ -136,6 +136,7 @@ class NewsController < ApplicationController
         @newss = paginateHelper @newss,@limit
 
         #@newss = paginateHelper scope_order,10
+        @left_nav_type = 4
         respond_to do |format|
           format.html {
             @news = News.new
@@ -176,6 +177,7 @@ class NewsController < ApplicationController
     if @news.course_id
       @course = Course.find(@news.course_id)
       if @course
+        @left_nav_type = 4
         render :layout => 'base_courses'
       end
     elsif @news.org_subfield_id
@@ -279,6 +281,7 @@ class NewsController < ApplicationController
       @organization = @org_subfield.organization
     end
     if @course
+      @left_nav_type = 4
       render :layout => "base_courses"
     elsif @org_subfield
       render :layout => 'base_org'
diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index e4cf31f55..ad04e68fa 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -15,6 +15,7 @@ class PollController < ApplicationController
         polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2")
       end
       @polls = paginateHelper polls,20 #分页
+      @left_nav_type = 7
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
       end
@@ -25,7 +26,7 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
-    if @poll.polls_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?)
+    if @poll.polls_status != 2 && !(User.current.allowed_to?(:as_teacher,@course) || User.current.admin?)
       render_403
       return
     end
@@ -44,6 +45,7 @@ class PollController < ApplicationController
       @percent = get_percent(@poll,User.current)
       poll_questions = @poll.poll_questions
       @poll_questions = paginateHelper poll_questions,5 #分页
+      @left_nav_type = 7
       respond_to do |format|
         format.html {render :layout => 'base_courses'}
       end
@@ -78,6 +80,7 @@ class PollController < ApplicationController
 
   def edit
     respond_to do |format|
+      @left_nav_type = 7
       format.html{render :layout => 'base_courses'}
     end
   end
@@ -112,6 +115,7 @@ class PollController < ApplicationController
     @poll = Poll.find(params[:id])
     poll_questions = @poll.poll_questions 
     @poll_questions = paginateHelper poll_questions, 5
+    @left_nav_type = 7
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
     end
@@ -393,6 +397,7 @@ class PollController < ApplicationController
   #显示某个学生某份问卷的填写结果
   def poll_result
     @poll_questions = paginateHelper @poll.poll_questions,5
+    @left_nav_type = 7
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
     end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 45b54cf0a..4992501c5 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -526,6 +526,7 @@ class StudentWorkController < ApplicationController
     @is_focus = params[:is_focus] ? params[:is_focus].to_i : 0
     # 消息传过来的ID
     @message_student_work_id = params[:student_work_id]
+    @left_nav_type = 3
     respond_to do |format|
       format.js
       format.html
@@ -918,6 +919,7 @@ class StudentWorkController < ApplicationController
       ORDER BY absence #{order}")
     end
     @order = order == "desc" ? "asc" : "desc"
+    @left_nav_type = 3
     respond_to do |format|
       format.html
     end
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 291e6ca30..9c69f5259 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -13,7 +13,6 @@ class SyllabusesController < ApplicationController
   end
 
   def show
-    #@courses = @syllabus.courses
     respond_to do |format|
       format.js
       format.html{render :layout => 'base_syllabus'}
@@ -109,11 +108,7 @@ class SyllabusesController < ApplicationController
     sort_name = "updated_on"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    if User.current == @syllabus.user || User.current.admin?
-      @courses = @syllabus.courses.where("is_delete = 0").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
-    else
-      @courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
-    end
+    @courses = @syllabus.courses.where("is_delete = ?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
 
     #根据 作业+资源数排序
     if @order.to_i == 2
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5a88e90d3..5e968e854 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -94,6 +94,12 @@ class UsersController < ApplicationController
         @comment = Message.find params[:comment].to_i
       when 'BlogComment'
         @comment = BlogComment.find params[:comment].to_i
+      when 'OrgDocumentComment'
+        @comment = OrgDocumentComment.find params[:comment].to_i
+      when 'Comment'
+        @comment = Comment.find params[:comment].to_i
+      when 'Journal'
+        @comment = Journal.find params[:comment].to_i
     end
   end
 
@@ -133,6 +139,16 @@ class UsersController < ApplicationController
         @user_activity_id = params[:user_activity_id]
         @activity_id = params[:activity_id]
         @type = 'OrgDocumentComment'
+      when 'News'
+        @reply = Comment.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @type = 'News'
+      when 'Issue'
+        @reply = Journal.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @type = 'Issue'
     end
     respond_to do |format|
       format.js
@@ -709,9 +725,9 @@ class UsersController < ApplicationController
     @user = User.current
     @select_course = params[:select_course] ? 1 : 0
     #@user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
-    visible_course = Course.where("is_public = 1 && is_delete = 0")
-    visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-    @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
+    courses = @user.courses.where("is_delete = 1")
+    course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
+    @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
     @type = params[:type]
     @limit = 15
     @is_remote = true
@@ -933,6 +949,7 @@ class UsersController < ApplicationController
         @student_work = StudentWork.new
       end
       @course = @homework.course
+      @left_nav_type = 3
       respond_to do |format|
         format.js
         format.html {render :layout => 'base_courses'}
@@ -1549,7 +1566,11 @@ class UsersController < ApplicationController
         when "current_user"
           @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
         else
-          blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+          if @user == User.current
+            blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+          else
+            blog_ids = "("+@user.blog.id.to_s+")"
+          end
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
                                                     "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
                                                     "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
@@ -1559,8 +1580,12 @@ class UsersController < ApplicationController
       #  @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
       # blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
       # 减少数据库交互
-      watched_user_ids = User.watched_by(@user.id).count == 0 ? " " : ("," + User.watched_by(@user.id).map{|u| u.id.to_s }.join(','))
-      user_ids = "(" + @user.id.to_s + watched_user_ids + ")"
+      if @user == User.current
+        watched_user_ids = User.watched_by(@user.id).count == 0 ? " " : ("," + User.watched_by(@user.id).map{|u| u.id.to_s }.join(','))
+        user_ids = "(" + @user.id.to_s + watched_user_ids + ")"
+      else
+        user_ids = "(" + @user.id.to_s + ")"
+      end
       watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}")
       blog_ids = watched_user_blog_ids.empty? ? "(-1)" : "(" + watched_user_blog_ids.map { |blog| blog.id}.join(",") + ")"
 
@@ -3312,19 +3337,22 @@ class UsersController < ApplicationController
         when 'News'
           obj = News.where('id = ?', params[:id].to_i).first
           @journals = obj.comments.reorder("created_on desc")
+          @type = 'News'
+          @user_activity_id = params[:div_id].to_i if params[:div_id]
         when 'Syllabus'
           obj = Syllabus.where('id = ?', params[:id].to_i).first
-          @journals = obj.comments.reorder("created_on desc")
+          @journals = obj.journals_for_messages.reorder("created_on desc")
         when 'JournalsForMessage'
           obj = JournalsForMessage.where('id = ?', params[:id].to_i).first
           journals = []
           @journals = get_all_children(journals, obj)
           @type = 'JournalsForMessage'
           @user_activity_id = params[:div_id].to_i if params[:div_id]
-          @allow_delete = params[:allow_delete]
         when 'Issue'
           obj = Issue.where('id = ?', params[:id].to_i).first
           @journals = obj.journals.reorder("created_on desc")
+          @type = 'Issue'
+          @user_activity_id = params[:div_id].to_i if params[:div_id]
         when 'BlogComment'
           obj = BlogComment.where('id = ?', params[:id].to_i).first
           @user_activity_id = params[:div_id].to_i if params[:div_id]
@@ -3334,6 +3362,7 @@ class UsersController < ApplicationController
           @journals = get_all_children(comments, obj)
         when 'HomeworkCommon'
           obj = HomeworkCommon.where('id = ?', params[:id].to_i).first
+          @type = 'HomeworkCommon'
           @journals = obj.journals_for_messages.reorder("created_on desc")
           @is_in_course = params[:is_in_course].to_i if params[:is_in_course]
           @course_activity = params[:course_activity].to_i if params[:course_activity]
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index d1f4bfe97..42511f218 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -35,7 +35,7 @@ module CoursesHelper
          and (c.is_excellent =1 or c.excellent_option =1) and c.is_public = 1 and c.id != #{current_course.id} order by cs.updated_at desc;"
     default_ids = Course.find_by_sql(sql).flatten.map { |c| c.id }
     excellent_ids << default_ids.flatten
-    arr_result = excellent_ids.flatten.uniq.first(5)
+    arr_result = excellent_ids.flatten.uniq.first(3)
     excellent_courses = Course.find(arr_result)
     return excellent_courses
   end
@@ -78,18 +78,18 @@ module CoursesHelper
   #生成课程老师成员链接
   def course_teacher_link teacher_num
     if User.current.member_of_course?(@course) || User.current.admin?
-      link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue', :id => 'teacher_number'
+      link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'sy_cblue', :id => 'teacher_number'
     else
-      content_tag 'span',teacher_num, :class => 'info_foot_num c_blue'
+      content_tag 'span',teacher_num, :class => 'sy_cblue'
     end
   end
 
   #生成课程学生列表连接
   def course_student_link student_num
     if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin?
-      link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue', :id => "student_number"
+      link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'sy_cblue', :id => "student_number"
     else
-      content_tag 'span',student_num, :class => 'info_foot_num c_blue'
+      content_tag 'span',student_num, :class => 'sy_cblue'
     end
   end
 
@@ -772,12 +772,12 @@ module CoursesHelper
       url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id)
       method = joined ? 'delete' : 'post'
       if joined
-        link = link_to(text, url, :remote => true, :method => method, :class => "Blue-btn", :style => "margin_left: 0px;", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))
+        link = link_to(text, url, :remote => true, :method => method, :class => "sy_btn_grey fl", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))
       else
-        link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "Blue-btn", :style => "margin_left: 0px;")
+        link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "sy_btn_grey fl")
       end
     else
-      link = "<span class='pr_join_span mr5' >#{l(:label_course_join_student)}</span>"
+      link = "<a href='javascript:void(0)' class='sy_btn_grey fl ml10' >#{l(:label_course_join_student)}</a>"
     end
     link.html_safe
   end
@@ -872,7 +872,7 @@ module CoursesHelper
     desc.html_safe
   end
 
-  # 学生按作业总分排序，取前8个
+  # 学生按作业总分排序，取前3个
   def hero_homework_score(course, score_sort_by)
     sql_select = "SELECT members.*,(
           SELECT SUM(work_score)
@@ -884,14 +884,14 @@ module CoursesHelper
         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} limit 9"
+        WHERE members.course_id = #{course.id} ORDER BY score #{score_sort_by} limit 3"
     homework_scores = Member.find_by_sql(sql_select)
   end
 
   def contributor_course_scor(course_id)
     ccs = CourseContributorScore.find_by_sql("SELECT * FROM `course_contributor_scores` where course_id = #{course_id} order by
         (message_num*2 + message_reply_num + news_reply_num + news_num +
-         resource_num*5 + journal_num + homework_journal_num ) desc limit 9;")
+         resource_num*5 + journal_num + homework_journal_num ) desc limit 3;")
   end
 
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 80b52a8f4..633c9a825 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -33,10 +33,11 @@ class Comment < ActiveRecord::Base
                 :title=>Proc.new {|o| "RE: #{o.commented.title}" },
                 :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.commented.id} }
 
+  acts_as_tree :counter_cache => :comments_count, :order => "#{Comment.table_name}.created_on ASC"
   belongs_to :commented, :polymorphic => true, :counter_cache => true,:touch => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   validates_presence_of :commented, :author, :comments
-  safe_attributes 'comments'
+  safe_attributes 'comments','parent_id','reply_id','comments_count'
   after_create :send_mail, :act_as_system_message, :act_as_student_score
   after_destroy :down_course_score
 
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 0f88fcb7f..d2cc9e539 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -37,6 +37,7 @@ class Journal < ActiveRecord::Base
   has_many :at_messages, as: :at_message, dependent: :destroy
   acts_as_attachable
   attr_accessor :indice
+  acts_as_tree :counter_cache => :comments_count, :order => "#{Journal.table_name}.created_on ASC"
 
   acts_as_event :title =>Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.project_index}#{status}: #{o.issue.subject}" },
                 :description =>:notes,
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index ab4b65f5c..d864b6462 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -162,7 +162,7 @@ class CoursesService
         raise '403'
       end
     end
-    @comments = @news.comments
+    @comments = @news.comments.reorder("created_on desc")
     @comments.reverse! if current_user.wants_comments_in_reverse_order?
     {:news => @news,:comments => @comments}
 
diff --git a/app/views/blog_comments/_edit.html.erb b/app/views/blog_comments/_edit.html.erb
index 048402635..b9d10527d 100644
--- a/app/views/blog_comments/_edit.html.erb
+++ b/app/views/blog_comments/_edit.html.erb
@@ -39,6 +39,8 @@
           %>
           <div class="cl"></div>
           <p id="message_content_span"></p>
+          <p id="e_tip" class="c_grey"></p>
+          <p id="e_tips" class="c_grey"></p>
         </div>
         <div class="cl"></div>
         <div class="mt10">
@@ -56,4 +58,11 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    $(function(){
+        setTimeout(function(){
+            elocalStorage(message_content_editor,'blog_<%=User.current.id %>');
+        }, 10000);
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/blog_comments/_new.html.erb b/app/views/blog_comments/_new.html.erb
index e336c7d01..de7be84c1 100644
--- a/app/views/blog_comments/_new.html.erb
+++ b/app/views/blog_comments/_new.html.erb
@@ -36,6 +36,8 @@
                                             :maxlength => 5000 }%>
           <div class="cl"></div>
           <p id="message_content_span"></p>
+          <p id="e_tip" class="c_grey"></p>
+          <p id="e_tips" class="c_grey"></p>
         </div>
         <div class="cl"></div>
         <div class="mt10">
@@ -62,4 +64,4 @@
       <div class="cl"></div>
     </li>-->
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index bde98d456..f5c7c9094 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -135,13 +135,8 @@
                   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
                 </div>
                 <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-                    <%= time_from_now(comment.created_on) %>
-                  </div>
-                  <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-                      <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
-                  <% end %>
+                  <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
+
                   <% if !comment.content_detail.blank? %>
                       <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                         <%= comment.content_detail.html_safe %>
diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb
index d5a5c0d64..a16547836 100644
--- a/app/views/blogs/_homepage.html.erb
+++ b/app/views/blogs/_homepage.html.erb
@@ -51,13 +51,13 @@
   <% all_comments = []%>
   <% count=get_all_children(all_comments, activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/blog_comment_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 1} %>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 1} %>
 
     <% all_comments = []%>
     <% comments = get_all_children(all_comments, activity)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/blog_comments_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1}%>
         </div>
     <% end %>
 
diff --git a/app/views/blogs/index.html.erb b/app/views/blogs/index.html.erb
index 50db24063..f473ab534 100644
--- a/app/views/blogs/index.html.erb
+++ b/app/views/blogs/index.html.erb
@@ -184,3 +184,10 @@ function nh_init_board(params){
 
 
 </script>
+<script type="text/javascript">
+    $(function(){
+        setTimeout(function(){
+            elocalStorage(message_content_editor,'blog_<%=User.current.id %>');
+        }, 10000);
+    });
+</script>
diff --git a/app/views/comments/_simple_ke_reply_form.html.erb b/app/views/comments/_simple_ke_reply_form.html.erb
new file mode 100644
index 000000000..764d4a1af
--- /dev/null
+++ b/app/views/comments/_simple_ke_reply_form.html.erb
@@ -0,0 +1,20 @@
+<div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+  <div class="ReplyToMessageInputContainer mb10">
+    <% if User.current.logged? %>
+        <div nhname='new_message_<%= reply.id%>'>
+          <%= form_for @comment, :as => :reply, :url => {:controller => 'comments',:action => 'reply', :id => @comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
+              <div nhname='toolbar_container_<%= reply.id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
+              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= reply.id%>'></p>
+          <% end%>
+        </div>
+    <% else %>
+        <%= render :partial => "users/show_unlogged" %>
+    <% end %>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
new file mode 100644
index 000000000..e8f425a85
--- /dev/null
+++ b/app/views/comments/destroy.js.erb
@@ -0,0 +1,10 @@
+<% if @user_activity_id %>
+    <% if @news.project_id && @news.project_id != -1 %>
+        $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    <% elsif @news.course_id %>
+        $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    <% elsif @news.org_subfield_id %>
+        $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    <% end %>
+<% end %>
+sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "<%=@news.class.to_s%>");
diff --git a/app/views/comments/quote.js.erb b/app/views/comments/quote.js.erb
new file mode 100644
index 000000000..cc5bc98ac
--- /dev/null
+++ b/app/views/comments/quote.js.erb
@@ -0,0 +1,8 @@
+if($("#reply_message_<%= @comment.id%>").length > 0) {
+    $("#reply_message_<%= @comment.id%>").replaceWith("<%= escape_javascript(render :partial => 'comments/simple_ke_reply_form', :locals => {:reply => @comment}) %>");
+    $(function(){
+        sd_create_editor_from_data(<%= @comment.id%>,null,"100%", "<%=@comment.class.to_s%>");
+    });
+}else if($("#reply_to_message_<%= @comment.id %>").length >0) {
+    $("#reply_to_message_<%= @comment.id%>").replaceWith("<p id='reply_message_<%= @comment.id %>'></p>");
+}
\ No newline at end of file
diff --git a/app/views/comments/reply.js.erb b/app/views/comments/reply.js.erb
new file mode 100644
index 000000000..e8f425a85
--- /dev/null
+++ b/app/views/comments/reply.js.erb
@@ -0,0 +1,10 @@
+<% if @user_activity_id %>
+    <% if @news.project_id && @news.project_id != -1 %>
+        $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    <% elsif @news.course_id %>
+        $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    <% elsif @news.org_subfield_id %>
+        $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    <% end %>
+<% end %>
+sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "<%=@news.class.to_s%>");
diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb
index 3b19de355..8b4df3e83 100644
--- a/app/views/courses/_course_activity_users.html.erb
+++ b/app/views/courses/_course_activity_users.html.erb
@@ -1,13 +1,15 @@
 <% unless contributor_course_scor(course.id).count == 0 %>
-    <ul class="rankList">
-      <h4>
+    <div>
+      <ul class="rankList">
+      <h3 style="font-size: 14px; font-weight: normal;">
         <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "班级活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => '' %>
+            <%= link_to "班级活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => 'sy_cblack' %>
         <% else %>
             班级活跃度
         <% end %>
-        <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
-      </h4>
+        <a class="sy_cmore fr" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
+        <div class="cl"></div>
+      </h3>
       <div  class="numIntro undis" style="cursor:pointer;">
         <div class="active-degree-rule">
           积分规则<br/>
@@ -26,10 +28,11 @@
                   + contributor_score.homework_journal_num.to_i * 1 + contributor_score.news_reply_num.to_i * 1 +
                   contributor_score.news_num.to_i * 1 %>
           <% unless total_score ==0 %>
-              <li><%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %>
+              <li>
+                <%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "50", :height => "50", :class=> "rankPortrait"),user_path(contributor_score.user) %>
                 <p><%=link_to contributor_score.user.show_name, user_path(contributor_score.user.id), :title => contributor_score.user.show_name %></p>
-                <p><span class="c_green" style="cursor:pointer">
-                <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
+                <p><span class="sy_corange" style="cursor:pointer">
+                <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="sy_corange">
                   <%=total_score %></a></span></p>
                 <div  style="display: none" class="numIntro">
                   <div class="contributor-course-calculate">积分计算</div>
@@ -60,5 +63,6 @@
           <% end %>
       <% end %>
       <div class="cl"></div>
-    </ul>
+      </ul>
+    </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb
index ea05eea53..4699c12d2 100644
--- a/app/views/courses/_course_heroes.html.erb
+++ b/app/views/courses/_course_heroes.html.erb
@@ -1,9 +1,9 @@
 <% hero_homework_scores = hero_homework_score(course, "desc") %>
 <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
     <ul class="rankList">
-      <h4>
+      <h4 style="font-size: 14px; font-weight: normal;">
         <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "班级英雄榜", course_member_path(course, :role => 2), :class => '' %>
+            <%= link_to "班级英雄榜", course_member_path(course, :role => 2), :class => 'sy_cblack' %>
         <% else %>
             <span>班级英雄榜</span>
         <% end %>
diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb
index 1db2edf57..ea129577b 100644
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@@ -1,25 +1,15 @@
 <% exc_course = excellent_course_recommend(course) %>
 <% unless exc_course.length == 0 %>
-    <ul class="courseR mb10">
-      <h4 class="mb5" ><%= l(:label_homework_recommendation) %>：</h4>
-      <% exc_course.each do |e_course| %>
-          <li class="mt15"> <%= image_tag(url_to_avatar(e_course), :width => "40", :height => "40", :class => "fl mr10 rankPortrait", :alt => "logo") %>
-            <div class="fl">
-              <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %><div class="cl"></div> </p>
-              <p class="f12">
-                <% if visable_attachemnts_incourse(e_course).count > 0 %>
-                    <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to visable_attachemnts_incourse(e_course).count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
-                <% end %>
-                <% if e_course.homework_commons.where("publish_time <= '#{Date.today}'").count > 0 %>
-                    <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.where("publish_time <= '#{Date.today}'").count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>
-                <% end %>
-                <div class="cl"></div>
-                </p>
-                </div>
-            <div class="cl"></div>
+    <ul class="sy_class_lclass">
+      <% exc_course.each_with_index do |e_course, i| %>
+          <li>
+            <span class="sy_sq_orange fl mr5 mt5"><%= i+1 %></span>
+            <%=link_to e_course.name, course_path(e_course.id), :class => "sy_class_ltitle fl mb10" %>
+            <p class="sy_cgrey ml20">作业<span class="sy_cir_grey ml5 mr5"><%=e_course.homework_commons.where("publish_time <= '#{Date.today}'").count %></span>
+              资源<span class="sy_cir_grey ml5 mr5"><%=visable_attachemnts_incourse(e_course).count %></span>
+            </p>
           </li>
       <% end %>
-      <div class="cl"></div>
     </ul>
 <% end %>
 
diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb
index 52a971826..c41edf680 100644
--- a/app/views/courses/_tool_expand.html.erb
+++ b/app/views/courses/_tool_expand.html.erb
@@ -1,47 +1,53 @@
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
+<% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
+    <li>
+      <a href="<%=course_boards_path(@course) %>">问答区</a>
+      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %>
+    </li>
+<% end %>
 <% if show_nav?(@course.homework_commons.count) %>
-    <div class="subNav">
-      <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f12 c_blue02 ml10 fn"%>
-      <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
-    </div>
+    <li>
+      <a href="<%= homework_common_index_path(:course => @course.id) %>">作业</a>
+      <%= link_to( "",homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
+    </li>
 <% end %>
 <% if show_nav?(@course.news.count) %>
-    <div class="subNav">
-      <%= link_to "通知", course_news_index_path(@course), :class => "f12 c_blue02 ml10 fn" %>
-      <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
-    </div>
+    <li>
+      <a href="<%=course_news_index_path(@course) %>">通知</a>
+      <%= link_to( "",new_course_news_path(@course,:is_new=>1), :class => 'sy_class_add', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
+    </li>
 <% end %>
 <% if show_nav?(course_file_num) %>
-    <div class="subNav">
-      <%= link_to l(:label_course_file), course_files_path(@course), :class => "f12 c_blue02 ml10 fn" %>
+    <li>
+      <a href="<%=course_files_path(@course) %>">资源库</a>
       <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
-          <!--link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white')-->
-          <a class="courseMenuSetting" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
+          <a class="sy_class_add" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
       <% end %>
-    </div>
-<% end %>
-<% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
-    <div class="subNav">
-      <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f12 c_blue02 ml10 fn" %>
-      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
-    </div>
+    </li>
 <% end %>
 <% if show_nav?(course_feedback_count) %>
-    <div class="subNav">
-      <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f12 c_blue02 ml10 fn" %>
-      <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
-    </div>
+    <li>
+      <a href="<%=course_feedback_path(@course) %>">留言</a>
+      <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
+    </li>
 <% end %>
 <% if show_nav?(course_poll_count) %>
-    <div class="subNav">
-      <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f12 c_blue02 ml10 fn"%>
-      <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
-    </div>
+    <li>
+      <a href="<%=poll_index_path(:polls_type => "Course", :polls_group_id => @course.id) %>">问卷调查</a>
+      <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'sy_class_add', :title =>"#{l(:label_new_poll)}") if is_teacher %>
+    </li>
 <% end %>
-<% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
-    <div class="subNav">
-      <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f12 c_blue02 ml10 fn"%>
-      <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
-    </div>
+<% count = User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count %>
+<% if show_nav?(count) %>
+    <li>
+      <a href="<%=exercise_index_path(:course_id => @course.id) %>">在线测验</a>
+      <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
+    </li>
+<% end %>
+<% if show_nav?(0) %>
+    <li>
+      <a href="<%=statistics_course_course_path(@course) %>">统计</a>
+      <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
+    </li>
 <% end %>
\ No newline at end of file
diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb
index c45259efd..5eae03656 100644
--- a/app/views/courses/feedback.html.erb
+++ b/app/views/courses/feedback.html.erb
@@ -1,5 +1,7 @@
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <!-- <#%= stylesheet_link_tag  'css', :media => 'all' %> -->
+<div class="courseRSide fl">
+
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_contest_userresponse) %></h2>
 </div>
@@ -9,4 +11,5 @@
            :locals => { :contest => @contest, :journals => @jour, :state => false}
 %>
 
-<% html_title(l(:label_course_feedback)) -%>
\ No newline at end of file
+<% html_title(l(:label_course_feedback)) -%>
+</div>
\ No newline at end of file
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index d53e89e77..fe6b3e596 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -8,11 +8,11 @@
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
           <% if @syllabus.nil? %>
               <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"}  %>
+              <span class="c_red" id="new_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%></span>
           <% else %>
               <span><%=@syllabus.title %></span>
               <input style="display: none;" name="syllabus_id" value="<%=@syllabus.id %>" />
           <% end %>
-          <span class="c_red" id="new_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%></span>
         </li>
         <div class="cl"></div>
         <li  class="ml45">
diff --git a/app/views/courses/statistics_course.html.erb b/app/views/courses/statistics_course.html.erb
new file mode 100644
index 000000000..ce3d65743
--- /dev/null
+++ b/app/views/courses/statistics_course.html.erb
@@ -0,0 +1,5 @@
+<div class="sy_class_r ml10">
+  <div class="icons_tishi"><img src="../../images/sy/icons_smile.png" width="110" height="110" alt="" ></div>
+  <p class="sy_tab_con_p">统计功能即将上线，届时我们一起享受教育大数据的红利吧！</p>
+  <div style="height:400px;"></div>
+</div><!--sy_class_r end-->
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 9d70511e8..50df61cc9 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -2,7 +2,7 @@
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#homework_page_right").css("min-height",$("#courseLSide").height()-33);
         $("#Container").css("width","1000px");
     });
     //编辑问卷描述之后
diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index 4f4892b79..e157ea155 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -1,7 +1,7 @@
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#homework_page_right").css("min-height",$("#courseLSide").height()-33);
         $("#Container").css("width","1000px");
         var end_time = <%=exercise.end_time.to_i%>;
         getTime(end_time);
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 59a58901c..e010c4af3 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -1,7 +1,7 @@
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#homework_page_right").css("min-height",$("#courseLSide").height()-33);
         $("#Container").css("width","1000px");
     });
 </script>
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index ce3928817..78bf2b7be 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -1,7 +1,7 @@
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#homework_page_right").css("min-height",$("#courseLSide").height()-33);
         $("#Container").css("width","1000px");
     });
 </script>
diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb
index 8637273f1..68adfb4d4 100644
--- a/app/views/exercise/index.html.erb
+++ b/app/views/exercise/index.html.erb
@@ -1,9 +1,7 @@
 <%= stylesheet_link_tag  'polls', :media => 'all' %>
 <script type="text/javascript">
     $(function(){
-        $("#RSide").css("width","730px");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
-        $("#Container").css("width","1000px");
+        $("#homework_page_right").css("min-height",$("#courseLSide").height()-33);
     });
     function republish_exercise(exercise_id,index)
     {
@@ -63,6 +61,8 @@
     }
 
 </script>
+<div class="courseRSide fl" id="homework_page_right">
 <div class="polls_content02" id="exercise" style="width: 730px;">
   <%= render :partial => 'exercises_list'%>
-</div><!--问卷内容end-->
\ No newline at end of file
+</div><!--问卷内容end-->
+</div>
\ No newline at end of file
diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb
index 02f161589..1cbe058a1 100644
--- a/app/views/exercise/student_exercise_list.html.erb
+++ b/app/views/exercise/student_exercise_list.html.erb
@@ -1,7 +1,7 @@
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#homework_page_right").css("min-height",$("#courseLSide").height()-47);
         $("#Container").css("width","1000px");
     });
 
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index c120ca1b9..344987913 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -1,54 +1,55 @@
 <ul>
-  <% issue.journals.reorder("created_on desc").each do |reply| %>
+  <% issue.journals.reorder("created_on desc").each do |comment| %>
       <script type="text/javascript">
           $(function(){
-              showNormalImage('reply_content_<%= reply.id %>');
-              autoUrl('reply_content_<%= reply.id %>');
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
           });
       </script>
-      <% replies_all_i=replies_all_i + 1 %>
-      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();" >
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
         <div class="homepagePostReplyPortrait" >
-          <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+          <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
         </div>
         <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <% if reply.try(:user).try(:realname) == ' ' %>
-                <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-            <% else %>
-                <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-            <% end %>
-            <%#= format_time(reply.created_on) %>
-          </div>
-          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-            <% if reply.details.any? %>
-                <% details_to_strings(reply.details).each do |string| %>
+          <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>
+
+          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+            <% if comment.details.any? %>
+                <% details_to_strings(comment.details).each do |string| %>
                     <p><%= string %></p>
                 <% end %>
             <% end %>
-            <P><%= reply.notes.html_safe %></P>
+            <P><%= comment.notes.html_safe %></P>
           </div>
-          <div style="margin-top: 7px">
-            <%= format_time(reply.created_on) %>
-            <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-              <%= link_to(
-                          l(:button_reply),
-                          {:controller => 'issues', :action => 'reply', :user_id => reply.user_id, :id => issue.id, :journal_id => reply.id},
-                          :remote => true,
-                          :method => 'get',
-                          :class => 'fr newsBlue',
-                          :title => l(:button_reply)) if  User.current.logged?  %>
-              <%= link_to(
-                          l(:button_delete),
-                          {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>reply.id},
-                          :method => :get,
-                          :class => 'fr newsGrey mr10',
-                          :data => {:confirm => l(:text_are_you_sure)},
-                          :title => l(:button_delete)
-                  ) if reply.user_id == User.current.id %>
+          <div class="orig_reply mb10 mt-10">
+            <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%= comment.id %>">
+                      <%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
+                    </span>
+                    <span style="position: relative" class="fr mr20">
+                      <%= link_to(
+                                  l(:button_reply),
+                                  {:controller => 'issues', :action => 'reply', :user_id => comment.user_id, :id => issue.id, :journal_id => comment.id},
+                                  :remote => true,
+                                  :method => 'get',
+                                  :title => l(:button_reply)) %>
+                      <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                  <%= link_to(
+                              l(:button_delete),
+                              {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>comment.id},
+                              :method => :get,
+                              :remote=>true,
+                              :class => 'fr mr20',
+                              :data => {:confirm => l(:text_are_you_sure)},
+                              :title => l(:button_delete)
+                      ) if comment.user_id == User.current.id %>
+                </span>
+              <div class="cl"></div>
             </div>
           </div>
-          <p id="reply_message_<%= reply.id%>"></p>
+          <p id="reply_message_<%= comment.id%>"></p>
         </div>
         <div class="cl"></div>
       </li>
@@ -64,17 +65,15 @@
     <% if User.current.logged? %>
         <div nhname='new_message_<%= @issue.id %>' style="display:none;">
           <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
-              <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-              <!--<div class="cl"></div>-->
               <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
               <div nhname='toolbar_container_<%= @issue.id %>' ></div>
               <div class="cl"></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
               <div class="cl"></div>
               <div class="mt5 fl">
-                <%= render :partial => 'attachments/issue_reply', :locals => {:container => @jour.nil? ? @issue : @jour} %>
+                <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
               </div>
-              <span nhname='contentmsg_<%= @issue.id %>' class="fl mt8"></span>
+              <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
               <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
               <div class="cl"></div>
           <% end %>
@@ -82,7 +81,6 @@
     <% else %>
         <%= render :partial => "users/show_unlogged" %>
     <% end %>
-    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
     <div class="cl"></div>
 
   </div>
diff --git a/app/views/issues/_issue_reply_ke_form.html.erb b/app/views/issues/_issue_reply_ke_form.html.erb
index 87b599aa3..cf4c3e504 100644
--- a/app/views/issues/_issue_reply_ke_form.html.erb
+++ b/app/views/issues/_issue_reply_ke_form.html.erb
@@ -1,30 +1,26 @@
-<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @issue.id%>">
+<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @jour.id%>">
 
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @jour.id%>">
     <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
   </div>
 
   <div class="ReplyToMessageInputContainer mb10">
     <% if User.current.logged? %>
-        <div nhname='new_message_<%= @issue.id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post") do |f|%>
-              <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-              <!--<div class="cl"></div>-->
-              <input type="hidden" name="quote" value=""/>
-              <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
-              <div nhname='toolbar_container_<%= @issue.id%>' ></div>
+        <div nhname='new_message_<%= @jour.id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="journal_id" value="<%=@jour.id%>"/>
+              <div nhname='toolbar_container_<%= @jour.id%>' ></div>
               <div class="cl"></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @jour.id%>' name="content"></textarea>
               <div class="cl"></div>
-              <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
-              <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <span nhname='contentmsg_<%= @jour.id%>' class="fl"></span>
+              <a id="new_message_submit_btn_<%= @jour.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
           <% end %>
         </div>
     <% else %>
         <%= render :partial => "users/show_unlogged" %>
     <% end %>
-    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
     <div class="cl"></div>
 
   </div>
diff --git a/app/views/issues/add_reply.js.erb b/app/views/issues/add_reply.js.erb
index 500451781..a818830cd 100644
--- a/app/views/issues/add_reply.js.erb
+++ b/app/views/issues/add_reply.js.erb
@@ -1,3 +1,8 @@
-$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
-$(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue).journals.count %>)')
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
\ No newline at end of file
+<% if @user_activity_id %>
+    $("#div_user_issue_reply_<%=@user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
+    sd_create_editor_from_data(<%= @user_activity_id%>, null, "100%","<%=@issue.class.name%>");
+<% else %>
+    $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue}) %>");
+    $(".homepagePostReplyBannerCount").html('回复（<%= @issue.journals.count %>）');
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
+<% end %>
\ No newline at end of file
diff --git a/app/views/issues/delete_journal.js.erb b/app/views/issues/delete_journal.js.erb
index 7c7f25c1c..120c4bf7e 100644
--- a/app/views/issues/delete_journal.js.erb
+++ b/app/views/issues/delete_journal.js.erb
@@ -1,3 +1,8 @@
+<% if @user_activity_id %>
+$("#div_user_issue_reply_<%=@user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
+sd_create_editor_from_data(<%= @user_activity_id%>, null, "100%","<%=@issue.class.name%>");
+<% else %>
 $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
 $(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
\ No newline at end of file
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
+<% end %>
\ No newline at end of file
diff --git a/app/views/issues/reply.js.erb b/app/views/issues/reply.js.erb
index 2d42475f6..11f067f77 100644
--- a/app/views/issues/reply.js.erb
+++ b/app/views/issues/reply.js.erb
@@ -1,9 +1,8 @@
 if($("#reply_message_<%= @jour.id%>").length > 0) {
     $("#reply_message_<%= @jour.id%>").replaceWith("<%= escape_javascript(render :partial => 'issues/issue_reply_ke_form') %>");
     $(function(){
-        $('input[name=quote]').val("<%= raw escape_javascript(@tempContent.html_safe) %>");
-        sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
+        sd_create_editor_from_data(<%= @jour.id%>, null, "100%", "<%= @jour.class.name %>");
     });
-}else if($("#reply_to_message_<%= @issue.id%>").length >0) {
-    $("#reply_to_message_<%= @issue.id%>").replaceWith("<p id='reply_message_<%= @jour.id%>'></p>");
+}else if($("#reply_to_message_<%= @jour.id%>").length >0) {
+    $("#reply_to_message_<%= @jour.id%>").replaceWith("<p id='reply_message_<%= @jour.id%>'></p>");
 }
\ No newline at end of file
diff --git a/app/views/layouts/_base_course_old.html.erb b/app/views/layouts/_base_course_old.html.erb
new file mode 100644
index 000000000..4b2077cf8
--- /dev/null
+++ b/app/views/layouts/_base_course_old.html.erb
@@ -0,0 +1,278 @@
+<%# course_model %>
+<% course_file_num = visable_attachemnts_incourse(@course).count%>
+<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
+<% homework_num = visable_course_homework @course %>
+
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="utf-8">
+  <title>
+    <%= h html_title %>
+  </title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>"/>
+  <meta name="keywords" content="issue,bug,tracker"/>
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup'%>
+  <%= javascript_include_tag "course","sy_public", "syllabus","header","attachments",'prettify' %>
+  <!-- page specific tags -->
+  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!--<script type="text/javascript"-->
+  <!--src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">-->
+  <!--</script>-->
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
+</head>
+<!--add by huang-->
+<body onload="prettyPrint();">
+<div class="navContainer mb10">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+<div id="Container">
+  <div id="content">
+    <div id="LSide" class="fl">
+      <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
+        <%=render :partial=>'layouts/project_info' %>
+      </div><!--课程信息 end-->
+
+      <div class="info_box">
+        <ul>
+          <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
+          <li><%= l(:label_class_period)%> :&nbsp;&nbsp;<span ><%= @course.class_period %> <%= l(:label_class_hour) %></span></li>
+          <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= current_time_and_term @course %></span></li>
+          <% if @course.school%>
+              <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<%= @course.school%></li>
+          <% end%>
+        </ul>
+      </div>
+
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @course %>
+      <%# over %>
+
+      <div class="subNavBox">
+        <% unless show_nav?(@course.course_activities.count) %>
+            <div class="subNav">
+              <%= link_to l(:label_activity), course_path(@course), :class => "f14 c_blue02" %>
+              <!--暂时不显示课程动态数，优化后在显示-->
+              <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%>
+            </div>
+        <% end %>
+        <% unless show_nav?(@course.homework_commons.count) %>
+            <div class="subNav">
+              <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
+              <%= link_to "(#{homework_num})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
+              <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
+            </div>
+        <% end %>
+        <% unless show_nav?(@course.news.count) %>
+            <div class="subNav">
+              <%= link_to "通知", course_news_index_path(@course), :class => "f14 c_blue02" %>
+              <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%>
+              <%= link_to( "", new_course_news_path(@course,:is_new=>1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
+            </div>
+        <% end %>
+        <% unless show_nav?(course_file_num) %>
+            <div class="subNav">
+              <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
+              <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
+              <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
+                  <!--link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white')-->
+                  <a class="courseMenuSetting" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
+              <% end %>
+            </div>
+        <% end %>
+        <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
+            <div class="subNav">
+              <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
+              <%= link_to "(#{@course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
+              <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
+            </div>
+        <% end %>
+        <% unless show_nav?(course_feedback_count) %>
+            <div class="subNav">
+              <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>
+              <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%>
+              <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
+            </div>
+        <% end %>
+        <% unless show_nav?(course_poll_count) %>
+            <div class="subNav">
+              <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%>
+              <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %>
+              <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
+            </div>
+        <% end %>
+        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count) %>
+            <div class="subNav">
+              <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%>
+              <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>
+              <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
+            </div>
+        <% end %>
+        <%# 工具栏展开 %>
+        <% if @course.homework_commons.count == 0 || @course.news.count == 0 || course_file_num == 0 || course_poll_count == 0 || @course.exercises.count == 0 ||
+                course_feedback_count == 0 || @course.exercises.count == 0 || (@course.boards.first ? @course.boards.first.topics.count : 0) == 0 %>
+
+            <div class="subNav subNav_jiantou" id="expand_tools_expand"><%= l(:label_project_more) %></div>
+            <ul class="navContent" id="navContentCourse">
+              <%= render 'courses/tool_expand', :locals => {:is_teacher => is_teacher, :course_file_num => course_file_num} %>
+            </ul>
+        <% end %>
+      </div><!--项目侧导航 end-->
+      <%# 课程活跃度 %>
+      <div class="cl"></div>
+      <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %>
+      <%# 课程英雄榜 %>
+      <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
+
+      <% if @course.description && !@course.description.blank? %>
+          <div class="project_intro">
+            <div id="course_description" class="course_description">
+              <h4 ><%= l(:label_course_brief_introduction)%>：</h4>
+              <div id="course_description_content">
+                <%= textilizable(@course.description) if @course.description && !@course.description.blank? %>
+              </div>
+            </div>
+            <div class="lg-foot" id="lg-foot" onclick="show_more_msg();">
+              <label id="expend_more_information"  value="show_more"><%= l(:label_expend_information)%></label>
+          <span class="g-arr-down">
+            <img id="arrow" src="/images/jiantou.jpg" width="12" height="6" />
+          </span>
+            </div>
+          </div><!--项目简介 end-->
+      <% end %>
+      <div class="project_Label">
+        <h4 class="mb5" ><%= l(:label_tag)%>：</h4>
+        <div class="tag_h" >
+          <%= render :partial => 'tags/new_tag', :locals => {:obj => @course, :object_flag => "9"} %>
+        </div>
+        <div class="cl"></div>
+      </div><!--项目标签 end-->
+      <!--课程推荐-->
+      <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %> （自2016年5月）</div>
+    </div><!--LSide end-->
+
+    <div id="RSide" class="fl">
+      <%= yield %>
+      <%#= render_flash_messages %>
+      <%#= call_hook :view_layouts_base_content %>
+    </div>
+
+    <div class="cl"></div>
+
+  </div><!--Content end-->
+</div><!--Container end-->
+
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
+<%= render :partial => 'layouts/new_feedback' %>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<div id="ajax-modal" style="display:none;"></div>
+<%= call_hook :view_layouts_base_body_bottom %>
+</body>
+<script>
+    var blog_artile_list_html = '';
+    $(function(){
+        $(document).on('input','input[name="course_outline_search"]',function(e){
+            throttle(course_outline_search,window,e);
+        })
+        function throttle(method,context,e){
+            clearTimeout(method.tId);
+            method.tId=setTimeout(function(){
+                method.call(context,e);
+            },500);
+        }
+        function course_outline_search(e){
+//            if($(e.target).val().trim() == ''){
+//                return;
+//            }
+            $("#course_outline_hint").hide();
+            $.ajax({
+                url:'<%=search_course_outline_course_path(@course) %>'+"?&title="+ e.target.value,
+                type:'post',
+                success:function(data){
+
+                    if(data.length != 0 ){
+                        $("#course_outline_list").html('');
+                        for(var i =0;i<data.length;i++){
+                            var html = ' <ul class="blogRow"> '+
+                                    ' <li class="fl"> '+
+                                    '<input name="outline_id" type="radio" value="'+data[i].blog_comment.id+'" class="courseSendCheckbox"/>'+
+                                    '</li>'+
+                                    '<li class="blogTitle fl">'+data[i].blog_comment.title+'</li>'+
+                                    '</ul>'+
+                                    '<div class="homeworkPublishTime">发布时间：'+data[i].blog_comment.created_at.match(/(\S*)T/)[1]+'</div>';
+                            $("#course_outline_list").append(html)
+                        }
+
+                    }else{
+                        $("#course_outline_list").html('');
+                        $("#course_outline_hint").show();
+                    }
+                }
+            })
+        }
+
+    })
+    //资源库上传附件
+    function course_files_upload(){
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+    //    鼠标经过的时候显示内容
+    function message_titile_show(obj,e)
+    {
+        obj.parent().parent().next("div").show();
+        obj.parent().next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute");
+    }
+    function message_titile_hide(obj)
+    {
+        obj.parent().parent().next("div").hide();
+    }
+
+    function message_titile_show2(obj,e)
+    {
+        obj.parent().next("div").show();
+        obj.parent().next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute");
+    }
+    function message_titile_hide2(obj)
+    {
+        obj.parent().next("div").hide();
+    }
+
+    $("#expand_tools_expand").click(function(){
+        $("#navContentCourse").toggle();
+    });
+</script>
+
+</html>
\ No newline at end of file
diff --git a/app/views/layouts/_base_syllabus_old.html.erb b/app/views/layouts/_base_syllabus_old.html.erb
new file mode 100644
index 000000000..45e77dbad
--- /dev/null
+++ b/app/views/layouts/_base_syllabus_old.html.erb
@@ -0,0 +1,151 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','css/common','css/public','css/structure','css/courses','css/popup','prettify',:media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
+</head>
+
+<body onload="prettyPrint();">
+<% is_current_user = User.current.logged?%>
+<div class="navContainer">
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft">
+      <div class="homepagePortraitContainer mt15"  onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();">
+        <%=render :partial => 'layouts/syllabus_info' %>
+      </div>
+      <%  update_visiti_count @syllabus %>
+
+      <div class="homepageLeftMenuContainer" id="syllabus_base_info" onmouseover="$('#syllabus_attr_edit').show();" onmouseout="$('#syllabus_attr_edit').hide();">
+        <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>
+      </div>
+
+      <div class="homepageLeftMenuContainer">
+        <div class="homepageLeftMenuBlock">
+          <%=link_to '班级', {:controller => "syllabuses", :action => "syllabus_courselist", :id => @syllabus.id}, :class => 'homepageMenuText' %>
+          <% if is_current_user%>
+              <% if User.current == @syllabus.user && User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+                  <div class="courseMenu" id="courseMenu">
+                    <ul>
+                      <li class="courseMenuIcon fr" style="margin-right:10px;"  id="courseMenuIcon">
+                        <ul class="topnav_course_menu" id="topnav_course_menu">
+                          <li>
+                            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "menuGrey", :target => '_blank'%>
+                          </li>
+                          <li>
+                            <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
+                          </li>
+                        </ul>
+                      </li>
+                    </ul>
+                  </div>
+              <% else%>
+                  <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入班级"%>
+              <% end%>
+          <% end%>
+        </div>
+        <% if User.current == @syllabus.user || User.current.admin?
+             all_courses = @syllabus.courses.where("is_delete = 0").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc")
+           else
+             all_courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc")
+           end %>
+        <% courses = all_courses.limit(5) %>
+        <% all_count = all_courses.count%>
+        <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>">
+          <div class = "leftCoursesList" id="homepageLeftMenuCourses">
+            <ul>
+              <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => User.current,:all_count => all_count,:type =>'Syllabus',:page => 0} %>
+            </ul>
+          </div>
+          <% if !courses.empty? %>
+              <div class="homepageLeftMenuMore" id="user_hide_course">
+                <a href="javascript:void(0);" class="homepageLeftMenuHideIcon" id="hide_show_courseicon" onclick="leftCourseslistChange();"></a>
+              </div>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="project_Label">
+        <h4 class="mb5" >标签:</h4>
+        <div class="tag_h">
+          <%= render :partial => 'tags/syllabus_tag', :locals => {:obj => @syllabus,:object_flag => "11"}%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="fontGrey2 mt10 ml20">访问计数 <%=@syllabus.visits %> （自2016年7月）</div>
+
+    </div><!--left end -->
+    <div class="homepageRight">
+      <%= yield %>
+    </div>
+  </div>
+  <%= render :partial => 'layouts/new_feedback' %>
+</div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
+<div id="ajax-modal" style="display:none;"></div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<script type="text/javascript">
+    $(function() {
+        $('#user_hide_course').hide();
+        $("#syllabus_title_edit").live("blur", function () {
+            edit_syllabus_title('<%= edit_syllabus_title_syllabus_path(@syllabus.id)%>');
+        });
+        $("#syllabus_eng_name_edit").live("blur", function () {
+            edit_syllabus_eng_name('<%= edit_syllabus_eng_name_syllabus_path(@syllabus.id)%>');
+        });
+
+        $("#courseMenu").mouseenter(function () {
+            $("#topnav_course_menu").show();
+        });
+        $("#courseMenu").mouseleave(function () {
+            $("#topnav_course_menu").hide();
+        });
+    });
+    function leftCourseslistChange(){
+        $('#homepageLeftMenuCourses').slideToggle();
+        $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon");
+        $('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon");
+
+    }
+    function show_edit_base_info() {
+        $("#syllabus_base_info").html("<%=escape_javascript(render :partial => 'layouts/syllabus_edit_info', :locals => {:syllabus => @syllabus}) %>");
+    }
+</script>
+</body>
+</html>
diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb
new file mode 100644
index 000000000..bd152ac6e
--- /dev/null
+++ b/app/views/layouts/_course_base_info.html.erb
@@ -0,0 +1,55 @@
+<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
+<% teacher_num = TeacherAndAssistantCount(@course) %>
+<% student_num = studentCount(@course) %>
+<% course_file_num = visable_attachemnts_incourse(@course).count %>
+<p class="sy_cgrey mb10">
+  <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey' %>
+  &nbsp;&gt;&nbsp;
+  <%=link_to @course.name, course_path(@course), :class => 'sy_cgrey' %>
+</p>
+
+<% if is_teacher %>
+    <div class="homepagePostSetting" >
+      <ul>
+        <li class="homepagePostSettingIcon">
+          <ul class="homepagePostSettiongText">
+            <li><%= link_to "班级配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "postOptionLink" %></li>
+            <li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "postOptionLink" %></li>
+            <li><%= link_to "复制学期", copy_course_course_path(@course.id),:remote=>true, :class => "postOptionLink" %></li>
+            <li><%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "postOptionLink", :target => "_blank" %></li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+<% end %>
+
+<div class="cl"></div>
+<div class="sy_class_logo fl">
+  <%= image_tag(url_to_avatar(@course), :width => "110", :height => "110", :alt => "班级logo") %>
+</div>
+<div class="sy_class_id fl">
+  <p>邀请码<br /><span class="sy_corange"><%=@course.generate_invite_code %></span></p>
+</div>
+<div class="sy_class_info fl ml15">
+  <div  class="sy_class_titbox">
+    <h3 class="fl sy_class_title"><%=@course.name %></h3>
+    <span class="icon_si fl mr20"><%=@course.is_public == 0 ? '私有' : '公开' %></span>
+    <p class="sy_cgrey fl mt3">
+      <span class=" mr15">教师：<%= course_teacher_link teacher_num %></span>
+      <span class=" mr15">学生：<%= course_student_link student_num %></span>
+      <span class=" mr15">资源：<%= link_to course_file_num, course_files_path(@course), :class => 'sy_cblue',:id=>'courses_files_count_info' %></span>
+    </p>
+    <div class="cl"></div>
+  </div>
+  <p class="sy_cgrey mb10">
+    <span class=" mr15">主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %></span>
+    <span class=" mr15">学时：<span  class="sy_cblack"><%= @course.class_period %>学时</span></span>
+    <span class=" mr15">学期：<span  class="sy_cblack"><%= current_time_and_term @course %></span></span>
+    <span class=" mr15">单位：<span class="sy_cblack"><%= @course.school ? @course.school : '无' %></span></span>
+  </p>
+  <!--<a href="javascript:void(0);" class="sy_btn_orange mr10" > 教师身份</a>-->
+  <% unless is_teacher %>
+      <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
+  <% end %>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb
index 387ac58f7..446473db5 100644
--- a/app/views/layouts/_syllabus_base_info.html.erb
+++ b/app/views/layouts/_syllabus_base_info.html.erb
@@ -1,55 +1,59 @@
-<ul class="syllabus_leftinfo" id="all_syllabus_attr">
-  <li class="fl"><label >创建教师：</label><span><%=syllabus.user.show_name %></span></li>
+<h3 class="sy_right_title">课程信息
   <% if User.current.logged? && (User.current == syllabus.user || User.current.admin?) %>
-      <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :id => 'syllabus_attr_edit', :class => 'undis fr', :onclick => "show_edit_base_info();"%>
+      <%= link_to "完善信息", "javascript:void(0);", :id => 'syllabus_attr_edit', :class => 'sy_cmore fr mr10', :onclick => "show_edit_base_info();"%>
   <% end %>
   <div class="cl"></div>
+</h3>
+<ul class="sy_info mt15" id="all_syllabus_attr">
+  <li><label >创建教师</label><span class="fl ml10 sy_cgrey"><%=syllabus.user.show_name %></span></li>
   <% unless syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
-      <li><label>课程性质：</label><%=syllabus.syllabus_type_str %></li>
+      <li><label>课程性质</label><span class="fl ml10 sy_cgrey"><%=syllabus.syllabus_type_str %></span></li>
   <% end %>
   <% unless syllabus.credit.nil? || syllabus.credit == '' %>
-      <li><label>学分：</label><%=syllabus.credit %></li>
+      <li><label>学分</label><span class="fl ml10 sy_cgrey"><%=syllabus.credit %>学分</span></li>
   <% end %>
   <% unless syllabus.hours.nil? || syllabus.hours == '' %>
-      <li><label>总学时：</label><%=syllabus.hours %></li>
+      <li><label>总学时</label><span class="fl ml10 sy_cgrey"><%=syllabus.hours %>学时</span></li>
   <% end %>
   <% unless syllabus.theory_hours.nil? || syllabus.theory_hours == '' %>
-      <li><label>理论学时：</label><%=syllabus.theory_hours %></li>
+      <li><label>理论学时</label><span class="fl ml10 sy_cgrey"><%=syllabus.theory_hours %>学时</span></li>
   <% end %>
   <% unless syllabus.practice_hours.nil? || syllabus.practice_hours == '' %>
-      <li><label>实践学时：</label><%=syllabus.practice_hours %></li>
+      <li><label>实践学时</label><span class="fl ml10 sy_cgrey"><%=syllabus.practice_hours %>学时</span></li>
   <% end %>
   <% unless syllabus.applicable_major.nil? || syllabus.applicable_major == '' %>
-      <li><label>适用专业：</label><%=syllabus.applicable_major %></li>
+      <li><label>适用专业</label><span class="fl ml10 sy_cgrey"><%=syllabus.applicable_major %></span></li>
   <% end %>
   <% unless syllabus.pre_course.nil? || syllabus.pre_course == '' %>
-      <li><label>先修课程：</label><%=syllabus.pre_course %></li>
+      <li><label>先修课程</label><span class="fl ml10 sy_cgrey"><%=syllabus.pre_course %></span></li>
   <% end %>
 
   <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
-      <li class="none none_attr"><label>课程性质：</label><span class="fontGrey3">空</span></li>
+      <li class="none none_attr"><label>课程性质</label><span class="fl ml10 sy_cgrey">空</span></li>
   <% end %>
   <% if syllabus.credit.nil? || syllabus.credit == '' %>
-      <li class="none none_attr"><label>学分：</label><span class="fontGrey3">空</span></li>
+      <li class="none none_attr"><label>学分</label><span class="fl ml10 sy_cgrey">空</span></li>
   <% end %>
   <% if syllabus.hours.nil? || syllabus.hours == '' %>
-      <li class="none none_attr"><label>总学时：</label><span class="fontGrey3">空</span></li>
+      <li class="none none_attr"><label>总学时</label><span class="fl ml10 sy_cgrey">空</span></li>
   <% end %>
   <% if syllabus.theory_hours.nil? || syllabus.theory_hours == '' %>
-      <li class="none none_attr"><label>理论学时：</label><span class="fontGrey3">空</span></li>
+      <li class="none none_attr"><label>理论学时</label><span class="fl ml10 sy_cgrey">空</span></li>
   <% end %>
   <% if syllabus.practice_hours.nil? || syllabus.practice_hours == '' %>
-      <li class="none none_attr"><label>实践学时：</label><span class="fontGrey3">空</span></li>
+      <li class="none none_attr"><label>实践学时</label><span class="fl ml10 sy_cgrey">空</span></li>
   <% end %>
   <% if syllabus.applicable_major.nil? || syllabus.applicable_major == '' %>
-      <li class="none none_attr"><label>适用专业：</label><span class="fontGrey3">空</span></li>
+      <li class="none none_attr"><label>适用专业</label><span class="fl ml10 sy_cgrey">空</span></li>
   <% end %>
   <% if syllabus.pre_course.nil? || syllabus.pre_course == '' %>
-      <li class="none none_attr"><label>先修课程：</label><span class="fontGrey3">空</span></li>
+      <li class="none none_attr"><label>先修课程</label><span class="fl ml10 sy_cgrey">空</span></li>
   <% end %>
+  <div class="cl"></div>
 </ul>
+
 <% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%>
-    <span class="homepageLeftMenuMore"><a href="javascript:void(0);" data-init="0" onclick="toggle_all_syllabus_attr();" class="homepageLeftMenuMoreIcon" id="show_all_syllabus_attr"></a></span>
+    <span class="homepageLeftMenuMore"><a href="javascript:void(0);" data-init="0" onclick="toggle_all_syllabus_attr();" class="homepageLeftMenuMoreIcon2" id="show_all_syllabus_attr"></a></span>
 <% end %>
 <script>
     function show_edit_base_info() {
diff --git a/app/views/layouts/_syllabus_edit_info.html.erb b/app/views/layouts/_syllabus_edit_info.html.erb
index 6a298bfc3..b89496800 100644
--- a/app/views/layouts/_syllabus_edit_info.html.erb
+++ b/app/views/layouts/_syllabus_edit_info.html.erb
@@ -1,27 +1,40 @@
-<ul class="syllabus_leftinfo" id="all_syllabus_attr">
-  <%= form_for('syllabus',:url => update_base_info_syllabus_path(syllabus.id),:remote => true) do |f|%>
-      <li class="fl"><label >创建教师：</label><span><%=syllabus.user.show_name %></span></li>
-      <a href="javascript:void(0);" onclick="update_syllabus_info();" id="submit_edit_info" class="fr">保存</a>
-      <!--<a href="javascript:void(0);" onclick="reset_syllabus_info();" id="submit_reset_info" class="fr mr10">取消</a>-->
+<%= form_for('syllabus',:url => update_base_info_syllabus_path(syllabus.id),:remote => true) do |f|%>
+    <h3 class="sy_right_title">课程信息
+      <a href="javascript:void(0);" onclick="update_syllabus_info();" id="submit_edit_info" class="sy_cmore fr mr10">保存</a>
       <div class="cl"></div>
-      <li><label>课程性质：</label>
-        <%= select_tag :syllabus_type,options_for_select(syllabus_type,syllabus.syllabus_type), {:id=>"syllabus_type_input", :class=>"syllabus_select"}  %>
+    </h3>
+    <ul class="sy_info mt15"  id="all_syllabus_attr">
+      <li><label >创建教师</label><span class="fl ml10 sy_cgrey"><%=syllabus.user.show_name %></span></li>
+      <li><label>课程性质</label>
+        <%= select_tag :syllabus_type,options_for_select(syllabus_type,syllabus.syllabus_type), {:id=>"syllabus_type_input", :class=>"sy_info_select fl"}  %>
+      </li>
       <div class="cl"></div>
+      <li><label >学分</label>
+        <input id="syllabus_credit_input" style="width: 30px;" class="fl" name="credit" placeholder="5" value="<%=syllabus.credit %>">&nbsp;学分
+        <span class="none c_red ml5" id="syllabus_credit_notice">正整数</span>
       </li>
-      <li><label >学分：</label>
-        <input id="syllabus_credit_input" class="syllabus_input_min fl" name="credit" placeholder="5" value="<%=syllabus.credit %>"> 学分
-        <span class="none c_red ml5" id="syllabus_credit_notice">请输入正整数</span><div class="cl"></div>
+      <div class="cl"></div>
+      <li><label>总学时</label>
+        <input id="syllabus_hours_input" style="width: 30px;" class="fl" name="hours" placeholder="50" value="<%=syllabus.hours %>">&nbsp;学时
+        <span class="none c_red ml5" id="syllabus_hours_notice">正整数</span>
       </li>
-      <li><label>总学时：</label><input id="syllabus_hours_input" class="syllabus_input_min fl" name="hours" placeholder="50" value="<%=syllabus.hours %>"> 学时
-        <span class="none c_red ml5" id="syllabus_hours_notice">请输入正整数</span><div class="cl"></div>
+      <div class="cl"></div>
+      <li><label>理论学时</label>
+        <input id="syllabus_theory_hours_input" style="width: 30px;" class="fl" name="theory_hours" placeholder="10" value="<%=syllabus.theory_hours %>">&nbsp;学时
+        <span class="none c_red ml5" id="syllabus_theory_hours_notice">正整数</span>
       </li>
-      <li><label>理论学时：</label><input id="syllabus_theory_hours_input" class="syllabus_input_min fl" name="theory_hours" placeholder="10" value="<%=syllabus.theory_hours %>"> 学时
-        <span class="none c_red ml5" id="syllabus_theory_hours_notice">请输入正整数</span><div class="cl"></div>
+      <div class="cl"></div>
+      <li><label>实践学时</label>
+        <input id="syllabus_practice_hours_input" style="width: 30px;" class="fl" name="practice_hours" placeholder="5" value="<%=syllabus.practice_hours %>">&nbsp;学时
+        <span class="none c_red ml5" id="syllabus_practice_hours_notice">正整数</span>
       </li>
-      <li><label>实践学时：</label><input id="syllabus_practice_hours_input" class="syllabus_input_min fl" name="practice_hours" placeholder="5" value="<%=syllabus.practice_hours %>"> 学时
-        <span class="none c_red ml5" id="syllabus_practice_hours_notice">请输入正整数</span><div class="cl"></div>
+      <div class="cl"></div>
+      <li><label>适用专业</label>
+        <input id="syllabus_applicable_major_input" class="fl" name="applicable_major" placeholder="UI设计" value="<%=syllabus.applicable_major %>">
       </li>
-      <li><label>适用专业：</label><input id="syllabus_applicable_major_input" class="syllabus_input fl" name="applicable_major" placeholder="UI设计" value="<%=syllabus.applicable_major %>"><div class="cl"></div></li>
-      <li><label>选修课程：</label><input id="syllabus_pre_course_input" class="syllabus_input fl" name="pre_course" placeholder="工业设计史" value="<%=syllabus.pre_course %>"><div class="cl"></div></li>
-  <% end %>
-</ul>
\ No newline at end of file
+      <li><label>选修课程</label>
+        <input id="syllabus_pre_course_input" class="fl" name="pre_course" placeholder="工业设计史" value="<%=syllabus.pre_course %>">
+      </li>
+      <div class="cl"></div>
+    </ul>
+<% end %>
diff --git a/app/views/layouts/_syllabus_eng_name.html.erb b/app/views/layouts/_syllabus_eng_name.html.erb
index 72af30927..959e28bb7 100644
--- a/app/views/layouts/_syllabus_eng_name.html.erb
+++ b/app/views/layouts/_syllabus_eng_name.html.erb
@@ -1,8 +1,9 @@
-<% if syllabus.eng_name && !syllabus.eng_name.empty? %>
-    <span><%= syllabus.eng_name %></span>
+<p style="position:relative; display:inline;"><% if syllabus.eng_name && !syllabus.eng_name.empty? %>
+    <span><%=syllabus.eng_name %></span>
 <% else%>
-    <span class="fontGrey">课程英文名称</span>
+    <span style="color: #888">课程英文名称</span>
 <% end %>
 <% if User.current == syllabus.user || User.current.admin? %>
-    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_ng_name_png", :class => "none", :onclick => "show_edit_eng_name();"%>
-<% end %>
\ No newline at end of file
+    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_ng_name_png", :style => "width:15px; position:absolute; right: -20px; top: 5px;", :class => "none", :onclick => "show_edit_eng_name('#{syllabus.eng_name}');"%>
+<% end %>
+</p>
\ No newline at end of file
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
index 076ae964b..a52b05228 100644
--- a/app/views/layouts/_syllabus_info.html.erb
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -1,25 +1,9 @@
-<%# teachers_num = teacher_count @syllabus%>
-<%# students_num = student_count @syllabus%>
-<%# files_num = file_count @syllabus%>
-<div class="pr_info_logo fl mb5 mr10">
-  <%= image_tag("../images/syllabus.jpg",width:"60px", height: "60px") %>
-</div>
-<div class="fl">
-    <div id="syllabus_title_show" class="homepageSyllabusName mb5">
-      <%= render :partial => 'layouts/syllabus_title', :locals => {:syllabus => @syllabus}%>
-    </div>
-  <textarea class="syllabusTitleTextarea none" placeholder="请编辑课程名称" id="syllabus_title_edit"></textarea>
+<div id="syllabus_title_show">
+  <%= render :partial => 'layouts/syllabus_title', :locals => {:syllabus => @syllabus}%>
 </div>
+<input type="text" class="none" style="width:300px;" placeholder="请编辑课程名称" id="syllabus_title_edit"/>
 <div class="cl"></div>
-<div>
-  <div class="mb5" id="syllabus_eng_name_show" style="word-break:normal;word-wrap:normal;">
-    <%= render :partial => 'layouts/syllabus_eng_name', :locals => {:syllabus => @syllabus}%>
-  </div>
-  <textarea class="homepageSignatureTextarea none" placeholder="请编辑英文名称" id="syllabus_eng_name_edit"></textarea>
+<div id="syllabus_eng_name_show">
+  <%= render :partial => 'layouts/syllabus_eng_name', :locals => {:syllabus => @syllabus}%>
 </div>
-<!--
-<div class="pr_info_foot ">
-  教师（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default" title="课程下全部班级的教师数"><%#=teachers_num %></a>）<span>|</span>
-  学生（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default" title="课程下全部班级的学生数"><%#=students_num %></a>）<span>|</span>
-  资源（<a class="info_foot_num c_blue" href="javascript:void(0);" target="_blank" style="cursor: default" title="课程下全部班级的资源数"><%#=files_num %></a>）</div>
-<div class="cl"></div>-->
+<input type="text" class="none" style="width:300px;" placeholder="请编辑英文名称" id="syllabus_eng_name_edit"/>
diff --git a/app/views/layouts/_syllabus_teacher_list.html.erb b/app/views/layouts/_syllabus_teacher_list.html.erb
new file mode 100644
index 000000000..71fd67a75
--- /dev/null
+++ b/app/views/layouts/_syllabus_teacher_list.html.erb
@@ -0,0 +1,21 @@
+<h3 class="sy_right_title">教师团队
+  <a href="javascript:void(0);" class="sy_cmore fr mr10 none" >增加教师</a>
+  <div class="cl"></div>
+</h3>
+<ul class="sy_teachers_list">
+  <% teacher = syllabus.user %>
+  <%# teachers.each do |teacher| %>
+      <li >
+        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sy_teachers_img fl mr15"), user_path(teacher), :target => "_blank", :alt => "用户头像" %>
+        <div class="sy_teachers_txt fl">
+          <%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name", :target => "_blank" %>
+          <span class="sy_teachers_span">
+            <% if teacher.user_extensions && teacher.user_extensions.identity %>
+                <%= get_user_roll teacher %>
+            <% end%>
+          </span>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <%# end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/layouts/_syllabus_title.html.erb b/app/views/layouts/_syllabus_title.html.erb
index c5d195ab8..6407a19a2 100644
--- a/app/views/layouts/_syllabus_title.html.erb
+++ b/app/views/layouts/_syllabus_title.html.erb
@@ -1,5 +1,5 @@
-<span style="word-break: normal; word-wrap: break-word;"><%=@syllabus.title %></span>
-
-<% if User.current == syllabus.user || User.current.admin? %>
-    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_title_png", :class => "none", :onclick => "show_edit_title('#{@syllabus.title}');"%>
-<% end %>
\ No newline at end of file
+<h2 style="position:relative; display:inline;">课程名称：<%=syllabus.title %>
+  <% if User.current == syllabus.user || User.current.admin? %>
+      <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_title_png", :class => "none", :style => "width:15px; position:absolute; right: -20px; top: 15px;", :onclick => "show_edit_title('#{syllabus.title}');"%>
+  <% end %>
+</h2>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index df30db346..9332ade4f 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -17,7 +17,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup'%>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup','sy_public','syllabus'%>
   <%= javascript_include_tag "course","header","attachments",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
@@ -40,7 +40,7 @@
 </head>
 <!--add by huang-->
 <body onload="prettyPrint();">
-<div class="navContainer mb10">
+<div class="navContainer">
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
   <% else%>
@@ -48,146 +48,103 @@
   <% end%>
 </div>
 <div class="cl"></div>
-<div id="Container">
-  <div id="content">
-    <div id="LSide" class="fl">
-      <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
-        <%=render :partial=>'layouts/project_info' %>
-      </div><!--课程信息 end-->
+<div class="">
+  <div class="sy_class_infobox">
+    <%=render :partial => 'layouts/course_base_info' %>
+  </div>
 
-      <div class="info_box">
-        <ul>
-          <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
-          <li><%= l(:label_class_period)%> :&nbsp;&nbsp;<span ><%= @course.class_period %> <%= l(:label_class_hour) %></span></li>
-          <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= current_time_and_term @course %></span></li>
-          <% if @course.school%>
-            <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<%= @course.school%></li>
-          <% end%>
-        </ul>
-      </div>
-
-      <%# 更新访问数,刷新的时候更新访问次数 %>
-      <%  update_visiti_count @course %>
-      <%# over %>
-
-      <div class="subNavBox">
-        <% unless show_nav?(@course.course_activities.count) %>
-        <div class="subNav">
-          <%= link_to l(:label_activity), course_path(@course), :class => "f14 c_blue02" %>
-          <!--暂时不显示课程动态数，优化后在显示-->
-          <%= link_to "(#{@course.course_activities.count})", course_path(@course), :class => "subnav_num c_orange"%>
-        </div>
-        <% end %>
-        <% unless show_nav?(@course.homework_commons.count) %>
-        <div class="subNav">
-          <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
-          <%= link_to "(#{homework_num})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
-          <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
-        </div>
-        <% end %>
-        <% unless show_nav?(@course.news.count) %>
-        <div class="subNav">
-          <%= link_to "通知", course_news_index_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%>
-          <%= link_to( "", new_course_news_path(@course,:is_new=>1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
-        </div>
-        <% end %>
-        <% unless show_nav?(course_file_num) %>
-        <div class="subNav">
-          <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
-          <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
-              <!--link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white')-->
-              <a class="courseMenuSetting" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
+  <div class="sy_content">
+    <div class="sy_class_l fl" id="courseLSide">
+      <div class="sy_class_leftnav mb12">
+        <ul class="accordion">
+          <% unless show_nav?(@course.course_activities.count) %>
+              <li id="sy_01" class="sy_icons_index">
+                <a href="<%=course_path(@course) %>" >动态<span><%=@course.course_activities.count %></span></a>
+              </li>
           <% end %>
-        </div>
-        <% end %>
-        <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
-        <div class="subNav">
-          <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{@course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
-        </div>
-        <% end %>
-        <% unless show_nav?(course_feedback_count) %>
-        <div class="subNav">
-          <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%>
-          <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
-        </div>
-        <% end %>
-        <% unless show_nav?(course_poll_count) %>
-        <div class="subNav">
-          <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%>
-          <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %>
-          <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
-        </div>
-        <% end %>
-        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count) %>
-        <div class="subNav">
-          <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%>
-          <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>
-          <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
-        </div>
-        <% end %>
-        <%# 工具栏展开 %>
-        <% if @course.homework_commons.count == 0 || @course.news.count == 0 || course_file_num == 0 || course_poll_count == 0 || @course.exercises.count == 0 ||
-             course_feedback_count == 0 || @course.exercises.count == 0 || (@course.boards.first ? @course.boards.first.topics.count : 0) == 0 %>
-
-            <div class="subNav subNav_jiantou" id="expand_tools_expand"><%= l(:label_project_more) %></div>
-            <ul class="navContent" id="navContentCourse">
-              <%= render 'courses/tool_expand', :locals => {:is_teacher => is_teacher, :course_file_num => course_file_num} %>
-            </ul>
-        <% end %>
-      </div><!--项目侧导航 end-->
+          <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
+              <li id="sy_02" class="sy_icons_boards">
+                <% count = @course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0 %>
+                <a href="<%=course_boards_path(@course) %>">问答区<span><%=count %></span></a>
+                <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %>
+              </li>
+          <% end %>
+          <% unless show_nav?(@course.homework_commons.count) %>
+              <li id="sy_03" class="sy_icons_hwork">
+                <a href="<%= homework_common_index_path(:course => @course.id) %>">作业<span><%=homework_num %></span></a>
+                <%= link_to( "",homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
+              </li>
+          <% end %>
+          <% unless show_nav?(@course.news.count) %>
+              <li id="sy_04" class="sy_icons_news">
+                <a href="<%=course_news_index_path(@course) %>">通知<span><%=@course.news.count %></span></a>
+                <%= link_to( "",new_course_news_path(@course,:is_new=>1), :class => 'sy_class_add', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
+              </li>
+          <% end %>
+          <% unless show_nav?(course_file_num) %>
+              <li id="sy_05" class="sy_icons_files">
+                <a href="<%=course_files_path(@course) %>">资源库<span><%=course_file_num %></span></a>
+                <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
+                    <a class="sy_class_add" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
+                <% end %>
+              </li>
+          <% end %>
+          <% unless show_nav?(course_feedback_count) %>
+              <li id="sy_06" class="sy_icons_feedback">
+                <a href="<%=course_feedback_path(@course) %>">留言<span><%=course_feedback_count %></span></a>
+                <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
+              </li>
+          <% end %>
+          <% unless show_nav?(course_poll_count) %>
+              <li id="sy_07" class="sy_icons_poll">
+                <a href="<%=poll_index_path(:polls_type => "Course", :polls_group_id => @course.id) %>">问卷调查<span><%=course_poll_count %></span></a>
+                <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'sy_class_add', :title =>"#{l(:label_new_poll)}") if is_teacher %>
+              </li>
+          <% end %>
+          <% count = User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count %>
+          <% unless show_nav?(count) %>
+              <li id="sy_08" class="sy_icons_exercise">
+                <a href="<%=exercise_index_path(:course_id => @course.id) %>">在线测验<span><%=count %></span></a>
+                <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
+              </li>
+          <% end %>
+          <% statistics_count = 0 %>
+          <% unless show_nav?(statistics_count) %>
+              <li id="sy_09" class="sy_icons_st">
+                <a href="<%=statistics_course_course_path(@course) %>">统计<span></span></a>
+                <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
+              </li>
+          <% end %>
+          <%# 工具栏展开 %>
+          <% if @course.homework_commons.count == 0 || @course.news.count == 0 || course_file_num == 0 || course_poll_count == 0 || @course.exercises.count == 0 ||
+                  course_feedback_count == 0 || @course.exercises.count == 0 || (@course.boards.first ? @course.boards.first.topics.count : 0) == 0 || statistics_count == 0%>
+              <li id="expand_tools_expand" class="sy_icons_more"><a href="javascript:void(0)"> 更多</a>
+              </li>
+              <ul class="sub-menu undis" id="navContentCourse">
+                <%= render :partial => 'courses/tool_expand' %>
+              </ul>
+          <% end %>
+        </ul>
+      </div><!--sy_class_leftnav end-->
       <%# 课程活跃度 %>
-      <div class="cl"></div>
       <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %>
       <%# 课程英雄榜 %>
       <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
-
-    <% if @course.description && !@course.description.blank? %>
-      <div class="project_intro">
-        <div id="course_description" class="course_description">
-          <h4 ><%= l(:label_course_brief_introduction)%>：</h4>
-          <div id="course_description_content">
-            <%= textilizable(@course.description) if @course.description && !@course.description.blank? %>
-          </div>
-        </div>
-        <div class="lg-foot" id="lg-foot" onclick="show_more_msg();">
-          <label id="expend_more_information"  value="show_more"><%= l(:label_expend_information)%></label>
-          <span class="g-arr-down">
-            <img id="arrow" src="/images/jiantou.jpg" width="12" height="6" />
-          </span>
-        </div>
-      </div><!--项目简介 end-->
-    <% end %>
-      <div class="project_Label">
-        <h4 class="mb5" ><%= l(:label_tag)%>：</h4>
-        <div class="tag_h" >
-          <%= render :partial => 'tags/new_tag', :locals => {:obj => @course, :object_flag => "9"} %>
-        </div>
-        <div class="cl"></div>
-      </div><!--项目标签 end-->
-      <!--课程推荐-->
-      <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %> （自2016年5月）</div>
-    </div><!--LSide end-->
-
-    <div id="RSide" class="fl">
+      <div class="sy_class_leftbox mb15" >
+        <h3>班级推荐</h3>
+        <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
+      </div>
+    </div><!--sy_class_l end-->
+    <div class="fl">
       <%= yield %>
-      <%#= render_flash_messages %>
-      <%#= call_hook :view_layouts_base_content %>
-    </div>
-
+    </div><!--sy_class_r end-->
     <div class="cl"></div>
+  </div><!--sy_content end-->
+</div>
 
-  </div><!--Content end-->
-</div><!--Container end-->
-
-    <div class="cl"></div>
-    <%= render :partial => 'layouts/footer' %>
-    <div class="cl"></div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
 
 <%= render :partial => 'layouts/new_feedback' %>
 <div id="ajax-indicator" style="display:none;">
@@ -199,9 +156,15 @@
 <script>
     var blog_artile_list_html = '';
     $(function(){
+        if($("#sy_0<%=@left_nav_type %>").length > 0){
+            $("#sy_0<%=@left_nav_type %> a").addClass('active');
+        } else {
+            $("#expand_tools_expand a").addClass('active');
+            $("#navContentCourse").toggle();
+        }
         $(document).on('input','input[name="course_outline_search"]',function(e){
             throttle(course_outline_search,window,e);
-        })
+        });
         function throttle(method,context,e){
             clearTimeout(method.tId);
             method.tId=setTimeout(function(){
@@ -239,7 +202,7 @@
             })
         }
 
-    })
+    });
     //资源库上传附件
     function course_files_upload(){
             $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>');
@@ -271,6 +234,9 @@
     }
 
     $("#expand_tools_expand").click(function(){
+        var accordion_head = $('.accordion > li > a');
+        accordion_head.removeClass('active');
+       $("#expand_tools_expand a").addClass('active');
        $("#navContentCourse").toggle();
     });
 </script>
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
index 5d26c2ffa..ddbb53200 100644
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -7,10 +7,10 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','css/common','css/public','css/structure','css/courses','css/popup','prettify',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus'%>
+  <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
@@ -39,79 +39,30 @@
   <% end%>
 </div>
 <div class="cl"></div>
-<div class="homepageContentContainer">
-  <div class="homepageContent">
-    <div class="homepageLeft">
-      <div class="homepagePortraitContainer mt15"  onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();">
+
+<div class="sy_contanier">
+  <div class="sy_top">
+    <div class="sy_top_con" onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();"> <!-- onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();" -->
         <%=render :partial => 'layouts/syllabus_info' %>
       </div>
-      <%  update_visiti_count @syllabus %>
+  </div>
 
-      <div class="homepageLeftMenuContainer" id="syllabus_base_info" onmouseover="$('#syllabus_attr_edit').show();" onmouseout="$('#syllabus_attr_edit').hide();">
+  <div class="sy_content ">
+    <div class="sy_con_l fl mb15">
+      <%= yield %>
+    </div><!--sy_con_l end-->
+    <div class="sy_con_r fr ">
+      <div class="sy_right_box" id="syllabus_base_info">
         <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>
       </div>
-
-      <div class="homepageLeftMenuContainer">
-        <div class="homepageLeftMenuBlock">
-          <%=link_to '班级', {:controller => "syllabuses", :action => "syllabus_courselist", :id => @syllabus.id}, :class => 'homepageMenuText' %>
-          <% if is_current_user%>
-              <% if User.current == @syllabus.user && User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
-                  <div class="courseMenu" id="courseMenu">
-                    <ul>
-                      <li class="courseMenuIcon fr" style="margin-right:10px;"  id="courseMenuIcon">
-                        <ul class="topnav_course_menu" id="topnav_course_menu">
-                          <li>
-                            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "menuGrey", :target => '_blank'%>
-                          </li>
-                          <li>
-                            <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
-                          </li>
-                        </ul>
-                      </li>
-                    </ul>
+      <div class="sy_right_box">
+        <%= render :partial => 'layouts/syllabus_teacher_list', :locals => {:syllabus => @syllabus} %>
                   </div>
-              <% else%>
-                  <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入班级"%>
-              <% end%>
-          <% end%>
-        </div>
-        <% if User.current == @syllabus.user || User.current.admin?
-             all_courses = @syllabus.courses.where("is_delete = 0").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc")
-           else
-             all_courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc")
-           end %>
-        <% courses = all_courses.limit(5) %>
-        <% all_count = all_courses.count%>
-        <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>">
-          <div class = "leftCoursesList" id="homepageLeftMenuCourses">
-            <ul>
-              <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => User.current,:all_count => all_count,:type =>'Syllabus',:page => 0} %>
-            </ul>
-          </div>
-          <% if !courses.empty? %>
-              <div class="homepageLeftMenuMore" id="user_hide_course">
-                <a href="javascript:void(0);" class="homepageLeftMenuHideIcon" id="hide_show_courseicon" onclick="leftCourseslistChange();"></a>
-              </div>
-          <% end %>
-        </div>
-      </div>
-
-      <div class="project_Label">
-        <h4 class="mb5" >标签:</h4>
-        <div class="tag_h">
-          <%= render :partial => 'tags/syllabus_tag', :locals => {:obj => @syllabus,:object_flag => "11"}%>
-        </div>
+    </div><!--sy_con_r end-->
         <div class="cl"></div>
-      </div>
-      <div class="fontGrey2 mt10 ml20">访问计数 <%=@syllabus.visits %> （自2016年7月）</div>
+  </div><!--sy_content end-->
 
-    </div><!--left end -->
-    <div class="homepageRight">
-      <%= yield %>
     </div>
-  </div>
-  <%= render :partial => 'layouts/new_feedback' %>
-</div>
 <div class="cl"></div>
 <%= render :partial => 'layouts/footer' %>
 <div class="cl"></div>
@@ -136,6 +87,22 @@
         $("#courseMenu").mouseleave(function () {
             $("#topnav_course_menu").hide();
         });
+        // Store variables
+        var accordion_head = $('.accordion > li > a'),
+                accordion_body = $('.accordion li > .sub-menu');
+
+        // Click function
+        accordion_head.on('click', function(event) {
+            // Disable header links
+            event.preventDefault();
+            // Show and hide the tabs on click
+            if ($(this).attr('class') != 'active'){
+                accordion_body.slideUp('normal');
+                $(this).next().stop(true,true).slideToggle('normal');
+                accordion_head.removeClass('active');
+                $(this).addClass('active');
+            }
+    });
     });
     function leftCourseslistChange(){
         $('#homepageLeftMenuCourses').slideToggle();
@@ -146,8 +113,21 @@
     function show_edit_base_info() {
         $("#syllabus_base_info").html("<%=escape_javascript(render :partial => 'layouts/syllabus_edit_info', :locals => {:syllabus => @syllabus}) %>");
     }
-
-    //侧导航栏配置设置
+    function g(o){return document.getElementById(o);}
+    function HoverLi(n){
+        for(var i=1;i<=2;i++){
+            //g('sy_tab_nav_'+i).className='sy_tab_nomal';
+            //g('sy_tab_con_'+i).className='undis';
+        }
+        //g('sy_tab_con_'+n).className='dis';
+        //g('sy_tab_nav_'+n).className='sy_tab_hover';
+        if(n == 1) {
+            window.location.href = '<%=syllabus_path(@syllabus) %>';
+        } else {
+            window.location.href = '<%=syllabus_courselist_syllabus_path(@syllabus) %>';
+        }
+    }
+ //侧导航栏配置设置
     $(".homepageLeftMenuCoursesLine").mouseover(function(){
         $(this).children(".shild").css("background","url(/images/hwork_icon.png) -82px -399px no-repeat");
         $(this).children().css("color","#ffffff");
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 15e03e396..7a61273bb 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -110,13 +110,8 @@
               <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
             </div>
             <div class="homepagePostReplyDes">
-              <div class="homepagePostReplyPublisher">
-                <%= link_to reply.creator_user.show_name, user_url_in_org(reply.creator_user.id), :class => "newsBlue mr10 f14" %>
-                <%= time_from_now(reply.created_on) %>
-              </div>
-              <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
-                  <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
-              <% end %>
+              <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
+
               <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
               </div>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 5363148ff..fc6371c04 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -142,13 +142,8 @@
                   <%= link_to image_tag(url_to_avatar(reply.author), :width => 33, :height => 33), user_path(reply.author) %>
                 </div>
                 <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <%= link_to reply.creator_user.show_name, user_url_in_org(reply.creator_user.id), :class => "newsBlue mr10 f14" %>
-                    <%= time_from_now(reply.created_on) %>
-                  </div>
-                  <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
-                      <%= render :partial => 'users/message_contents', :locals => {:comment => reply} %>
-                  <% end %>
+                  <%= render :partial => 'users/message_contents', :locals => {:comment => reply} %>
+
                   <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe %>
                   </div>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index f3ee4c0b7..ff358f7c3 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -171,13 +171,8 @@
                 <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
               </div>
               <div class="homepagePostReplyDes">
-                <div class="homepagePostReplyPublisher">
-                  <%= link_to reply.creator_user.show_name, user_url_in_org(reply.creator_user.id), :class => "newsBlue mr10 f14" %>
-                  <%= time_from_now(reply.created_on) %>
-                </div>
-                <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
-                    <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
-                <% end %>
+                <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
+
                 <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                   <%= reply.content.html_safe%>
                 </div>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index fc877d809..c8068e425 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
 <% end %>
 
 <script type="text/javascript">
@@ -9,23 +9,8 @@
     });
 </script>
 <script>
-    function expand_reply(container,btnid){
-        var target = $(container).children();
-        var btn = $(btnid);
-        if(btn.data('init')=='0'){
-            btn.data('init',1);
-            btn.html('收起回复');
-            target.show();
-        }else{
-            btn.data('init',0);
-            btn.html('展开更多');
-            target.hide();
-            target.eq(0).show();
-            target.eq(1).show();
-            target.eq(2).show();
-        }
-    }
     $(function() {
+        sd_create_editor_from_data(<%= @news.id%>,null,"100%", "<%=@news.class.to_s%>");
         showNormalImage('message_description_<%= @news.id %>');
     });
 </script>
@@ -97,97 +82,7 @@
   </div>
   <div class="cl"></div>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= @comments.count>0 ? "（#{@comments.count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=@news.id %>">
-          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@news, :user_activity_id=>@news.id,:type=>"activity"}%>
-        </span>
-      </div>
-    </div>
-    <% unless @comments.empty? %>
-        <div class="" id="reply_div_<%=@news.id %>">
-          <% @comments.each_with_index  do |reply,i| %>
-              <script type="text/javascript">
-                  $(function(){
-                      showNormalImage('reply_message_description_<%= reply.id %>');
-                      autoUrl('reply_message_description_<%= reply.id %>');
-                  });
-              </script>
-              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
-                <div class="homepagePostReplyPortrait">
-                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-                </div>
-                <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <% if reply.try(:author).try(:realname) == ' ' %>
-                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% else %>
-                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% end %>
-                  </div>
-                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
-                    <%= reply.comments.html_safe%>
-                  </div>
-                  <div style="margin-top: -7px; margin-bottom: 5px">
-                    <%= format_time(reply.created_on) %>
-                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-                      <span id="reply_praise_count_<%=reply.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                      </span>
-                      <%= link_to_if_authorized_course(
-                                  l(:button_delete),
-                                  {:controller => 'comments',
-                                  :action => 'destroy', :id => @news,
-                                  :comment_id => reply},
-                                  :method => :delete,
-                                  :class => 'fr newsGrey mr10',
-                                  :data => {:confirm => l(:text_are_you_sure)},
-                                  :title => l(:button_delete)
-                          ) %>
-                    </div>
-                  </div>
-                  <p id="reply_message_<%= reply.id%>"></p>
-                </div>
-                <div class="cl"></div>
-              </div>
-          <% end %>
-        </div>
-
-    <% end %>
-    <div class="cl"></div>
-    <% if @news.commentable? %>
-        <div class="talkWrapMsg" nhname="about_talk_reply">
-          <em class="talkWrapArrow"></em>
-          <div class="cl"></div>
-          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
-            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
-                <div class="box"  id="news_comment">
-                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
-                                   :owner_id => @comment.nil? ? 0: @comment.id,
-                                   :owner_type => OwnerTypeHelper::COMMENT,
-                                   :width => '99%',
-                                   :height => 100,
-                                   :minHeight=>100,
-                                   :input_html => { :id => 'comment_content',
-                                                    :class => 'talk_text fl',
-                                                    :maxlength => 5000 }%>
-                </div>
-                <p id="add_reply_news"></p>
-                <p class="mt10">
-                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
-                    <%= l(:label_cancel_with_space) %>
-                  </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
-                    <%= l(:label_comment_with_space) %>
-                  </a>
-                </p>
-            <% end %>
-            <div class="cl"></div>
-          </div>
-        </div>
-    <% end %>
+    <%= render :partial => 'news/news_all_replies' %>
   </div>
 </div>
 <script type="text/javascript">
diff --git a/app/views/news/_news_all_replies.html.erb b/app/views/news/_news_all_replies.html.erb
new file mode 100644
index 000000000..c4140cd91
--- /dev/null
+++ b/app/views/news/_news_all_replies.html.erb
@@ -0,0 +1,99 @@
+<div class="homepagePostReplyBanner">
+  <div class="homepagePostReplyBannerCount">回复
+    <sapn class="mr15"><%= @comments.count>0 ? "（#{@comments.count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=@news.id %>">
+          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@news, :user_activity_id=>@news.id,:type=>"activity"}%>
+        </span>
+  </div>
+</div>
+<% unless @comments.empty? %>
+    <div class="" id="reply_div_<%=@news.id %>">
+      <% @comments.each_with_index  do |comment,i| %>
+          <script type="text/javascript">
+              $(function(){
+                  showNormalImage('reply_message_description_<%= comment.id %>');
+                  autoUrl('reply_message_description_<%= comment.id %>');
+              });
+          </script>
+          <li class="homepagePostReplyContainer" nhname="reply_rec">
+            <div class="homepagePostReplyPortrait">
+              <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+            </div>
+            <div class="homepagePostReplyDes">
+              <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>
+
+              <% if !comment.content_detail.blank? %>
+                  <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                    <%= comment.content_detail.html_safe %>
+                  </div>
+                  <div class="orig_reply mb10 mt-10">
+                    <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%=comment.id %>">
+                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                    </span>
+                    <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'comments',:action => 'quote', :id => comment},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply))%>
+                      <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                  <%= link_to(
+                              l(:button_delete),
+                              {:controller => 'comments',
+                               :action => 'destroy', :id => @news,
+                               :comment_id => comment},
+                              :method => :delete,
+                              :class => 'fr mr20',
+                              :data => {:confirm => l(:text_are_you_sure)},
+                              :title => l(:button_delete)
+                      ) if @news.author == User.current %>
+                        </span>
+                      <div class="cl"></div>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= comment.id%>"></p>
+              <% end %>
+            </div>
+            <div class="cl"></div>
+          </li>
+      <% end %>
+    </div>
+
+<% end %>
+<div class="cl"></div>
+<% if @news.commentable? %>
+    <div class="talkWrapMsg" nhname="about_talk_reply">
+      <em class="talkWrapArrow"></em>
+      <div class="cl"></div>
+      <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
+        <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
+            <div class="box"  id="news_comment">
+              <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+              <%= f.kindeditor :comments, :editor_id => 'comment_editor',
+                               :owner_id => @comment.nil? ? 0: @comment.id,
+                               :owner_type => OwnerTypeHelper::COMMENT,
+                               :width => '99%',
+                               :height => 100,
+                               :minHeight=>100,
+                               :input_html => { :id => 'comment_content',
+                                                :class => 'talk_text fl',
+                                                :maxlength => 5000 }%>
+            </div>
+            <p id="add_reply_news"></p>
+            <p class="mt10">
+              <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
+                <%= l(:label_cancel_with_space) %>
+              </a>
+              <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
+                <%= l(:label_comment_with_space) %>
+              </a>
+            </p>
+        <% end %>
+        <div class="cl"></div>
+      </div>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb
index 7eecf43ab..9790c1305 100644
--- a/app/views/news/_organization_show.html.erb
+++ b/app/views/news/_organization_show.html.erb
@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
 <% end %>
 
 <script type="text/javascript">
@@ -9,23 +9,8 @@
     });
 </script>
 <script>
-    function expand_reply(container,btnid){
-        var target = $(container).children();
-        var btn = $(btnid);
-        if(btn.data('init')=='0'){
-            btn.data('init',1);
-            btn.html('收起回复');
-            target.show();
-        }else{
-            btn.data('init',0);
-            btn.html('展开更多');
-            target.hide();
-            target.eq(0).show();
-            target.eq(1).show();
-            target.eq(2).show();
-        }
-    }
     $(function() {
+        sd_create_editor_from_data(<%= @news.id%>,null,"100%", "<%=@news.class.to_s%>");
         showNormalImage('message_description_<%= @news.id %>');
     });
 </script>
@@ -87,90 +72,7 @@
   </div>
   <div class="cl"></div>
   <div class="homepagePostReply">
-    <% unless @comments.empty? %>
-        <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
-          <div class="homepagePostReplyBannerTime"></div>
-        </div>
-        <div class="" id="reply_div_<%=@news.id %>">
-          <% @comments.each_with_index  do |reply,i| %>
-              <script type="text/javascript">
-                  $(function(){
-                      showNormalImage('reply_message_description_<%= reply.id %>');
-                      autoUrl('reply_message_description_<%= reply.id %>');
-                  });
-              </script>
-              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
-                <div class="homepagePostReplyPortrait">
-                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-                </div>
-                <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <% if reply.try(:author).try(:realname) == ' ' %>
-                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% else %>
-                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% end %>
-                  </div>
-                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
-                    <%= reply.comments.html_safe%>
-                  </div>
-                  <div style="margin-top: -7px; margin-bottom: 5px">
-                    <%= format_time(reply.created_on) %>
-                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-                      <%= link_to_if_authorized_course(
-                                  l(:button_delete),
-                                  {:controller => 'comments',
-                                   :action => 'destroy', :id => @news,
-                                   :comment_id => reply},
-                                  :method => :delete,
-                                  :class => 'fr newsGrey',
-                                  :data => {:confirm => l(:text_are_you_sure)},
-                                  :title => l(:button_delete)
-                          ) %>
-                    </div>
-                  </div>
-                  <p id="reply_message_<%= reply.id%>"></p>
-                </div>
-                <div class="cl"></div>
-              </div>
-          <% end %>
-        </div>
-
-    <% end %>
-    <div class="cl"></div>
-    <% if @news.commentable? %>
-        <div class="talkWrapMsg" nhname="about_talk_reply">
-          <em class="talkWrapArrow"></em>
-          <div class="cl"></div>
-          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
-            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
-                <div class="box"  id="news_comment">
-                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
-                                   :owner_id => @comment.nil? ? 0: @comment.id,
-                                   :owner_type => OwnerTypeHelper::COMMENT,
-                                   :width => '99%',
-                                   :height => 100,
-                                   :minHeight=>100,
-                                   :input_html => { :id => 'comment_content',
-                                                    :class => 'talk_text fl',
-                                                    :maxlength => 5000 }%>
-                </div>
-                <p id="add_reply_news"></p>
-                <p class="mt10">
-                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
-                    <%= l(:label_cancel_with_space) %>
-                  </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
-                    <%= l(:label_comment_with_space) %>
-                  </a>
-                </p>
-            <% end %>
-            <div class="cl"></div>
-          </div>
-        </div>
-    <% end %>
+    <%= render :partial => 'news/news_all_replies' %>
   </div>
 </div>
 <script type="text/javascript">
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 6b3824222..1e3a83c9a 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
 <% end %>
 
 <script type="text/javascript">
@@ -9,23 +9,8 @@
     });
 </script>
 <script>
-    function expand_reply(container,btnid){
-        var target = $(container).children();
-        var btn = $(btnid);
-        if(btn.data('init')=='0'){
-            btn.data('init',1);
-            btn.html('收起回复');
-            target.show();
-        }else{
-            btn.data('init',0);
-            btn.html('展开更多');
-            target.hide();
-            target.eq(0).show();
-            target.eq(1).show();
-            target.eq(2).show();
-        }
-    }
     $(function() {
+        sd_create_editor_from_data(<%= @news.id%>,null,"100%", "<%=@news.class.to_s%>");
         showNormalImage('message_description_<%= @news.id %>');
     });
 </script>
@@ -97,90 +82,7 @@
   </div>
   <div class="cl"></div>
   <div class="homepagePostReply">
-    <% unless @comments.empty? %>
-        <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
-          <div class="homepagePostReplyBannerTime"></div>
-        </div>
-        <div class="" id="reply_div_<%=@news.id %>">
-          <% @comments.each_with_index  do |reply,i| %>
-              <script type="text/javascript">
-                  $(function(){
-                      showNormalImage('reply_message_description_<%= reply.id %>');
-                      autoUrl('reply_message_description_<%= reply.id %>');
-                  });
-              </script>
-              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
-                <div class="homepagePostReplyPortrait">
-                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-                </div>
-                <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <% if reply.try(:author).try(:realname) == ' ' %>
-                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% else %>
-                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% end %>
-                  </div>
-                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
-                    <%= reply.comments.html_safe%>
-                  </div>
-                  <div style="margin-top: -7px; margin-bottom: 5px">
-                    <%= format_time(reply.created_on) %>
-                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-                      <%= link_to(
-                                  l(:button_delete),
-                                  {:controller => 'comments',
-                                   :action => 'destroy', :id => @news,
-                                   :comment_id => reply},
-                                  :method => :delete,
-                                  :class => 'fr newsGrey',
-                                  :data => {:confirm => l(:text_are_you_sure)},
-                                  :title => l(:button_delete)
-                          ) if @news.author == User.current %>
-                    </div>
-                  </div>
-                  <p id="reply_message_<%= reply.id%>"></p>
-                </div>
-                <div class="cl"></div>
-              </div>
-          <% end %>
-        </div>
-
-    <% end %>
-    <div class="cl"></div>
-    <% if @news.commentable? %>
-        <div class="talkWrapMsg" nhname="about_talk_reply">
-          <em class="talkWrapArrow"></em>
-          <div class="cl"></div>
-          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
-            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
-                <div class="box"  id="news_comment">
-                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
-                                   :owner_id => @comment.nil? ? 0: @comment.id,
-                                   :owner_type => OwnerTypeHelper::COMMENT,
-                                   :width => '99%',
-                                   :height => 100,
-                                   :minHeight=>100,
-                                   :input_html => { :id => 'comment_content',
-                                                    :class => 'talk_text fl',
-                                                    :maxlength => 5000 }%>
-                </div>
-                <p id="add_reply_news"></p>
-                <p class="mt10">
-                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
-                    <%= l(:label_cancel_with_space) %>
-                  </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
-                    <%= l(:label_comment_with_space) %>
-                  </a>
-                </p>
-            <% end %>
-            <div class="cl"></div>
-          </div>
-        </div>
-    <% end %>
+    <%= render :partial => 'news/news_all_replies' %>
   </div>
 </div>
 <script type="text/javascript">
diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb
index 116000a8e..c47e7bd6d 100644
--- a/app/views/news/edit.html.erb
+++ b/app/views/news/edit.html.erb
@@ -11,7 +11,7 @@
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">
-      编辑<%= @news.project_id != -1 ? '新闻':'通知' %>
+      编辑<%= (@news.project_id != -1 && !@news.project_id.nil?) ? '新闻':'通知' %>
     </div>
   </div>
   <%= labelled_form_for :news, @news, :url => news_path(@news),
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index d1fe457a7..0b5f4e693 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -103,13 +103,8 @@
                   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
                 </div>
                 <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-                    <%= time_from_now(comment.created_at) %>
-                  </div>
-                  <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-                      <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
-                  <% end %>
+                  <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
+
                   <% if !comment.content_detail.blank? %>
                       <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                         <%= comment.content_detail.html_safe %>
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index bddba3eee..4a74a5f81 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -46,7 +46,7 @@
                   </div>
                 </div>
             <% end %>
-            <% if act.org_act_type == 'OrgDocumentComment' && act.org_act.organization.home_id != act.org_act.id %>
+            <% if act.org_act && act.org_act_type == 'OrgDocumentComment' && act.org_act.organization.home_id != act.org_act.id %>
                 <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
             <% end %>
         <% end %>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 8ea566f0d..d12464b3c 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -72,7 +72,7 @@
   <% all_comments = []%>
   <% count=get_all_children(all_comments, activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/message_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => 0,:is_board =>0} %>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => 0,:is_board =>0} %>
 
     <% all_comments = []%>
     <% comments = get_all_children(all_comments, activity)[0..2] %>
@@ -87,7 +87,7 @@
       <div class="homepagePostReplyInputContainer mb10">
         <% if User.current.logged? %>
             <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id,:is_course => 0, :is_board => 0},:method => "post", :remote => true) do |f|%>
                   <input type="hidden" name="quote[quote]" value="">
                   <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                   <div nhname='toolbar_container_<%= user_activity_id%>'></div>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index d6e27daf1..2bfce3699 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -62,7 +62,7 @@
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/news_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'News', :activity_id => activity.id} %>
         </div>
     <% end %>
 
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 395038e9e..c5df04dfb 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -77,7 +77,7 @@
     <% comments = get_all_children(all_comments, document)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= act.id %>">
-          <%= render :partial => 'users/org_document_replies', :locals => {:comments => comments, :user_activity_id => act.id, :type => 'OrgDocumentComment', :activity_id =>document.id}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => act.id, :type => 'OrgDocumentComment', :activity_id =>document.id}%>
         </div>
     <% end %>
 
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 73c783794..27f67c5f7 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -363,6 +363,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       }
   }
 </script>
+<div class="courseRSide fl">
 <div class=" polls_content polls_edit" id="polls">
 
   <!-- 头部 -->
@@ -431,3 +432,4 @@ function insert_MCQ(quest_type,quest_num,quest_id){
     </select>
   </div>
 </div><!--编辑end-->
+</div>
\ No newline at end of file
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index e9deff3f4..8b87d737d 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -86,6 +86,8 @@
         hideModal($("#popbox_upload"));
     }
 </script>
+<div class="courseRSide fl">
 <div class="polls_content02" id="polls">
   <%= render :partial => 'poll_list'%>
-</div><!--问卷内容end-->
\ No newline at end of file
+</div><!--问卷内容end-->
+</div>
\ No newline at end of file
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 57969faa5..cd85b8067 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -1,4 +1,5 @@
 <%= stylesheet_link_tag  'polls', :media => 'all' %>
+<div class="courseRSide fl">
 <div class="polls_content polls_box" id="polls">
   <div class="ur_page_head" >
     <h1 class="ur_page_title">
@@ -221,3 +222,4 @@
     </div>
   </div>
 </div><!--问卷内容end-->
+</div>
\ No newline at end of file
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index da89bf26e..fb9e9d26b 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -1,4 +1,5 @@
 <%= stylesheet_link_tag  'polls', :media => 'all' %>
+<div class="courseRSide fl">
 <div class="polls_content polls_box" id="polls">
   <div class="ur_page_head" >
     <h1 class="ur_page_title">
@@ -32,4 +33,5 @@
     </ul>
     <div class="cl"></div>
   </div>
+</div>
 </div>
\ No newline at end of file
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index e751e16ae..161221526 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -61,7 +61,7 @@
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/news_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'News', :activity_id => activity.id} %>
         </div>
     <% end %>
 
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 6bdc3753e..3ec6232db 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -7,7 +7,7 @@
 <script type="text/javascript">
   $(function(){
       $("#RSide").removeAttr("id");
-      $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+      $("#homework_page_right").css("min-height",$("#courseLSide").height()-33);
       $("#Container").css("width","1000px");
   });
 
diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb
index 9ecc35319..02bf41801 100644
--- a/app/views/syllabuses/_syllabus_course_list.html.erb
+++ b/app/views/syllabuses/_syllabus_course_list.html.erb
@@ -1,62 +1,81 @@
-<div class="listbox" id="course-list">
-  <h2 class="list-h2">班级列表</h2>
-  <div class="list_title">
-    <div class="category2 fl">
-      <span class="grayTxt ">排序：</span>
-      <%= link_to "时间", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
+<% if @courses.any? %>
+    <div class="sy_category">
+      <span class="sy_cgrey ">排序：</span>
+      <%= link_to "时间", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sy_cgrey fl", :remote => true %>
       <% if @type.to_i == 1 %>
-          <%= link_to "", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+          <%= link_to "", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
       <% end %>
-      <%= link_to "人气", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sortTxt", :remote => true %>
+      <%= link_to "人气", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sy_cgrey fl #{@type == 1 ? '' : 'ml10'}", :remote => true %>
       <% if @type.to_i  == 2 %>
-          <%= link_to "", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+          <%= link_to "", {:controller => 'syllabuses', :action => 'syllabus_courselist', :id =>@syllabus, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
       <% end %>
+      <% if @syllabus.user == User.current %>
+          <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "sy_btn_green fr mt10 mr10", :target => '_blank'%>
+      <% end %>
+      <div class="cl"></div>
     </div>
-   <!-- <p class="fr grayTxt">创建老师：<%#=@syllabus.user.show_name %><span class="mr10 "></span>  创建时间：<%#=format_date @syllabus.created_at %></p> -->
-    <div class="cl"></div>
-  </div>
-
-  <div class="bloglistbox">
-    <% if @courses.any? %>
-        <% @courses.each do |course|%>
-            <ul class="list-file">
-              <li>
-                <span class="item_list fl"></span>
-                <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
-                <% teacher = User.where("id=?",course.tea_id).first%>
-                <span class="fr grayTxt">
-                    <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
-                  </span>
-              </li>
+    <div class="sy_classbox">
+      <% @courses.each do |course| %>
+          <ul class="sy_classlist">
+            <div class="fl">
+              <% if !course.is_public && !User.current.member_of_course?(course) %>
+                  <h3 class="sy_classlist_title fl"><%=course.name %>（<%=current_time_and_term_short(course) %>）</h3>
+              <% else %>
+                  <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "sy_classlist_title fl",
+                              :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
+              <% end %>
+              <span class="icon_si fl mr20"><%=course.is_public? ? '公开' : '私有' %></span>
               <div class="cl"></div>
-              <li class="ml15">
-                <!--<span class="grayTxt">创建：<%#= format_time(course.created_at) %></span>-->
-                <span class="grayTxt">更新：<%= format_time(course.updated_on) %></span>
-                  <span class="grayTxt">
-                      学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
-                  </span>
-                <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
+              <p class="sy_cgrey">
+                <span class=" mr15">主讲老师：<%=link_to course.teacher.show_name, user_path(course.teacher), :class => 'sy_cblue' %></span>
+                <% if User.current.admin? || User.current.allowed_to?(:as_teacher,course) %>
                     <% homework_num = course.homework_commons.count %>
                 <% else %>
                     <% homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
                 <% end %>
-                <p class="list-info fr grayTxt"><span><%= homework_num %></span><span>作业</span><span>|</span><span> <%= visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
-              </li>
-              <div class="cl"></div>
-            </ul>
-        <% end %>
-        <div>
-          <ul class="wlist" id="pages" >
-            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+                <span class=" mr15">作业：
+                  <% if course.is_public == 0 && !User.current.member_of_course?(course) %>
+                    <%=homework_num %>
+                  <% else %>
+                    <%= link_to homework_num, homework_common_index_path(:course => course.id), :class => "sy_cblue",:target => '_blank'%>
+                  <% end %>
+                </span>
+                <span class=" mr15">资源：
+                  <% if course.is_public == 0 && !User.current.member_of_course?(course) %>
+                    <%=visable_attachemnts_incourse(course).count %>
+                  <% else %>
+                    <%= link_to visable_attachemnts_incourse(course).count, course_files_path(course), :class => "sy_cblue",:target => '_blank'%>
+                  <% end %>
+                </span>
+                <span class=" mr15">学期：<%= current_time_and_term course %></span>
+                <span class=" mr15">更新时间：<%= format_date(course.updated_on) %></span>
+              </p>
+            </div>
+            <% if User.current.member_of_course?(course) %>
+                <%=link_to '进入班级', course_path(course), :class => 'btn_orange_big fr mt5', :target => '_blank' %>
+            <% else %>
+                <%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "btn_green_big fr mt5",:method => "post"%>
+            <% end %>
+            <div class="cl"></div>
           </ul>
-          <div class="cl"></div>
-        </div>
+      <% end %>
+      <div>
+        <ul class="wlist" id="pages" >
+          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+        </ul>
+        <div class="cl"></div>
+      </div>
+   </div>
+<% else %>
+    <div class="icons_tishi"><img src="../images/sy/icons_tan.png" width="110" height="110" alt="" ></div>
+    <% if User.current == @syllabus.user %>
+        <p class="sy_tab_con_p">您建立的课程还未创建班级，请
+          <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "sy_corange", :target => '_blank'%>
+          ，谢谢啦！</p>
     <% else %>
-        <p class="nodata"><%= l(:label_no_data) %></p>
+        <p class="sy_tab_con_p">该课程还未创建班级，敬请期待！</p>
     <% end %>
-  </div>
-</div>
+<% end %>
 
 <script type="text/javascript">
     //如果右边的列表比左边的高度低则将右边的高度设为与左边对齐
diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb
index a23bf9cb8..ba91add96 100644
--- a/app/views/syllabuses/edit.html.erb
+++ b/app/views/syllabuses/edit.html.erb
@@ -1,12 +1,9 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
 <% end %>
-<div class="RightBanner" >
-  <p >课程信息</p>
-</div>
-<div class="HomeWork">
-  <p class="f16 mb10"><%=@syllabus.title %>课程大纲</p>
-  <div class="HomeWorkCon">
+
+<div class="sy_tab_con mb20">
+  <p class="f16 mb10" style="font-size:16px;">课程信息</p>
     <%= labelled_form_for @syllabus, :url =>syllabus_path(@syllabus),
                           :html => {:nhname=>'form',:multipart => true, :id => 'syllabus-form'} do |f| %>
         <div>
@@ -42,6 +39,4 @@
         </div>
         <div class="cl"></div>
     <% end %>
-
-    </div>
 </div><!--HomeWork end-->
\ No newline at end of file
diff --git a/app/views/syllabuses/edit_syllabus_title.js.erb b/app/views/syllabuses/edit_syllabus_title.js.erb
index ee6cc4bcd..29de4f795 100644
--- a/app/views/syllabuses/edit_syllabus_title.js.erb
+++ b/app/views/syllabuses/edit_syllabus_title.js.erb
@@ -1,4 +1,4 @@
 $("#syllabus_title_show").html("<%= escape_javascript render :partial => 'layouts/syllabus_title', :locals => {:syllabus => @syllabus} %>");
-$("#syllabus_title_edit").text("");
+$("#syllabus_title_edit").val("");
 $("#syllabus_title_show").show();
 $("#syllabus_title_edit").hide();
\ No newline at end of file
diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb
index a47f3f81e..9b1bdafc5 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -6,54 +6,48 @@
         sd_create_editor_from_data(<%= @syllabus.id %>, null, "100%", "<%= @syllabus.class.to_s %>");
     });
 </script>
-<div class="RightBanner" >
-<p >课程信息</p>
-</div>
-<% if @syllabus.des_status == 1 && @syllabus.courses.where("is_delete = 0").empty? %>
-    <div class="syllabusbox_tishi">
-      <% if User.current == @syllabus.user %>
-        <p >您建立的课程还未创建班级，请
-          <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>
-        </p>
-      <% else %>
-          <p >本课程下还未创建班级，敬请期待。
-          </p>
-      <% end %>
-    </div>
-<% end %>
-<div class="<%=@syllabus.des_status == 0 ? 'HomeWork' : 'syllabusbox'%>">
-  <% if @syllabus.des_status == 0%>
-      <% if User.current == @syllabus.user %>
-          <p class="syllabus_info_tishi">您建立的课程尚未填写课程大纲，请完善您的<%=link_to '课程大纲', edit_syllabus_path(@syllabus), :class => 'syllabusbox_a_blue' %>！</p>
-      <% else %>
-          <p class="syllabus_info_tishi"><%=@syllabus.user.show_name %>老师尚未完成课程大纲的编写，敬请期待。</p>
-      <% end %>
+<ul id="sy_tab_nav">
+  <li id="sy_tab_nav_1" class="sy_tab_hover" onclick="HoverLi(1);">
+    <a href="javascript:void(0);" class="sy_tab_type" >课程大纲</a>
+  </li>
+  <li id="sy_tab_nav_2"  onclick="HoverLi(2);">
+    <a href="javascript:void(0);" class="sy_tab_type" >班级列表</a>
+  </li>
+</ul>
+<div id="sy_tab_con_1">
+  <% if @syllabus.des_status == 0 && User.current == @syllabus.user %>
+      <div class="icons_tishi"><img src="../images/sy/icons_tan.png" width="110" height="110" alt="" ></div>
+      <p class="sy_tab_con_p">您建立的课程尚未填写课程大纲，请完善您的 <%=link_to '课程大纲', edit_syllabus_path(@syllabus), :class => 'sy_corange' %>，谢谢啦！</p>
+  <% elsif @syllabus.des_status == 0 %>
+      <div class="icons_tishi"><img src="../images/sy/icons_tan.png" width="110" height="110" alt="" ></div>
+      <p class="sy_tab_con_p">该课程尚未填写课程大纲，敬请期待！</p>
   <% else %>
-      <div class="syllabuscon">
-        <%=@syllabus.description.html_safe %>
-        <div class="mt10" style="font-weight:normal;">
-          <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @syllabus} %>
-        </div>
-      </div>
-      <% if User.current.logged? && User.current == @syllabus.user%>
-          <div class="homepagePostSetting" style="margin:10px;">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li><%=link_to '编辑', edit_syllabus_path(@syllabus), :class => 'postOptionLink'%></li>
-                  <li><%=link_to '删除', delete_des_syllabus_path(@syllabus), :class => 'postOptionLink', :confirm => l(:text_are_you_sure)%></li>
-                </ul>
-              </li>
-            </ul>
+      <div class="sy_tab_con">
+        <div class="syllabuscon">
+          <%=@syllabus.description.html_safe %>
+          <div class="mt10" style="font-weight:normal;">
+            <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @syllabus} %>
           </div>
-          <div class="cl"></div>
-      <% end %>
-      <div class="fr fontGrey2">更新时间：<%=format_time @syllabus.updated_at %><div></div></div>
-      <div class="cl"></div>
-<% end %>
-
+        </div>
+        <% if User.current.logged? && User.current == @syllabus.user%>
+            <div class="homepagePostSetting" style="margin:10px;">
+              <ul>
+                <li class="homepagePostSettingIcon">
+                  <ul class="homepagePostSettiongText">
+                    <li><%=link_to '编辑', edit_syllabus_path(@syllabus), :class => 'postOptionLink'%></li>
+                    <li><%=link_to '删除', delete_des_syllabus_path(@syllabus), :class => 'postOptionLink', :confirm => l(:text_are_you_sure)%></li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+            <div class="cl"></div>
+        <% end %>
+        <div class="fr fontGrey2">更新时间：<%=format_time @syllabus.updated_at %><div></div></div>
+        <div class="cl"></div>
+      </div><!--HomeWork end-->
+  <% end %>
   <% count=@syllabus.journals_for_messages.count %>
-  <div class="homepagePostReply">
+  <div class="homepagePostReply" style="margin-bottom: 20px;">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => @syllabus, :user_activity_id => @syllabus.id} %>
 
     <% comments = @syllabus.journals_for_messages.reorder("created_on desc").limit(3) %>
@@ -62,26 +56,28 @@
           <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
-  <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-    <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @syllabus.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
-    <div class="homepagePostReplyInputContainer mb10">
-      <% if User.current.logged? %>
-          <div nhname='new_message_<%= @syllabus.id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_syllabus_message', :id => @syllabus.id},:method => "post") do |f|%>
-                <div nhname='toolbar_container_<%= @syllabus.id%>'></div>
-                <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @syllabus.id%>' name="comment"></textarea>
-                <a id="new_message_submit_btn_<%= @syllabus.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-                <div class="cl"></div>
-                <p nhname='contentmsg_<%= @syllabus.id%>'></p>
-            <% end%>
-          </div>
-      <% else %>
-          <%= render :partial => "users/show_unlogged" %>
-      <% end %>
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @syllabus.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <% if User.current.logged? %>
+            <div nhname='new_message_<%= @syllabus.id%>' style="display:none;">
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_syllabus_message', :id => @syllabus.id},:method => "post") do |f|%>
+                  <div nhname='toolbar_container_<%= @syllabus.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @syllabus.id%>' name="comment"></textarea>
+                  <a id="new_message_submit_btn_<%= @syllabus.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= @syllabus.id%>'></p>
+              <% end%>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
+        <div class="cl"></div>
+      </div>
       <div class="cl"></div>
     </div>
     <div class="cl"></div>
-  </div>
-  <div class="cl"></div>
-</div><!--回复框 用正式版样式-->
-</div><!--HomeWork end-->
+  </div><!--回复框 用正式版样式-->
+</div><!--课程大纲 end-->
+
+
diff --git a/app/views/syllabuses/syllabus_courselist.html.erb b/app/views/syllabuses/syllabus_courselist.html.erb
index 0b0713738..ecb8ed7b8 100644
--- a/app/views/syllabuses/syllabus_courselist.html.erb
+++ b/app/views/syllabuses/syllabus_courselist.html.erb
@@ -1 +1,12 @@
-<%= render :partial => 'syllabus_course_list'%>
\ No newline at end of file
+<ul id="sy_tab_nav">
+  <li id="sy_tab_nav_1" onclick="HoverLi(1);">
+    <a href="javascript:void(0);" class="sy_tab_type" >课程大纲</a>
+  </li>
+  <li id="sy_tab_nav_2" class="sy_tab_hover" onclick="HoverLi(2);">
+    <a href="javascript:void(0);" class="sy_tab_type" >班级列表</a>
+  </li>
+</ul>
+
+<div id="sy_tab_con_2">
+  <%=render :partial => 'syllabuses/syllabus_course_list' %>
+</div><!--班级列表 end-->
diff --git a/app/views/syllabuses/syllabus_courselist.js.erb b/app/views/syllabuses/syllabus_courselist.js.erb
index 5433ea2c1..1fc73f8e6 100644
--- a/app/views/syllabuses/syllabus_courselist.js.erb
+++ b/app/views/syllabuses/syllabus_courselist.js.erb
@@ -1 +1 @@
-$("#course-list").replaceWith('<%= escape_javascript( render :partial => 'syllabus_course_list') %>');
\ No newline at end of file
+$("#sy_tab_con_2").html('<%= escape_javascript( render :partial => 'syllabus_course_list') %>');
\ No newline at end of file
diff --git a/app/views/users/_blog_comment_reply_banner.html.erb b/app/views/users/_blog_comment_reply_banner.html.erb
deleted file mode 100644
index 496cd2c7c..000000000
--- a/app/views/users/_blog_comment_reply_banner.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="homepagePostReplyBanner">
-  <div class="homepagePostReplyBannerCount">
-    <span>回复</span>
-    <span  class="reply_iconup" > ︿</span>
-    <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-  </div>
-  <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-  <%if count>3 %>
-      <div class="homepagePostReplyBannerMore">
-        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_blog_comment_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=homepage %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-          展开更多
-        </a>
-      </div>
-  <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/users/_blog_comments_replies.html.erb b/app/views/users/_blog_comments_replies.html.erb
deleted file mode 100644
index b4a134b7b..000000000
--- a/app/views/users/_blog_comments_replies.html.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-<ul>
-  <% comments.each do |comment| %>
-      <script type="text/javascript">
-          $(function(){
-              showNormalImage('reply_content_<%= comment.id %>');
-              autoUrl('reply_content_<%= comment.id %>');
-          });
-      </script>
-      <li class="homepagePostReplyContainer" nhname="reply_rec">
-        <div class="homepagePostReplyPortrait">
-          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
-        </div>
-        <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.created_on) %>
-          </div>
-          <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-              <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
-          <% end %>
-          <% if !comment.content_detail.blank? %>
-              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                <%= comment.content_detail.html_safe %>
-              </div>
-              <div class="orig_reply mb10 mt-10">
-                <div class="reply">
-                <span class="reply-right">
-                    <span id="reply_praise_count_<%=comment.id %>">
-                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                    </span>
-                    <span style="position: relative" class="fr mr20">
-                        <%= link_to(
-                                    l(:button_reply),
-                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id, :homepage => homepage},
-                                    :remote => true,
-                                    :method => 'get',
-                                    :title => l(:button_reply))  if !comment.root.locked? %>
-                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
-                    </span>
-                  <% if comment.author == User.current %>
-                      <%= link_to(
-                                  l(:button_delete),
-                                  {:controller => 'blog_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id, :homepage => homepage},
-                                  :method => :delete,
-                                  :remote => true,
-                                  :class => 'fr mr20',
-                                  :data => {:confirm => l(:text_are_you_sure)},
-                                  :title => l(:button_delete)) %>
-                    <% end %>
-                </span>
-                  <div class="cl"></div>
-                </div>
-              </div>
-              <p id="reply_message_<%= comment.id%>"></p>
-          <% end %>
-        </div>
-        <div class="cl"></div>
-      </li>
-  <% end %>
-</ul>
\ No newline at end of file
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index b8ea13cf4..3c9f3d279 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -4,6 +4,17 @@
 <div class="orig_right fl">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
-  <div class="orig_content "><%= comment.content_detail.html_safe %></div>
+  <div class="orig_content ">
+    <% if comment.class == Journal %>
+        <% if comment.details.any? %>
+            <% details_to_strings(comment.details).each do |string| %>
+                <p><%= string %></p>
+            <% end %>
+        <% end %>
+        <P><%= comment.content_detail.html_safe %></P>
+    <% else %>
+        <%= comment.content_detail.html_safe %>
+    <% end %>
+  </div>
 </div>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index f87b483da..ded407f8c 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -290,28 +290,12 @@
 
   <% count=activity.journals_for_messages.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount"><span>回复</span>
-        <span  class="reply_iconup" > ︿</span>
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply_homework('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'HomeworkCommon',<%=user_activity_id %>,-1,<%=course_activity %>,<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity} %>
 
     <% comments = activity.journals_for_messages.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%=render :partial => 'users/homework_replies', :locals => {:comments => comments, :is_in_course => -1,:course_activity=>course_activity, :is_teacher => is_teacher, :user_activity_id => user_activity_id} %>
+          <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'HomeworkCommon', :is_in_course => -1,:course_activity=>course_activity, :is_teacher => is_teacher, :user_activity_id => user_activity_id} %>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 64ba9f6df..3225a1a8b 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -40,16 +40,14 @@
   </div>
   <% all_comments = []%>
   <% count=get_all_children(all_comments, activity).count %>
-  <% allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>
-  <%# count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/journal_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :allow_delete => allow_delete} %>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% all_comments = []%>
     <% comments = get_all_children(all_comments, activity)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/journal_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :allow_delete => allow_delete, :activity_id =>activity.id}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :activity_id =>activity.id}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 48daa6e95..692ad4e59 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -81,7 +81,7 @@
   <% all_comments = []%>
   <% count=get_all_children(all_comments, activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/message_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
 
     <% all_comments = []%>
     <% comments = get_all_children(all_comments, activity)[0..2] %>
@@ -97,7 +97,7 @@
           <div class="homepagePostReplyInputContainer  mb10">
             <% if User.current.logged? %>
                 <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,is_course=>is_course},:method => "post", :remote => true) do |f|%>
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,:is_course=>is_course},:method => "post", :remote => true) do |f|%>
                       <input type="hidden" name="quote[quote]" value="">
                       <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                       <div nhname='toolbar_container_<%= user_activity_id%>'></div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 18f16b068..f46282ff8 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -62,6 +62,7 @@
     </div>
     <div class="cl"></div>
   </div>
+
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
@@ -69,31 +70,32 @@
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/news_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'News', :activity_id => activity.id} %>
+        </div>
+    <% end %>
+    <% if activity.commentable? %>
+        <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+          <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+          <div class="homepagePostReplyInputContainer mb10">
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+                  <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+                      <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                      <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+                      <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                      <div class="cl"></div>
+                      <p nhname='contentmsg_<%= user_activity_id%>'></p>
+                  <% end%>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+          <div class="cl"></div>
         </div>
     <% end %>
-
-    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mb10">
-        <% if User.current.logged? %>
-            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-                  <div class="cl"></div>
-                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
-              <% end%>
-            </div>
-        <% else %>
-            <%= render :partial => "users/show_unlogged" %>
-        <% end %>
-        <div class="cl"></div>
-      </div>
-      <div class="cl"></div>
-    </div>
   </div>
 </div>
 <script type="text/javascript">
diff --git a/app/views/users/_homework_replies.html.erb b/app/views/users/_homework_replies.html.erb
deleted file mode 100644
index 285d464b1..000000000
--- a/app/views/users/_homework_replies.html.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-<ul>
-  <% comments.reorder("created_on desc").each do |comment| %>
-      <script type="text/javascript">
-          $(function(){
-              showNormalImage('reply_content_<%= comment.id %>');
-              autoUrl('reply_content_<%= comment.id %>');
-          });
-      </script>
-      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();">
-        <div class="homepagePostReplyPortrait">
-          <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
-        </div>
-        <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <%= link_to comment.user.show_name, user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.created_on) %>
-          </div>
-          <% unless comment.m_parent_id.nil? %>
-              <% parents_rely = [] %>
-              <% parents_rely = get_reply_parents parents_rely, comment %>
-              <% length = parents_rely.length %>
-              <div id="comment_reply_<%=comment.id %>">
-                <% if length <= 3 %>
-                    <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
-                <% else %>
-                    <div class="orig_cont clearfix">
-                      <div class="orig_cont clearfix">
-                        <div>
-                          <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
-                        </div>
-                        <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
-                      </div>
-                      <div class="orig_cont_hide clearfix">
-                        <span class="orig_icon" >&darr; </span>
-                        <span class="orig_icon" style="display:none;" > &uarr;</span>
-                        <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
-                      </div>
-                      <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-                    </div>
-                <% end %>
-              </div>
-          <% end %>
-          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth t_txt" id="reply_content_<%= comment.id %>">
-            <%= comment.notes.html_safe %>
-          </div>
-          <div class="orig_reply mb10 mt-10">
-            <div class="reply">
-                <span class="reply-right">
-                    <span id="reply_praise_count_<%=comment.id %>">
-                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                    </span>
-                    <span style="position: relative" class="fr mr20">
-                        <%= link_to(
-                                    l(:button_reply),
-                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity},
-                                    :remote => true,
-                                    :method => 'get',
-                                    :title => l(:button_reply)) %>
-                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
-                    </span>
-                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
-                  <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity},
-                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
-                    <% end %>
-                </span>
-              <div class="cl"></div>
-            </div>
-          </div>
-          <p id="reply_message_<%= comment.id%>"></p>
-        </div>
-        <div class="cl"></div>
-      </li>
-  <% end %>
-</ul>
\ No newline at end of file
diff --git a/app/views/users/_journal_replies.html.erb b/app/views/users/_journal_replies.html.erb
deleted file mode 100644
index 7fc708ebb..000000000
--- a/app/views/users/_journal_replies.html.erb
+++ /dev/null
@@ -1,85 +0,0 @@
-<ul>
-  <% comments.each do |comment| %>
-      <script type="text/javascript">
-          $(function(){
-              showNormalImage('reply_content_<%= comment.id %>');
-              autoUrl('reply_content_<%= comment.id %>');
-          });
-      </script>
-      <li class="homepagePostReplyContainer" nhname="reply_rec">
-        <div class="homepagePostReplyPortrait">
-          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
-        </div>
-        <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.created_on) %>
-          </div>
-          <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-              <% parents_rely = [] %>
-              <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
-              <% length = parents_rely.length %>
-              <div id="comment_reply_<%=comment.id %>">
-                <% if length <= 3 %>
-                    <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
-                <% else %>
-                    <div class="orig_cont clearfix">
-                      <div class="orig_cont clearfix">
-                        <div>
-                          <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
-                        </div>
-                        <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
-                      </div>
-                      <div class="orig_cont_hide clearfix">
-                        <span class="orig_icon" >&darr; </span>
-                        <span class="orig_icon" style="display:none;" > &uarr;</span>
-                        <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
-                      </div>
-                      <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-                    </div>
-                <% end %>
-              </div>
-          <% end %>
-          <% if !comment.content_detail.blank? || comment.class == Journal %>
-              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                <% if comment.class == Journal %>
-                    <% if comment.details.any? %>
-                        <% details_to_strings(comment.details).each do |string| %>
-                            <p><%= string %></p>
-                        <% end %>
-                    <% end %>
-                    <P><%= comment.notes.html_safe %></P>
-                <% else %>
-                    <%= comment.content_detail.html_safe %>
-                <% end %>
-              </div>
-              <div class="orig_reply mb10 mt-10">
-                <div class="reply">
-                <span class="reply-right">
-                    <span id="reply_praise_count_<%=comment.id %>">
-                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                    </span>
-                    <span style="position: relative" class="fr mr20">
-                        <%= link_to(
-                                    l(:button_reply),
-                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
-                                    :remote => true,
-                                    :method => 'get',
-                                    :title => l(:button_reply)) %>
-                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
-                    </span>
-                  <% if allow_delete %>
-                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user, :user_activity_id => user_activity_id, :activity_id => activity_id},
-                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
-                    <% end %>
-                </span>
-                  <div class="cl"></div>
-                </div>
-              </div>
-              <p id="reply_message_<%= comment.id%>"></p>
-          <% end %>
-        </div>
-        <div class="cl"></div>
-      </li>
-  <% end %>
-</ul>
\ No newline at end of file
diff --git a/app/views/users/_journal_reply_banner.html.erb b/app/views/users/_journal_reply_banner.html.erb
deleted file mode 100644
index c231f473d..000000000
--- a/app/views/users/_journal_reply_banner.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="homepagePostReplyBanner">
-  <div class="homepagePostReplyBannerCount">
-    <span>回复</span>
-    <span  class="reply_iconup" > ︿</span>
-    <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-  </div>
-  <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-  <%if count>3 %>
-      <div class="homepagePostReplyBannerMore">
-        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_journal_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=allow_delete %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-          展开更多
-        </a>
-      </div>
-  <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/users/_message_contents.html.erb b/app/views/users/_message_contents.html.erb
index eab125006..365914908 100644
--- a/app/views/users/_message_contents.html.erb
+++ b/app/views/users/_message_contents.html.erb
@@ -1,23 +1,29 @@
-<% parents_rely = [] %>
-<% parents_rely = get_reply_parents_no_root parents_rely, comment %>
-<% length = parents_rely.length %>
-<div id="comment_reply_<%=comment.id %>">
-  <% if length <= 3 %>
-      <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
-  <% else %>
-      <div class="orig_cont clearfix">
-        <div class="orig_cont clearfix">
-          <div>
-            <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+<div class="homepagePostReplyPublisher">
+  <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+  <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
+</div>
+<% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+    <% parents_rely = [] %>
+    <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
+    <% length = parents_rely.length %>
+    <div id="comment_reply_<%=comment.id %>">
+      <% if length <= 3 %>
+          <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+      <% else %>
+          <div class="orig_cont clearfix">
+            <div class="orig_cont clearfix">
+              <div>
+                <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+            </div>
+            <div class="orig_cont_hide clearfix">
+              <span class="orig_icon" >&darr; </span>
+              <span class="orig_icon" style="display:none;" > &uarr;</span>
+              <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
+            </div>
+            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
           </div>
-          <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
-        </div>
-        <div class="orig_cont_hide clearfix">
-          <span class="orig_icon" >&darr; </span>
-          <span class="orig_icon" style="display:none;" > &uarr;</span>
-          <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
-        </div>
-        <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-      </div>
-  <% end %>
-</div>
\ No newline at end of file
+      <% end %>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_message_replies.html.erb b/app/views/users/_message_replies.html.erb
index c6f9d91b0..9ef2d146d 100644
--- a/app/views/users/_message_replies.html.erb
+++ b/app/views/users/_message_replies.html.erb
@@ -11,13 +11,8 @@
           <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
         </div>
         <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.created_on) %>
-          </div>
-          <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-            <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
-          <% end %>
+          <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
+
           <% if !comment.content_detail.blank? %>
               <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                 <%= comment.content_detail.html_safe %>
@@ -28,6 +23,7 @@
                     <span id="reply_praise_count_<%=comment.id %>">
                       <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                     </span>
+                  <% if type == 'Message' %>
                     <span style="position: relative" class="fr mr20">
                         <%= link_to(
                                     l(:button_reply),
@@ -37,7 +33,7 @@
                                     :title => l(:button_reply)) %>
                       <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
                     </span>
-                  <% if comment.course_destroyable_by?(User.current) %>
+                    <% if comment.course_destroyable_by?(User.current) %>
                       <%= link_to(
                                   l(:button_delete),
                                   delete_board_message_path(comment,:board_id =>comment.board.id, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board),
@@ -48,6 +44,61 @@
                                   :title => l(:button_delete)
                           ) %>
                     <% end %>
+                  <% elsif type == 'JournalsForMessage' %>
+                    <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                    <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                      <% if comment.creator_user == User.current || User.current.admin? %>
+                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                      <% end %>
+                  <% elsif type == 'OrgDocumentComment' %>
+                      <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                        <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                      </span>
+                      <% if comment.creator_user == User.current %>
+                        <%= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'org_document_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id},
+                                  :method => :delete,
+                                  :remote => true,
+                                  :class => 'fr mr20',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)) %>
+                      <% end %>
+                  <% elsif type == 'BlogComment' %>
+                      <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id, :homepage => homepage},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply))  if !comment.root.locked? %>
+                        <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                      </span>
+                      <% if comment.author == User.current %>
+                        <%= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'blog_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id, :homepage => homepage},
+                                  :method => :delete,
+                                  :remote => true,
+                                  :class => 'fr mr20',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)) %>
+                      <% end %>
+                  <% end %>
                 </span>
                   <div class="cl"></div>
                 </div>
diff --git a/app/views/users/_message_reply_banner.html.erb b/app/views/users/_message_reply_banner.html.erb
deleted file mode 100644
index 0c8cda379..000000000
--- a/app/views/users/_message_reply_banner.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="homepagePostReplyBanner">
-  <div class="homepagePostReplyBannerCount">
-    <span>回复</span>
-    <span  class="reply_iconup" > ︿</span>
-    <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-  </div>
-  <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-  <%if count>3 %>
-      <div class="homepagePostReplyBannerMore">
-        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_message_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=is_course %>,<%=is_board %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-          展开更多
-        </a>
-      </div>
-  <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/users/_news_contents.html.erb b/app/views/users/_news_contents.html.erb
new file mode 100644
index 000000000..2ff2c0746
--- /dev/null
+++ b/app/views/users/_news_contents.html.erb
@@ -0,0 +1,29 @@
+<div class="homepagePostReplyPublisher">
+  <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+  <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
+</div>
+<% if !comment.parent.nil? %>
+    <% parents_rely = [] %>
+    <% parents_rely = get_reply_parents parents_rely, comment %>
+    <% length = parents_rely.length %>
+    <div id="comment_reply_<%=comment.id %>">
+      <% if length <= 3 %>
+          <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+      <% else %>
+          <div class="orig_cont clearfix">
+            <div class="orig_cont clearfix">
+              <div>
+                <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+            </div>
+            <div class="orig_cont_hide clearfix">
+              <span class="orig_icon" >&darr; </span>
+              <span class="orig_icon" style="display:none;" > &uarr;</span>
+              <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
+            </div>
+            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+          </div>
+      <% end %>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_news_replies.html.erb b/app/views/users/_news_replies.html.erb
new file mode 100644
index 000000000..a4732af8c
--- /dev/null
+++ b/app/views/users/_news_replies.html.erb
@@ -0,0 +1,90 @@
+<ul>
+  <% comments.each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
+        <div class="homepagePostReplyPortrait">
+          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>
+
+          <% if !comment.content_detail.blank? || comment.class == Journal %>
+              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                <% if comment.class == Journal %>
+                    <% if comment.details.any? %>
+                        <% details_to_strings(comment.details).each do |string| %>
+                            <p><%= string %></p>
+                        <% end %>
+                    <% end %>
+                    <P><%= comment.notes.html_safe %></P>
+                <% else %>
+                    <%= comment.content_detail.html_safe %>
+                <% end %>
+              </div>
+              <div class="orig_reply mb10 mt-10">
+                <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%= comment.id %>">
+                      <%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
+                    </span>
+                    <% if type == 'HomeworkCommon' %>
+                        <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                          <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                        </span>
+                        <% if User.current.admin? ||is_teacher || comment.user == User.current%>
+                            <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity},
+                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                        <% end %>
+                    <% elsif type == 'News' %>
+                        <span style="position: relative" class="fr mr20">
+                            <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users', :action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                            <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                        </span>
+                        <%= link_to('删除', {:controller => 'comments', :action => 'destroy', :id => activity_id, :comment_id => comment, :user_activity_id => user_activity_id},
+                                  :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) if News.find(activity_id).author == User.current %>
+                    <% elsif type == 'Issue' %>
+                        <span style="position: relative" class="fr mr20">
+                            <%= link_to(
+                                        l(:button_reply),
+                                        {:controller => 'users', :action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                        :remote => true,
+                                        :method => 'get',
+                                        :title => l(:button_reply)) %>
+                            <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                        </span>
+                        <%= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'issues',:action => 'delete_journal', :id => activity_id,:journal_id=>comment.id, :user_activity_id => user_activity_id},
+                                  :method => 'get',
+                                  :remote=>true,
+                                  :class => 'fr mr20',
+                                  :title => l(:button_delete)
+                          ) if comment.user_id == User.current.id %>
+                    <% end %>
+                </span>
+                  <div class="cl"></div>
+                </div>
+              </div>
+              <p id="reply_message_<%= comment.id%>"></p>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_org_document_replies.html.erb b/app/views/users/_org_document_replies.html.erb
deleted file mode 100644
index ce26cf70c..000000000
--- a/app/views/users/_org_document_replies.html.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-<ul>
-  <% comments.each do |comment| %>
-      <script type="text/javascript">
-          $(function(){
-              showNormalImage('reply_content_<%= comment.id %>');
-              autoUrl('reply_content_<%= comment.id %>');
-          });
-      </script>
-      <li class="homepagePostReplyContainer" nhname="reply_rec">
-        <div class="homepagePostReplyPortrait">
-          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
-        </div>
-        <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.created_at) %>
-          </div>
-          <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-              <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
-          <% end %>
-          <% if !comment.content_detail.blank? %>
-              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                <%= comment.content_detail.html_safe %>
-              </div>
-              <div class="orig_reply mb10 mt-10">
-                <div class="reply">
-                <span class="reply-right">
-                    <span id="reply_praise_count_<%=comment.id %>">
-                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                    </span>
-                    <span style="position: relative" class="fr mr20">
-                        <%= link_to(
-                                    l(:button_reply),
-                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
-                                    :remote => true,
-                                    :method => 'get',
-                                    :title => l(:button_reply)) %>
-                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
-                    </span>
-                  <% if comment.creator_user == User.current %>
-                      <%= link_to(
-                                  l(:button_delete),
-                                  {:controller => 'org_document_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id},
-                                  :method => :delete,
-                                  :remote => true,
-                                  :class => 'fr mr20',
-                                  :data => {:confirm => l(:text_are_you_sure)},
-                                  :title => l(:button_delete)) %>
-                    <% end %>
-                </span>
-                  <div class="cl"></div>
-                </div>
-              </div>
-              <p id="reply_message_<%= comment.id%>"></p>
-          <% end %>
-        </div>
-        <div class="cl"></div>
-      </li>
-  <% end %>
-</ul>
\ No newline at end of file
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 3dac8026a..fb2fc214e 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -5,7 +5,7 @@
   <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
   <% if count > 0 %>
       <div class="" id="reply_div_<%= user_activity_id %>">
-        <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+        <%= render :partial => 'users/news_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Issue', :activity_id => activity.id} %>
       </div>
   <% end %>
 
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 00075dc8e..0a5c18a9b 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -82,7 +82,7 @@
   <%# allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>
   <%# count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/message_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
 
     <% all_comments = []%>
     <% comments = get_all_children(all_comments, activity)[0..2] %>
@@ -98,7 +98,7 @@
           <div class="homepagePostReplyInputContainer mb10">
             <% if User.current.logged? %>
                 <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id,:is_course => is_course, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
                       <input type="hidden" name="quote[quote]" value="">
                       <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                       <div nhname='toolbar_container_<%= user_activity_id%>'></div>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index cdceb490d..4c7ec2b04 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -62,11 +62,11 @@
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
-    
+
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/news_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'News', :activity_id => activity.id} %>
         </div>
     <% end %>
 
diff --git a/app/views/users/_reply_banner.html.erb b/app/views/users/_reply_banner.html.erb
index 25175542f..43aebb89c 100644
--- a/app/views/users/_reply_banner.html.erb
+++ b/app/views/users/_reply_banner.html.erb
@@ -10,9 +10,27 @@
   <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
   <%if count>3 %>
       <div class="homepagePostReplyBannerMore">
-        <a id="reply_btn_<%=user_activity_id%>" onclick="expand_all_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-          展开更多
-        </a>
-      </div>
+        <% if activity.class.to_s == 'HomeworkCommon' && is_in_course == -1 %>
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply_homework('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'HomeworkCommon',<%=user_activity_id %>,-1,<%=course_activity %>,<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% elsif activity.class.to_s == 'HomeworkCommon' %>
+            <a id="reply_btn_<%=activity.id%>" onclick="expand_reply_homework('#reply_div_<%= activity.id %> li','#reply_btn_<%=activity.id%>',<%= activity.id %>,'HomeworkCommon',<%=activity.id %>,<%=is_in_course %>,-1, -1)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% elsif activity.class.to_s == 'Message' %>
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_message_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=is_course %>,<%=is_board %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% elsif activity.class.to_s == 'BlogComment' %>
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_blog_comment_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=homepage %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% else %>
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_all_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+        <% end %>
+        </div>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index cb8b2e0ff..aa519a5da 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -33,7 +33,6 @@
                   <%= hidden_field_tag 'is_course', params[:is_course], :value => @is_course %>
                   <%= hidden_field_tag 'is_board', params[:is_board], :value => @is_board %>
                   <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %>
-                  <%= hidden_field_tag 'reply_id', params[:reply_id], :value => reply.author.id %>
                   <%= hidden_field_tag 'activity_id',params[:activity_id],:value =>@activity_id %>
                   <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
                   <div nhname='toolbar_container_<%= reply.id%>'></div>
@@ -47,7 +46,6 @@
                   <input type="hidden" name="blog_comment[title]" value="RE:<%=(BlogComment.find @activity_id).title %>" id="reply_subject">
                   <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
                   <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %>
-                  <%= hidden_field_tag 'reply_id', params[:reply_id], :value => reply.author_id %>
                   <%= hidden_field_tag 'homepage', params[:homepage], :value => @homepage %>
                   <div nhname='toolbar_container_<%= reply.id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
@@ -65,7 +63,26 @@
                   <div class="cl"></div>
                   <p nhname='contentmsg_<%= reply.id%>'></p>
               <% end%>
-        <% end %>
+          <% elsif @type == 'News' %>
+              <%= form_for('new_form', :url => {:controller => 'comments',:action => 'reply', :id => reply.id}, :method => "post", :remote => true) do |f| %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <div nhname='toolbar_container_<%= reply.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= reply.id%>'></p>
+                  <% end%>
+          <% elsif @type == 'Issue' %>
+              <%= form_for('new_form',:url => add_reply_issue_path(reply.issue.id),:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'journal_id',params[:journal_id],:value =>reply.id %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <div nhname='toolbar_container_<%= reply.id%>' ></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= reply.id%>' class="fl"></p>
+              <% end %>
+          <% end %>
         </div>
         <div class="cl"></div>
       </div>
diff --git a/app/views/users/_show_user_homeworks.html.erb b/app/views/users/_show_user_homeworks.html.erb
index 46e075412..f54f49865 100644
--- a/app/views/users/_show_user_homeworks.html.erb
+++ b/app/views/users/_show_user_homeworks.html.erb
@@ -1,8 +1,8 @@
 <div class="w985"> <a href="javascript:void(0);" class="popup-close" onclick="hideModal()"></a>
   <div class="f16 fb fontBlue mb10">选用题库中的题目</div>
   <div class="subject-list fl mr10">
-    <a href="<%= user_homework_type_user_path(@user,:is_import => 1) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active fl" data-remote="true">公共题库</a>
-    <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 1) %>" id="user_homeworks_choose" class="resource-tab fl" data-remote="true">我的题库</a>
+    <a href="<%= user_homework_type_user_path(@user,:is_import => 1) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active fl" data-remote="true">我的题库</a>
+    <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 1) %>" id="user_homeworks_choose" class="resource-tab fl" data-remote="true">公共题库</a>
     <!--<a href="<%#= user_homework_type_user_path(@user,:type=>'3',:is_import => 1) %>" id="apply_homeworks_choose" class="resource-tab fl" data-remote="true">申请题库</a>-->
 
     <div id="homework_search_input">
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index a19bfc016..b6cd9ebc3 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -44,13 +44,13 @@
   <% all_comments = []%>
   <% count=get_all_children(all_comments, activity).count %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/blog_comment_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 0} %>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 0} %>
 
     <% all_comments = []%>
     <% comments = get_all_children(all_comments, activity)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/blog_comments_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 0}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 0}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 6e325c2f0..990a193cc 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -302,28 +302,12 @@
 
   <% count=homework_common.journals_for_messages.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount"><span>回复</span>
-        <span  class="reply_iconup" > ︿</span>
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=homework_common.id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>homework_common, :user_activity_id=>homework_common.id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=homework_common.id%>" onclick="expand_reply_homework('#reply_div_<%= homework_common.id %> li','#reply_btn_<%=homework_common.id%>',<%= homework_common.id %>,'HomeworkCommon',<%=homework_common.id %>,<%=is_in_course %>,-1, -1)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => homework_common, :user_activity_id => -1, :is_in_course => is_in_course,:course_activity=>-1} %>
 
     <% comments = homework_common.journals_for_messages.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= homework_common.id %>">
-          <%=render :partial => 'users/homework_replies', :locals => {:comments => comments, :is_in_course => is_in_course, :course_activity=> -1, :is_teacher => is_teacher, :user_activity_id => -1} %>
+          <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'HomeworkCommon', :is_in_course => is_in_course,:course_activity=>-1, :is_teacher => is_teacher, :user_activity_id => -1} %>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 4fb79ee2d..7880cde99 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -64,15 +64,14 @@
   </div>
   <% all_comments = []%>
   <% count=get_all_children(all_comments, activity).count %>
-  <% allow_delete = (activity.user == User.current || User.current.admin?) %>
   <div class="homepagePostReply">
-    <%= render :partial => 'users/journal_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :allow_delete => allow_delete} %>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% all_comments = []%>
     <% comments = get_all_children(all_comments, activity)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/journal_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :allow_delete => allow_delete, :activity_id =>activity.id}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :activity_id =>activity.id}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index c27002d24..fa2be7ae1 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -653,7 +653,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您增加了新的班级成员：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+            <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", {:controller => 'courses', :action => 'settings', :id => ma.course_id, :tab=>'member'}, :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                         <!--:onmouseover => "message_titile_show($(this),event)",-->
                         <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </a>
diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index aa77c727d..9fa93c76e 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -59,7 +59,7 @@
                     <% end %>
                     <% if courses.count > 3 %>
                         <li class="syllabus_class_list_more" id="syllabus_class_list_more_<%=syllabus.id %>">
-                          <a href="javascript:void(0);" id="expand_list_<%=syllabus.id %>" data-init="0" onclick="expand_course_list(<%=syllabus.id %>,'#syllabus_course_ul_<%=syllabus.id %> li','#expand_list_<%=syllabus.id %>',<%=courses.count %>)">共<%=courses.count %>个课程，点击全部展开</a>
+                          <a href="javascript:void(0);" id="expand_list_<%=syllabus.id %>" data-init="0" onclick="expand_course_list(<%=syllabus.id %>,'#syllabus_course_ul_<%=syllabus.id %> li','#expand_list_<%=syllabus.id %>',<%=courses.count %>)">共<%=courses.count %>个班级，点击全部展开</a>
                         </li>
                     <% end %>
                 <% end %>
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index b7485def3..cc36ef3b3 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -1,13 +1,15 @@
 <% if params[:type] == 'HomeworkCommon' %>
-$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/homework_replies', :locals => {:comments => @journals, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :type => @type, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
 <% elsif params[:type] == 'JournalsForMessage' %>
-$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/journal_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
+$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id =>params[:id].to_i}) %>');
 <% elsif params[:type] == 'Message' %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i,:is_course => @is_course, :is_board => @is_board}) %>');
 <% elsif params[:type] == 'BlogComment' %>
-$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/blog_comments_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i, :homepage => @homepage}) %>');
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i, :homepage => @homepage}) %>');
 <% elsif params[:type] == 'OrgDocumentComment' %>
-$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/org_document_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>');
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>');
+<% elsif params[:type] == 'News' || params[:type] == 'Issue' %>
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>');
 <% else %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
 <% end %>
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 238102879..84503f837 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -7,7 +7,7 @@
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
-        <%if @homework.anonymous_comment == 0 && @homework.homework_detail_manual.comment_status != 1%>
+        <%if !@is_test && @homework.anonymous_comment == 0 && @homework.homework_detail_manual.comment_status != 1%>
             $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
             showModal('ajax-modal', '360px');
             $('#ajax-modal').siblings().remove();
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index ce7b2dad0..9acffce3d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -36,7 +36,7 @@
         <ul class="homepagePostTypeProject fl">
           <li class="f14">更多</li>
           <li class="mt-4"><%= link_to "个人留言", {:controller => "users", :action => "show", :type => "user_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-          <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%>
+          <li class="mt-4"><%= link_to @user == User.current ? "我的动态" : "他的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%>
           <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
         </ul>
       </li>
diff --git a/app/views/users/show_all_replies.js.erb b/app/views/users/show_all_replies.js.erb
index 2d4321bce..7b47b29d8 100644
--- a/app/views/users/show_all_replies.js.erb
+++ b/app/views/users/show_all_replies.js.erb
@@ -1,7 +1,7 @@
 <% unless @comment.parent.nil? %>
     <% if params[:type] == 'JournalsForMessage' && (@comment.jour_type == 'Principal' || @comment.jour_type == 'Course') %>
         $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/journal_comment_reply', :locals => {:comment => @comment.parent})%>");
-    <% elsif (@comment.class.to_s == 'Message' || @comment.class.to_s == 'BlogComment' ) %>
+    <% elsif (@comment.class.to_s == 'Message' || @comment.class.to_s == 'BlogComment' || @comment.class.to_s == 'OrgDocumentComment') %>
         $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/journal_comment_reply', :locals => {:comment => @comment.parent})%>");
     <% else %>
         $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
diff --git a/config/routes.rb b/config/routes.rb
index bcfb6de98..1124080b7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -207,6 +207,12 @@ RedmineApp::Application.routes.draw do
   resources :apply_project_masters
   delete 'apply_project_masters', :to => 'apply_project_masters#delete'
 
+  resources :comments do
+    member do
+      post 'reply'
+      get 'quote'
+    end
+  end
   # resources :organization, :except => [:show] do
   #
   # end
@@ -1141,6 +1147,7 @@ RedmineApp::Application.routes.draw do
       get 'search_public_orgs_not_in_course'
       get "homework_search"
       get "show_comparecode"
+      get "statistics_course"
     end
     collection do
       match 'join_private_courses', :via => [:get, :post]
diff --git a/db/migrate/20160719013955_add_column_to_comments.rb b/db/migrate/20160719013955_add_column_to_comments.rb
new file mode 100644
index 000000000..6d0201c49
--- /dev/null
+++ b/db/migrate/20160719013955_add_column_to_comments.rb
@@ -0,0 +1,7 @@
+class AddColumnToComments < ActiveRecord::Migration
+  def change
+    add_column :comments, :parent_id, :integer
+    add_column :comments, :comments_count, :integer, :default => 0
+    add_column :comments, :reply_id, :integer
+  end
+end
diff --git a/db/migrate/20160720094503_add_column_to_journal.rb b/db/migrate/20160720094503_add_column_to_journal.rb
new file mode 100644
index 000000000..3882109c3
--- /dev/null
+++ b/db/migrate/20160720094503_add_column_to_journal.rb
@@ -0,0 +1,7 @@
+class AddColumnToJournal < ActiveRecord::Migration
+  def change
+    add_column :journals, :parent_id, :integer
+    add_column :journals, :comments_count, :integer, :default => 0
+    add_column :journals, :reply_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fe02e4250..3a92d4fc0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,2679 +1,2288 @@
-# 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 => 20160718064146) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "act_id",                                  :null => false
-    t.string   "act_type",                                :null => false
-    t.integer  "user_id",                                 :null => false
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type", :default => ""
-    t.datetime "created_at"
-  end
-
-  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
-  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
-  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
-
-  create_table "activity_notifies", :force => true do |t|
-    t.integer  "activity_container_id"
-    t.string   "activity_container_type"
-    t.integer  "activity_id"
-    t.string   "activity_type"
-    t.integer  "notify_to"
-    t.datetime "created_on"
-    t.integer  "is_read"
-  end
-
-  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
-  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
-  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
-
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
-  create_table "application_settings", :force => true do |t|
-    t.integer  "default_projects_limit"
-    t.boolean  "signup_enabled"
-    t.boolean  "signin_enabled"
-    t.boolean  "gravatar_enabled"
-    t.text     "sign_in_text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "home_page_url"
-    t.integer  "default_branch_protection",    :default => 2
-    t.boolean  "twitter_sharing_enabled",      :default => true
-    t.text     "restricted_visibility_levels"
-    t.boolean  "version_check_enabled",        :default => true
-    t.integer  "max_attachment_size",          :default => 10,    :null => false
-    t.integer  "default_project_visibility"
-    t.integer  "default_snippet_visibility"
-    t.text     "restricted_signup_domains"
-    t.boolean  "user_oauth_applications",      :default => true
-    t.string   "after_sign_out_path"
-    t.integer  "session_expire_delay",         :default => 10080, :null => false
-  end
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    t.integer "user_id",    :null => false
-  end
-
-  create_table "apply_add_schools", :force => true do |t|
-    t.string   "name"
-    t.string   "province"
-    t.string   "city"
-    t.string   "address"
-    t.string   "remarks"
-    t.integer  "school_id"
-    t.integer  "status",     :default => 0
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  create_table "apply_homeworks", :force => true do |t|
-    t.integer  "status"
-    t.integer  "user_id"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "apply_homeworks", ["homework_common_id"], :name => "index_apply_homeworks_on_homework_common_id"
-  add_index "apply_homeworks", ["user_id"], :name => "index_apply_homeworks_on_user_id"
-
-  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 "apply_resources", :force => true do |t|
-    t.integer  "status"
-    t.integer  "user_id"
-    t.integer  "attachment_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.text     "content"
-    t.integer  "apply_user_id"
-  end
-
-  create_table "at_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "at_message_id"
-    t.string   "at_message_type"
-    t.boolean  "viewed",          :default => false
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.integer  "sender_id"
-  end
-
-  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
-
-  create_table "attachment_histories", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.string   "filename",                     :default => ""
-    t.string   "disk_filename",                :default => ""
-    t.integer  "filesize",                     :default => 0
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => ""
-    t.integer  "downloads",                    :default => 0
-    t.integer  "author_id"
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.integer  "copy_from"
-    t.integer  "quotes"
-    t.integer  "version"
-    t.integer  "attachment_id"
-    t.integer  "is_publish",                   :default => 1
-    t.date     "publish_time"
-  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"
-    t.integer  "is_publish",                   :default => 1
-    t.date     "publish_time"
-  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 "audit_events", :force => true do |t|
-    t.integer  "author_id",   :null => false
-    t.string   "type",        :null => false
-    t.integer  "entity_id",   :null => false
-    t.string   "entity_type", :null => false
-    t.text     "details"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
-  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
-  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
-
-  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 "blog_comments", :force => true do |t|
-    t.integer  "blog_id",                            :null => false
-    t.integer  "parent_id"
-    t.string   "title",           :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "comments_count",  :default => 0,     :null => false
-    t.integer  "last_comment_id"
-    t.datetime "created_on",                         :null => false
-    t.datetime "updated_on",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-  end
-
-  create_table "blogs", :force => true do |t|
-    t.string   "name",             :default => "", :null => false
-    t.text     "description"
-    t.integer  "position",         :default => 1
-    t.integer  "article_count",    :default => 0,  :null => false
-    t.integer  "comments_count",   :default => 0,  :null => false
-    t.integer  "last_comments_id"
-    t.integer  "parent_id"
-    t.integer  "author_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "homepage_id"
-  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"
-    t.integer "org_subfield_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 "broadcast_messages", :force => true do |t|
-    t.text     "message",    :null => false
-    t.datetime "starts_at"
-    t.datetime "ends_at"
-    t.integer  "alert_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "color"
-    t.string   "font"
-  end
-
-  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"
-    t.integer  "project_id"
-    t.integer  "type",          :default => 0
-  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 "code_tests", :force => true do |t|
-    t.integer  "homework_id"
-    t.integer  "wait_time",       :default => 0
-    t.integer  "language"
-    t.integer  "status"
-    t.integer  "time_used",       :default => 0
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "student_work_id", :default => 0
-  end
-
-  create_table "comments", :force => true do |t|
-    t.string   "commented_type", :limit => 30, :default => "", :null => false
-    t.integer  "commented_id",                 :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
-    t.text     "comments"
-    t.datetime "created_on",                                   :null => false
-    t.datetime "updated_on",                                   :null => false
-  end
-
-  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
-  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
-
-  create_table "contest_notifications", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contestnotifications", :force => true do |t|
-    t.integer  "contest_id"
-    t.string   "title"
-    t.string   "summary"
-    t.text     "description"
-    t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  create_table "contests", :force => true do |t|
-    t.string   "name"
-    t.string   "budget",      :default => ""
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",                  :null => false
-    t.datetime "updated_on",                  :null => false
-  end
-
-  create_table "course_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_act_id"
-    t.string   "course_act_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index"
-
-  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_contributor_scores", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.integer  "message_num",          :default => 0
-    t.integer  "message_reply_num",    :default => 0
-    t.integer  "news_reply_num",       :default => 0
-    t.integer  "resource_num",         :default => 0
-    t.integer  "journal_num",          :default => 0
-    t.integer  "journal_reply_num",    :default => 0
-    t.datetime "created_at",                          :null => false
-    t.datetime "updated_at",                          :null => false
-    t.integer  "total_score",          :default => 0
-    t.integer  "homework_journal_num", :default => 0
-    t.integer  "news_num",             :default => 0
-  end
-
-  create_table "course_groups", :force => true do |t|
-    t.string   "name"
-    t.integer  "course_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_infos", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "course_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "course_id"
-    t.integer  "course_message_id"
-    t.string   "course_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.text     "content"
-    t.integer  "status"
-    t.integer  "apply_user_id"
-    t.integer  "apply_result"
-  end
-
-  add_index "course_messages", ["course_message_type"], :name => "index_course_messages_on_course_message_type"
-  add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
-
-  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
-    t.integer  "outline",                       :default => 0
-    t.integer  "publish_resource",              :default => 0
-    t.integer  "is_delete",                     :default => 0
-    t.integer  "end_time"
-    t.string   "end_term"
-    t.integer  "is_excellent",                  :default => 0
-    t.integer  "excellent_option",              :default => 0
-    t.integer  "is_copy",                       :default => 0
-    t.integer  "visits",                        :default => 0
-    t.integer  "syllabus_id"
-    t.string   "invite_code"
-    t.string   "qrcode"
-  end
-
-  add_index "courses", ["id"], :name => "id", :unique => true
-  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
-  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
-  add_index "courses", ["tea_id"], :name => "tea_id"
-  add_index "courses", ["visits"], :name => "visits"
-
-  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 "deploy_keys_projects", :force => true do |t|
-    t.integer  "deploy_key_id", :null => false
-    t.integer  "project_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
-
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "documents", :force => true do |t|
-    t.integer  "project_id",                :default => 0,  :null => false
-    t.integer  "category_id",               :default => 0,  :null => false
-    t.string   "title",       :limit => 60, :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_on"
-    t.integer  "user_id",                   :default => 0
-    t.integer  "is_public",                 :default => 1
-  end
-
-  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
-  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
-  add_index "documents", ["project_id"], :name => "documents_project_id"
-
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
-    t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
-  end
-
-  create_table "editor_of_documents", :force => true do |t|
-    t.integer  "editor_id"
-    t.integer  "org_document_comment_id"
-    t.datetime "created_at"
-  end
-
-  create_table "emails", :force => true do |t|
-    t.integer  "user_id",    :null => false
-    t.string   "email",      :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
-  add_index "emails", ["user_id"], :name => "index_emails_on_user_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 "events", :force => true do |t|
-    t.string   "target_type"
-    t.integer  "target_id"
-    t.string   "title"
-    t.text     "data"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "action"
-    t.integer  "author_id"
-  end
-
-  add_index "events", ["action"], :name => "index_events_on_action"
-  add_index "events", ["author_id"], :name => "index_events_on_author_id"
-  add_index "events", ["created_at"], :name => "index_events_on_created_at"
-  add_index "events", ["project_id"], :name => "index_events_on_project_id"
-  add_index "events", ["target_id"], :name => "index_events_on_target_id"
-  add_index "events", ["target_type"], :name => "index_events_on_target_type"
-
-  create_table "exercise_answers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_choices", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.text     "choice_text"
-    t.integer  "choice_position"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_questions", :force => true do |t|
-    t.text     "question_title"
-    t.integer  "question_type"
-    t.integer  "question_number"
-    t.integer  "exercise_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_score"
-  end
-
-  create_table "exercise_standard_answers", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_id"
-    t.integer  "score"
-    t.datetime "start_at"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.datetime "end_at"
-    t.integer  "status"
-  end
-
-  create_table "exercises", :force => true do |t|
-    t.text     "exercise_name"
-    t.text     "exercise_description"
-    t.integer  "course_id"
-    t.integer  "exercise_status"
-    t.integer  "user_id"
-    t.integer  "time"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-    t.datetime "publish_time"
-    t.datetime "end_time"
-    t.integer  "show_result"
-  end
-
-  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"
-  add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index"
-
-  create_table "forge_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "forge_message_id"
-    t.string   "forge_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "secret_key"
-    t.integer  "status"
-  end
-
-  add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
-  add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
-
-  create_table "forked_project_links", :force => true do |t|
-    t.integer  "forked_to_project_id",   :null => false
-    t.integer  "forked_from_project_id", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
-
-  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 "forwards", :force => true do |t|
-    t.integer  "from_id"
-    t.string   "from_type"
-    t.integer  "to_id"
-    t.string   "to_type"
-    t.datetime "created_at"
-  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
-    t.integer  "teacher_priority",  :default => 1
-    t.integer  "anonymous_comment", :default => 0
-    t.integer  "quotes",            :default => 0
-    t.integer  "is_open",           :default => 0
-    t.datetime "simi_time"
-  end
-
-  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
-
-  create_table "homework_detail_groups", :force => true do |t|
-    t.integer  "homework_common_id"
-    t.integer  "min_num"
-    t.integer  "max_num"
-    t.integer  "base_on_project"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
-
-  create_table "homework_detail_manuals", :force => true do |t|
-    t.float    "ta_proportion"
-    t.integer  "comment_status"
-    t.date     "evaluation_start"
-    t.date     "evaluation_end"
-    t.integer  "evaluation_num"
-    t.integer  "absence_penalty",    :default => 1
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
-
-  create_table "homework_detail_programings", :force => true do |t|
-    t.string   "language"
-    t.text     "standard_code",      :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.float    "ta_proportion",                            :default => 0.1
-    t.integer  "question_id"
-  end
-
-  create_table "homework_evaluations", :force => true do |t|
-    t.string   "user_id"
-    t.string   "homework_attach_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "homework_for_courses", :force => true do |t|
-    t.integer "course_id"
-    t.integer "bid_id"
-  end
-
-  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
-  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
-
-  create_table "homework_tests", :force => true do |t|
-    t.text     "input"
-    t.text     "output"
-    t.integer  "homework_common_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.integer  "result"
-    t.text     "error_msg"
-  end
-
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "identities", :force => true do |t|
-    t.string   "extern_uid"
-    t.string   "provider"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
-  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
-
-  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
-    t.string   "mail"
-  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"
-    t.integer  "private",                     :default => 0
-  end
-
-  create_table "keys", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.text     "key"
-    t.string   "title"
-    t.string   "type"
-    t.string   "fingerprint"
-    t.boolean  "public",      :default => false, :null => false
-  end
-
-  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
-  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
-
-  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 "label_links", :force => true do |t|
-    t.integer  "label_id"
-    t.integer  "target_id"
-    t.string   "target_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
-  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
-
-  create_table "labels", :force => true do |t|
-    t.string   "title"
-    t.string   "color"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
-
-  create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
-    t.integer "inherited_from"
-  end
-
-  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
-  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
-
-  create_table "members", :force => true do |t|
-    t.integer  "user_id",           :default => 0,     :null => false
-    t.integer  "project_id",        :default => 0
-    t.datetime "created_on"
-    t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id",         :default => -1
-    t.integer  "course_group_id",   :default => 0
-  end
-
-  add_index "members", ["project_id"], :name => "index_members_on_project_id"
-  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
-  add_index "members", ["user_id"], :name => "index_members_on_user_id"
-
-  create_table "memo_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "forum_id"
-    t.integer  "memo_id"
-    t.string   "memo_type"
-    t.integer  "viewed"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type"
-  add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
-
-  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 "merge_request_diffs", :force => true do |t|
-    t.string   "state"
-    t.text     "st_commits",       :limit => 2147483647
-    t.text     "st_diffs",         :limit => 2147483647
-    t.integer  "merge_request_id",                       :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
-
-  create_table "merge_requests", :force => true do |t|
-    t.string   "target_branch",                    :null => false
-    t.string   "source_branch",                    :null => false
-    t.integer  "source_project_id",                :null => false
-    t.integer  "author_id"
-    t.integer  "assignee_id"
-    t.string   "title"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "milestone_id"
-    t.string   "state"
-    t.string   "merge_status"
-    t.integer  "target_project_id",                :null => false
-    t.integer  "iid"
-    t.text     "description"
-    t.integer  "position",          :default => 0
-    t.datetime "locked_at"
-  end
-
-  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
-  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
-  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
-  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
-  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
-  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
-  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
-  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
-  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
-  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
-
-  create_table "message_alls", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
-  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
-
-  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
-    t.integer  "reply_id"
-    t.integer  "quotes"
-    t.integer  "status",        :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 "milestones", :force => true do |t|
-    t.string   "title",       :null => false
-    t.integer  "project_id",  :null => false
-    t.text     "description"
-    t.date     "due_date"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "state"
-    t.integer  "iid"
-  end
-
-  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
-  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
-  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
-  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
-
-  create_table "namespaces", :force => true do |t|
-    t.string   "name",                        :null => false
-    t.string   "path",                        :null => false
-    t.integer  "owner_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type"
-    t.string   "description", :default => "", :null => false
-    t.string   "avatar"
-  end
-
-  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
-  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
-  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
-  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
-  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
-
-  create_table "news", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "title",           :limit => 60, :default => "", :null => false
-    t.string   "summary",                       :default => ""
-    t.text     "description"
-    t.integer  "author_id",                     :default => 0,  :null => false
-    t.datetime "created_on"
-    t.integer  "comments_count",                :default => 0,  :null => false
-    t.integer  "course_id"
-    t.integer  "sticky",                        :default => 0
-    t.integer  "org_subfield_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 "notes", :force => true do |t|
-    t.text     "note"
-    t.string   "noteable_type"
-    t.integer  "author_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "project_id"
-    t.string   "attachment"
-    t.string   "line_code"
-    t.string   "commit_id"
-    t.integer  "noteable_id"
-    t.boolean  "system",                              :default => false, :null => false
-    t.text     "st_diff",       :limit => 2147483647
-  end
-
-  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
-  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
-  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
-  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
-  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
-  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
-  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
-  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
-  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
-
-  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 "oauth_access_grants", :force => true do |t|
-    t.integer  "resource_owner_id", :null => false
-    t.integer  "application_id",    :null => false
-    t.string   "token",             :null => false
-    t.integer  "expires_in",        :null => false
-    t.text     "redirect_uri",      :null => false
-    t.datetime "created_at",        :null => false
-    t.datetime "revoked_at"
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
-
-  create_table "oauth_access_tokens", :force => true do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             :null => false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at",        :null => false
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
-  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
-  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
-
-  create_table "oauth_applications", :force => true do |t|
-    t.string   "name",                         :null => false
-    t.string   "uid",                          :null => false
-    t.string   "secret",                       :null => false
-    t.text     "redirect_uri",                 :null => false
-    t.string   "scopes",       :default => "", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-  end
-
-  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
-  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
-
-  create_table "onclick_times", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "onclick_time"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    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 "org_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "org_act_id"
-    t.string   "org_act_type"
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "org_courses", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "course_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_document_comments", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.integer  "organization_id"
-    t.integer  "creator_id"
-    t.integer  "parent_id"
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "org_subfield_id"
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_member_roles", :force => true do |t|
-    t.integer "org_member_id"
-    t.integer "role_id"
-  end
-
-  create_table "org_members", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "organization_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "sender_id"
-    t.integer  "organization_id"
-    t.string   "message_type"
-    t.integer  "message_id"
-    t.integer  "viewed"
-    t.string   "content"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_projects", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_subfield_messages", :force => true do |t|
-    t.integer  "org_subfield_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_subfields", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "priority"
-    t.string   "name"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.string   "field_type"
-    t.integer  "hide",            :default => 0
-    t.integer  "status",          :default => 1
-  end
-
-  create_table "organizations", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "creator_id"
-    t.integer  "home_id"
-    t.boolean  "is_public"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
-    t.boolean  "allow_guest_download", :default => true
-    t.integer  "visits",               :default => 0
-    t.integer  "show_mode",            :default => 0
-    t.integer  "allow_teacher",        :default => 0
-  end
-
-  create_table "permissions", :force => true do |t|
-    t.string  "controller",   :limit => 30, :default => "",    :null => false
-    t.string  "action",       :limit => 30, :default => "",    :null => false
-    t.string  "description",  :limit => 60, :default => "",    :null => false
-    t.boolean "is_public",                  :default => false, :null => false
-    t.integer "sort",                       :default => 0,     :null => false
-    t.boolean "mail_option",                :default => false, :null => false
-    t.boolean "mail_enabled",               :default => false, :null => false
-  end
-
-  create_table "permissions_roles", :id => false, :force => true do |t|
-    t.integer "permission_id", :default => 0, :null => false
-    t.integer "role_id",       :default => 0, :null => false
-  end
-
-  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
-
-  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 "principal_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "principal_id"
-    t.integer  "principal_act_id"
-    t.string   "principal_act_type"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  create_table "project_import_data", :force => true do |t|
-    t.integer "project_id"
-    t.text    "data"
-  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
-    t.integer  "board_num",         :default => 0
-    t.integer  "attach_num",        :default => 0
-    t.datetime "commit_time"
-  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"
-    t.integer  "gpid"
-    t.integer  "forked_from_project_id"
-    t.integer  "forked_count"
-    t.integer  "commits_count",          :default => 0
-    t.integer  "publish_resource",       :default => 0
-    t.integer  "issues_count",           :default => 0
-    t.integer  "attachments_count",      :default => 0
-    t.integer  "boards_count",           :default => 0
-    t.integer  "news_count",             :default => 0
-    t.integer  "acts_count",             :default => 0
-    t.integer  "journals_count",         :default => 0
-    t.integer  "boards_reply_count",     :default => 0
-    t.integer  "visits",                 :default => 0
-    t.integer  "hot",                    :default => 0
-  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 "protected_branches", :force => true do |t|
-    t.integer  "project_id",                             :null => false
-    t.string   "name",                                   :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "developers_can_push", :default => false, :null => false
-  end
-
-  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
-
-  create_table "quality_analyses", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "author_login"
-    t.string   "rep_identifier"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "sonar_version",  :default => 0
-    t.string   "path"
-    t.string   "branch"
-    t.string   "language"
-    t.string   "sonar_name"
-  end
-
-  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 "rep_statics", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "commits_num"
-    t.string   "uname"
-    t.string   "email"
-    t.integer  "add"
-    t.integer  "del"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "changeset"
-  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"
-    t.string   "pinyin"
-    t.integer  "school_type", :default => 0
-  end
-
-  create_table "secdomains", :force => true do |t|
-    t.integer  "sub_type"
-    t.string   "subname"
-    t.integer  "pid",        :default => 0
-    t.string   "desc"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  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 "services", :force => true do |t|
-    t.string   "type"
-    t.string   "title"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "active",                :default => false, :null => false
-    t.text     "properties"
-    t.boolean  "template",              :default => false
-    t.boolean  "push_events",           :default => true
-    t.boolean  "issues_events",         :default => true
-    t.boolean  "merge_requests_events", :default => true
-    t.boolean  "tag_push_events",       :default => true
-    t.boolean  "note_events",           :default => true,  :null => false
-  end
-
-  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
-  add_index "services", ["project_id"], :name => "index_services_on_project_id"
-
-  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 "shield_activities", :force => true do |t|
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.string   "shield_type"
-    t.integer  "shield_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "shield_wechat_messages", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.integer  "shield_id"
-    t.string   "shield_type"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "snippets", :force => true do |t|
-    t.string   "title"
-    t.text     "content",          :limit => 2147483647
-    t.integer  "author_id",                                             :null => false
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "file_name"
-    t.datetime "expires_at"
-    t.string   "type"
-    t.integer  "visibility_level",                       :default => 0, :null => false
-  end
-
-  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
-  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
-  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
-  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
-  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
-  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
-
-  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 "sonar_errors", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "jenkins_job_name"
-    t.text     "output"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  create_table "ssos", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "openid"
-    t.string   "name"
-    t.string   "password"
-    t.string   "email"
-    t.integer  "sex"
-    t.string   "school"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "ssos", ["user_id"], :name => "index_ssos_on_user_id"
-
-  create_table "student_work_projects", :force => true do |t|
-    t.integer  "homework_common_id"
-    t.integer  "student_work_id"
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.integer  "is_leader"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
-  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
-  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
-  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
-
-  create_table "student_work_tests", :force => true do |t|
-    t.integer  "student_work_id"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 9
-    t.text     "results"
-    t.text     "src"
-  end
-
-  create_table "student_works", :force => true do |t|
-    t.string   "name"
-    t.text     "description",             :limit => 2147483647
-    t.integer  "homework_common_id"
-    t.integer  "user_id"
-    t.float    "final_score"
-    t.float    "teacher_score"
-    t.float    "student_score"
-    t.float    "teaching_asistant_score"
-    t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                       :null => false
-    t.datetime "updated_at",                                                       :null => false
-    t.integer  "late_penalty",                                  :default => 0
-    t.integer  "absence_penalty",                               :default => 0
-    t.float    "system_score",                                  :default => 0.0
-    t.boolean  "is_test",                                       :default => false
-    t.float    "work_score"
-    t.integer  "simi_id"
-    t.integer  "simi_value"
-    t.integer  "work_status",                                   :default => 0
-  end
-
-  add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
-
-  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 "sub_document_comments", :force => true do |t|
-    t.text     "content"
-    t.text     "title"
-    t.integer  "sub_domain_id"
-    t.integer  "creator_id"
-    t.integer  "parent_id"
-    t.integer  "reply_id"
-    t.integer  "locked"
-    t.integer  "sticky"
-    t.integer  "org_subfield_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "sub_domains", :force => true do |t|
-    t.integer  "org_subfield_id"
-    t.integer  "priority"
-    t.string   "name"
-    t.string   "field_type"
-    t.integer  "hide"
-    t.integer  "status"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "subfield_subdomain_dirs", :force => true do |t|
-    t.integer  "org_subfield_id"
-    t.string   "name"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "subscriptions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "subscribable_id"
-    t.string   "subscribable_type"
-    t.boolean  "subscribed"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
-
-  create_table "syllabuses", :force => true do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "user_id"
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-    t.string   "eng_name"
-    t.integer  "syllabus_type"
-    t.integer  "credit"
-    t.integer  "hours"
-    t.integer  "theory_hours"
-    t.integer  "practice_hours"
-    t.string   "applicable_major"
-    t.string   "pre_course"
-    t.integer  "visits",           :default => 0
-    t.integer  "des_status",       :default => 0
-  end
-
-  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
-
-  create_table "system_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "content"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.text     "description"
-    t.string   "subject"
-  end
-
-  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_actions", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "action_type"
-    t.integer  "action_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.integer  "user_id"
-  end
-
-  add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index"
-
-  create_table "user_extensions", :force => true do |t|
-    t.integer  "user_id",                            :null => false
-    t.date     "birthday"
-    t.string   "brief_introduction"
-    t.integer  "gender"
-    t.string   "location"
-    t.string   "occupation"
-    t.integer  "work_experience"
-    t.integer  "zip_code"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
-    t.integer  "identity"
-    t.string   "student_id"
-    t.string   "teacher_realname"
-    t.string   "student_realname"
-    t.string   "location_city"
-    t.integer  "school_id"
-    t.string   "description",        :default => ""
-  end
-
-  create_table "user_feedback_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "journals_for_message_id"
-    t.string   "journals_for_message_type"
-    t.integer  "viewed"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id"
-  add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at"
-
-  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 "user_wechats", :force => true do |t|
-    t.integer  "subscribe"
-    t.string   "openid"
-    t.string   "nickname"
-    t.integer  "sex"
-    t.string   "language"
-    t.string   "city"
-    t.string   "province"
-    t.string   "country"
-    t.string   "headimgurl"
-    t.string   "subscribe_time"
-    t.string   "unionid"
-    t.string   "remark"
-    t.integer  "groupid"
-    t.integer  "user_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  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
-    t.integer  "gid"
-    t.integer  "visits",                          :default => 0
-    t.integer  "excellent_teacher",               :default => 0
-    t.integer  "excellent_student",               :default => 0
-  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 "users_star_projects", :force => true do |t|
-    t.integer  "project_id", :null => false
-    t.integer  "user_id",    :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
-  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
-  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "project_id",      :default => 0,      :null => false
-    t.string   "name",            :default => "",     :null => false
-    t.string   "description",     :default => ""
-    t.date     "effective_date"
-    t.datetime "created_on"
-    t.datetime "updated_on"
-    t.string   "wiki_page_title"
-    t.string   "status",          :default => "open"
-    t.string   "sharing",         :default => "none", :null => false
-  end
-
-  add_index "versions", ["project_id"], :name => "versions_project_id"
-  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
-
-  create_table "visitors", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "master_id"
-    t.datetime "updated_on"
-    t.datetime "created_on"
-  end
-
-  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
-  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
-  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
-
-  create_table "watchers", :force => true do |t|
-    t.string  "watchable_type", :default => "", :null => false
-    t.integer "watchable_id",   :default => 0,  :null => false
-    t.integer "user_id"
-  end
-
-  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
-  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
-  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
-
-  create_table "web_footer_companies", :force => true do |t|
-    t.string   "name"
-    t.string   "logo_size"
-    t.string   "url"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "web_footer_oranizers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  create_table "web_hooks", :force => true do |t|
-    t.string   "url"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type",                  :default => "ProjectHook"
-    t.integer  "service_id"
-    t.boolean  "push_events",           :default => true,          :null => false
-    t.boolean  "issues_events",         :default => false,         :null => false
-    t.boolean  "merge_requests_events", :default => false,         :null => false
-    t.boolean  "tag_push_events",       :default => false
-    t.boolean  "note_events",           :default => false,         :null => false
-  end
-
-  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
-  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
-
-  create_table "wechat_logs", :force => true do |t|
-    t.string   "openid",       :null => false
-    t.text     "request_raw"
-    t.text     "response_raw"
-    t.text     "session_raw"
-    t.datetime "created_at",   :null => false
-  end
-
-  add_index "wechat_logs", ["openid"], :name => "index_wechat_logs_on_openid"
-
-  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 => 20160720094503) do
+
+  create_table "activities", :force => true do |t|
+    t.integer  "act_id",                                  :null => false
+    t.string   "act_type",                                :null => false
+    t.integer  "user_id",                                 :null => false
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type", :default => ""
+    t.datetime "created_at"
+  end
+
+  add_index "activities", ["act_id", "act_type"], :name => "index_activities_on_act_id_and_act_type"
+  add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
+  add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
+
+  create_table "activity_notifies", :force => true do |t|
+    t.integer  "activity_container_id"
+    t.string   "activity_container_type"
+    t.integer  "activity_id"
+    t.string   "activity_type"
+    t.integer  "notify_to"
+    t.datetime "created_on"
+    t.integer  "is_read"
+  end
+
+  add_index "activity_notifies", ["activity_container_id", "activity_container_type"], :name => "index_an_activity_container_id"
+  add_index "activity_notifies", ["created_on"], :name => "index_an_created_on"
+  add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to"
+
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
+  create_table "applied_projects", :force => true do |t|
+    t.integer "project_id", :null => false
+    t.integer "user_id",    :null => false
+  end
+
+  create_table "apply_add_schools", :force => true do |t|
+    t.string   "name"
+    t.string   "province"
+    t.string   "city"
+    t.string   "address"
+    t.string   "remarks"
+    t.integer  "school_id"
+    t.integer  "status",     :default => 0
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  create_table "apply_homeworks", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "apply_homeworks", ["homework_common_id"], :name => "index_apply_homeworks_on_homework_common_id"
+  add_index "apply_homeworks", ["user_id"], :name => "index_apply_homeworks_on_user_id"
+
+  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 "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
+  create_table "at_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "at_message_id"
+    t.string   "at_message_type"
+    t.boolean  "viewed",          :default => false
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.integer  "sender_id"
+  end
+
+  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
+
+  create_table "attachment_histories", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.string   "filename",                     :default => ""
+    t.string   "disk_filename",                :default => ""
+    t.integer  "filesize",                     :default => 0
+    t.string   "content_type",                 :default => ""
+    t.string   "digest",         :limit => 40, :default => ""
+    t.integer  "downloads",                    :default => 0
+    t.integer  "author_id"
+    t.datetime "created_on"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.integer  "copy_from"
+    t.integer  "quotes"
+    t.integer  "version"
+    t.integer  "attachment_id"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
+  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"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
+  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 "blog_comments", :force => true do |t|
+    t.integer  "blog_id",                            :null => false
+    t.integer  "parent_id"
+    t.string   "title",           :default => "",    :null => false
+    t.text     "content"
+    t.integer  "author_id"
+    t.integer  "comments_count",  :default => 0,     :null => false
+    t.integer  "last_comment_id"
+    t.datetime "created_on",                         :null => false
+    t.datetime "updated_on",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+  end
+
+  create_table "blogs", :force => true do |t|
+    t.string   "name",             :default => "", :null => false
+    t.text     "description"
+    t.integer  "position",         :default => 1
+    t.integer  "article_count",    :default => 0,  :null => false
+    t.integer  "comments_count",   :default => 0,  :null => false
+    t.integer  "last_comments_id"
+    t.integer  "parent_id"
+    t.integer  "author_id"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "homepage_id"
+  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"
+    t.integer "org_subfield_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 "code_tests", :force => true do |t|
+    t.integer  "homework_id"
+    t.integer  "wait_time",       :default => 0
+    t.integer  "language"
+    t.integer  "status"
+    t.integer  "time_used",       :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "student_work_id", :default => 0
+  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
+    t.integer  "parent_id"
+    t.integer  "comments_count",               :default => 0
+    t.integer  "reply_id"
+  end
+
+  add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
+  add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
+
+  create_table "contest_notifications", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "contesting_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "contesting_softapplications", :force => true do |t|
+    t.integer  "softapplication_id"
+    t.integer  "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "reward"
+  end
+
+  create_table "contestnotifications", :force => true do |t|
+    t.integer  "contest_id"
+    t.string   "title"
+    t.string   "summary"
+    t.text     "description"
+    t.integer  "author_id"
+    t.integer  "notificationcomments_count"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "contests", :force => true do |t|
+    t.string   "name"
+    t.string   "budget",      :default => ""
+    t.integer  "author_id"
+    t.date     "deadline"
+    t.string   "description"
+    t.integer  "commit"
+    t.string   "password"
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
+  end
+
+  create_table "course_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_act_id"
+    t.string   "course_act_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index"
+
+  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_contributor_scores", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    t.integer  "message_num",          :default => 0
+    t.integer  "message_reply_num",    :default => 0
+    t.integer  "news_reply_num",       :default => 0
+    t.integer  "resource_num",         :default => 0
+    t.integer  "journal_num",          :default => 0
+    t.integer  "journal_reply_num",    :default => 0
+    t.datetime "created_at",                          :null => false
+    t.datetime "updated_at",                          :null => false
+    t.integer  "total_score",          :default => 0
+    t.integer  "homework_journal_num", :default => 0
+    t.integer  "news_num",             :default => 0
+  end
+
+  create_table "course_groups", :force => true do |t|
+    t.string   "name"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_infos", :force => true do |t|
+    t.integer  "course_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "course_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_message_id"
+    t.string   "course_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.text     "content"
+    t.integer  "status"
+    t.integer  "apply_user_id"
+    t.integer  "apply_result"
+  end
+
+  add_index "course_messages", ["course_message_type"], :name => "index_course_messages_on_course_message_type"
+  add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at"
+
+  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
+    t.integer  "outline",                       :default => 0
+    t.integer  "publish_resource",              :default => 0
+    t.integer  "is_delete",                     :default => 0
+    t.integer  "end_time"
+    t.string   "end_term"
+    t.integer  "is_excellent",                  :default => 0
+    t.integer  "excellent_option",              :default => 0
+    t.integer  "is_copy",                       :default => 0
+    t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
+    t.string   "invite_code"
+    t.string   "qrcode"
+  end
+
+  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
+
+  create_table "custom_fields", :force => true do |t|
+    t.string  "type",            :limit => 30, :default => "",    :null => false
+    t.string  "name",            :limit => 30, :default => "",    :null => false
+    t.string  "field_format",    :limit => 30, :default => "",    :null => false
+    t.text    "possible_values"
+    t.string  "regexp",                        :default => ""
+    t.integer "min_length",                    :default => 0,     :null => false
+    t.integer "max_length",                    :default => 0,     :null => false
+    t.boolean "is_required",                   :default => false, :null => false
+    t.boolean "is_for_all",                    :default => false, :null => false
+    t.boolean "is_filter",                     :default => false, :null => false
+    t.integer "position",                      :default => 1
+    t.boolean "searchable",                    :default => false
+    t.text    "default_value"
+    t.boolean "editable",                      :default => true
+    t.boolean "visible",                       :default => true,  :null => false
+    t.boolean "multiple",                      :default => false
+  end
+
+  add_index "custom_fields", ["id", "type"], :name => "index_custom_fields_on_id_and_type"
+
+  create_table "custom_fields_projects", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "project_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_projects", ["custom_field_id", "project_id"], :name => "index_custom_fields_projects_on_custom_field_id_and_project_id", :unique => true
+
+  create_table "custom_fields_trackers", :id => false, :force => true do |t|
+    t.integer "custom_field_id", :default => 0, :null => false
+    t.integer "tracker_id",      :default => 0, :null => false
+  end
+
+  add_index "custom_fields_trackers", ["custom_field_id", "tracker_id"], :name => "index_custom_fields_trackers_on_custom_field_id_and_tracker_id", :unique => true
+
+  create_table "custom_values", :force => true do |t|
+    t.string  "customized_type", :limit => 30, :default => "", :null => false
+    t.integer "customized_id",                 :default => 0,  :null => false
+    t.integer "custom_field_id",               :default => 0,  :null => false
+    t.text    "value"
+  end
+
+  add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
+  add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0, :null => false
+    t.integer  "attempts",   :default => 0, :null => false
+    t.text     "handler",                   :null => false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "documents", :force => true do |t|
+    t.integer  "project_id",                :default => 0,  :null => false
+    t.integer  "category_id",               :default => 0,  :null => false
+    t.string   "title",       :limit => 60, :default => "", :null => false
+    t.text     "description"
+    t.datetime "created_on"
+    t.integer  "user_id",                   :default => 0
+    t.integer  "is_public",                 :default => 1
+  end
+
+  add_index "documents", ["category_id"], :name => "index_documents_on_category_id"
+  add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
+  add_index "documents", ["project_id"], :name => "documents_project_id"
+
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
+    t.string   "File"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
+  end
+
+  create_table "editor_of_documents", :force => true do |t|
+    t.integer  "editor_id"
+    t.integer  "org_document_comment_id"
+    t.datetime "created_at"
+  end
+
+  create_table "enabled_modules", :force => true do |t|
+    t.integer "project_id"
+    t.string  "name",       :null => false
+    t.integer "course_id"
+  end
+
+  add_index "enabled_modules", ["project_id"], :name => "enabled_modules_project_id"
+
+  create_table "enumerations", :force => true do |t|
+    t.string  "name",          :limit => 30, :default => "",    :null => false
+    t.integer "position",                    :default => 1
+    t.boolean "is_default",                  :default => false, :null => false
+    t.string  "type"
+    t.boolean "active",                      :default => true,  :null => false
+    t.integer "project_id"
+    t.integer "parent_id"
+    t.string  "position_name", :limit => 30
+  end
+
+  add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
+  add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
+
+  create_table "exercise_answers", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_choices", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.text     "choice_text"
+    t.integer  "choice_position"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_questions", :force => true do |t|
+    t.text     "question_title"
+    t.integer  "question_type"
+    t.integer  "question_number"
+    t.integer  "exercise_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_score"
+  end
+
+  create_table "exercise_standard_answers", :force => true do |t|
+    t.integer  "exercise_question_id"
+    t.integer  "exercise_choice_id"
+    t.text     "answer_text"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "exercise_users", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "exercise_id"
+    t.integer  "score"
+    t.datetime "start_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.datetime "end_at"
+    t.integer  "status"
+  end
+
+  create_table "exercises", :force => true do |t|
+    t.text     "exercise_name"
+    t.text     "exercise_description"
+    t.integer  "course_id"
+    t.integer  "exercise_status"
+    t.integer  "user_id"
+    t.integer  "time"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+    t.datetime "publish_time"
+    t.datetime "end_time"
+    t.integer  "show_result"
+  end
+
+  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"
+  add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index"
+
+  create_table "forge_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "forge_message_id"
+    t.string   "forge_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "secret_key"
+    t.integer  "status"
+  end
+
+  add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
+  add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
+
+  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 "forwards", :force => true do |t|
+    t.integer  "from_id"
+    t.string   "from_type"
+    t.integer  "to_id"
+    t.string   "to_type"
+    t.datetime "created_at"
+  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
+    t.integer  "teacher_priority",  :default => 1
+    t.integer  "anonymous_comment", :default => 0
+    t.integer  "quotes",            :default => 0
+    t.integer  "is_open",           :default => 0
+    t.datetime "simi_time"
+  end
+
+  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
+
+  create_table "homework_detail_groups", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "min_num"
+    t.integer  "max_num"
+    t.integer  "base_on_project"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
+
+  create_table "homework_detail_manuals", :force => true do |t|
+    t.float    "ta_proportion"
+    t.integer  "comment_status"
+    t.date     "evaluation_start"
+    t.date     "evaluation_end"
+    t.integer  "evaluation_num"
+    t.integer  "absence_penalty",    :default => 1
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  create_table "homework_detail_programings", :force => true do |t|
+    t.string   "language"
+    t.text     "standard_code",      :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.float    "ta_proportion",                            :default => 0.1
+    t.integer  "question_id"
+  end
+
+  create_table "homework_evaluations", :force => true do |t|
+    t.string   "user_id"
+    t.string   "homework_attach_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "homework_for_courses", :force => true do |t|
+    t.integer "course_id"
+    t.integer "bid_id"
+  end
+
+  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
+  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
+
+  create_table "homework_tests", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.integer  "result"
+    t.text     "error_msg"
+  end
+
+  create_table "homework_users", :force => true do |t|
+    t.string   "homework_attach_id"
+    t.string   "user_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  create_table "invite_lists", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "mail"
+  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
+    t.integer  "parent_id"
+    t.integer  "comments_count",                 :default => 0
+    t.integer  "reply_id"
+  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"
+    t.integer  "private",                     :default => 0
+  end
+
+  create_table "kindeditor_assets", :force => true do |t|
+    t.string   "asset"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.integer  "owner_id"
+    t.string   "asset_type"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.integer  "owner_type", :default => 0
+  end
+
+  create_table "member_roles", :force => true do |t|
+    t.integer "member_id",      :null => false
+    t.integer "role_id",        :null => false
+    t.integer "inherited_from"
+  end
+
+  add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"
+  add_index "member_roles", ["role_id"], :name => "index_member_roles_on_role_id"
+
+  create_table "members", :force => true do |t|
+    t.integer  "user_id",           :default => 0,     :null => false
+    t.integer  "project_id",        :default => 0
+    t.datetime "created_on"
+    t.boolean  "mail_notification", :default => false, :null => false
+    t.integer  "course_id",         :default => -1
+    t.integer  "course_group_id",   :default => 0
+  end
+
+  add_index "members", ["project_id"], :name => "index_members_on_project_id"
+  add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
+  add_index "members", ["user_id"], :name => "index_members_on_user_id"
+
+  create_table "memo_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "forum_id"
+    t.integer  "memo_id"
+    t.string   "memo_type"
+    t.integer  "viewed"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type"
+  add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at"
+
+  create_table "memos", :force => true do |t|
+    t.integer  "forum_id",                         :null => false
+    t.integer  "parent_id"
+    t.string   "subject",                          :null => false
+    t.text     "content",                          :null => false
+    t.integer  "author_id",                        :null => false
+    t.integer  "replies_count", :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",          :default => false
+    t.boolean  "sticky",        :default => false
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+    t.integer  "viewed_count",  :default => 0
+  end
+
+  create_table "message_alls", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type"
+  add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at"
+
+  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
+    t.integer  "reply_id"
+    t.integer  "quotes"
+    t.integer  "status",        :default => 0
+  end
+
+  add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
+  add_index "messages", ["board_id"], :name => "messages_board_id"
+  add_index "messages", ["created_on"], :name => "index_messages_on_created_on"
+  add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
+  add_index "messages", ["parent_id"], :name => "messages_parent_id"
+
+  create_table "news", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "title",           :limit => 60, :default => "", :null => false
+    t.string   "summary",                       :default => ""
+    t.text     "description"
+    t.integer  "author_id",                     :default => 0,  :null => false
+    t.datetime "created_on"
+    t.integer  "comments_count",                :default => 0,  :null => false
+    t.integer  "course_id"
+    t.integer  "sticky",                        :default => 0
+    t.integer  "org_subfield_id"
+  end
+
+  add_index "news", ["author_id"], :name => "index_news_on_author_id"
+  add_index "news", ["created_on"], :name => "index_news_on_created_on"
+  add_index "news", ["project_id"], :name => "news_project_id"
+
+  create_table "no_uses", :force => true do |t|
+    t.integer  "user_id",     :null => false
+    t.string   "no_use_type"
+    t.integer  "no_use_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "notificationcomments", :force => true do |t|
+    t.string   "notificationcommented_type"
+    t.integer  "notificationcommented_id"
+    t.integer  "author_id"
+    t.text     "notificationcomments"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "onclick_times", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "onclick_time"
+    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 "org_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "org_act_id"
+    t.string   "org_act_type"
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "org_courses", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "course_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_document_comments", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.integer  "organization_id"
+    t.integer  "creator_id"
+    t.integer  "parent_id"
+    t.integer  "reply_id"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.boolean  "locked",          :default => false
+    t.integer  "sticky",          :default => 0
+    t.integer  "org_subfield_id"
+    t.integer  "status",          :default => 0
+  end
+
+  create_table "org_member_roles", :force => true do |t|
+    t.integer "org_member_id"
+    t.integer "role_id"
+  end
+
+  create_table "org_members", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "organization_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "sender_id"
+    t.integer  "organization_id"
+    t.string   "message_type"
+    t.integer  "message_id"
+    t.integer  "viewed"
+    t.string   "content"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 0
+  end
+
+  create_table "org_projects", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "project_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_subfield_messages", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_subfields", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "priority"
+    t.string   "name"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.string   "field_type"
+    t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 1
+  end
+
+  create_table "organizations", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "creator_id"
+    t.integer  "home_id"
+    t.boolean  "is_public"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
+    t.boolean  "allow_guest_download", :default => true
+    t.integer  "visits",               :default => 0
+    t.integer  "show_mode",            :default => 0
+    t.integer  "allow_teacher",        :default => 0
+  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 "principal_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "principal_id"
+    t.integer  "principal_act_id"
+    t.string   "principal_act_type"
+    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
+    t.integer  "board_num",         :default => 0
+    t.integer  "attach_num",        :default => 0
+    t.datetime "commit_time"
+  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"
+    t.integer  "gpid"
+    t.integer  "forked_from_project_id"
+    t.integer  "forked_count"
+    t.integer  "commits_count",          :default => 0
+    t.integer  "publish_resource",       :default => 0
+    t.integer  "issues_count",           :default => 0
+    t.integer  "attachments_count",      :default => 0
+    t.integer  "boards_count",           :default => 0
+    t.integer  "news_count",             :default => 0
+    t.integer  "acts_count",             :default => 0
+    t.integer  "journals_count",         :default => 0
+    t.integer  "boards_reply_count",     :default => 0
+    t.integer  "visits",                 :default => 0
+    t.integer  "hot",                    :default => 0
+  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 "quality_analyses", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "author_login"
+    t.string   "rep_identifier"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "sonar_version",  :default => 0
+    t.string   "path"
+    t.string   "branch"
+    t.string   "language"
+    t.string   "sonar_name"
+  end
+
+  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 "rep_statics", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "commits_num"
+    t.string   "uname"
+    t.string   "email"
+    t.integer  "add"
+    t.integer  "del"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "changeset"
+  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"
+    t.string   "pinyin"
+    t.integer  "school_type", :default => 0
+  end
+
+  create_table "secdomains", :force => true do |t|
+    t.integer  "sub_type"
+    t.string   "subname"
+    t.integer  "pid",        :default => 0
+    t.string   "desc"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  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 "shield_activities", :force => true do |t|
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.string   "shield_type"
+    t.integer  "shield_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "shield_wechat_messages", :force => true do |t|
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.integer  "shield_id"
+    t.string   "shield_type"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  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 "sonar_errors", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "jenkins_job_name"
+    t.text     "output"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "ssos", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "openid"
+    t.string   "name"
+    t.string   "password"
+    t.string   "email"
+    t.integer  "sex"
+    t.string   "school"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "ssos", ["user_id"], :name => "index_ssos_on_user_id"
+
+  create_table "student_work_projects", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "student_work_id"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.integer  "is_leader"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
+  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
+  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
+  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
+
+  create_table "student_work_tests", :force => true do |t|
+    t.integer  "student_work_id"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "status",          :default => 9
+    t.text     "results"
+    t.text     "src"
+  end
+
+  create_table "student_works", :force => true do |t|
+    t.string   "name"
+    t.text     "description",             :limit => 2147483647
+    t.integer  "homework_common_id"
+    t.integer  "user_id"
+    t.float    "final_score"
+    t.float    "teacher_score"
+    t.float    "student_score"
+    t.float    "teaching_asistant_score"
+    t.integer  "project_id",                                    :default => 0
+    t.datetime "created_at",                                                       :null => false
+    t.datetime "updated_at",                                                       :null => false
+    t.integer  "late_penalty",                                  :default => 0
+    t.integer  "absence_penalty",                               :default => 0
+    t.float    "system_score",                                  :default => 0.0
+    t.boolean  "is_test",                                       :default => false
+    t.integer  "simi_id"
+    t.integer  "simi_value"
+    t.float    "work_score"
+    t.integer  "work_status",                                   :default => 0
+  end
+
+  add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
+
+  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 "sub_document_comments", :force => true do |t|
+    t.text     "content"
+    t.text     "title"
+    t.integer  "sub_domain_id"
+    t.integer  "creator_id"
+    t.integer  "parent_id"
+    t.integer  "reply_id"
+    t.integer  "locked"
+    t.integer  "sticky"
+    t.integer  "org_subfield_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "sub_domains", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "priority",        :default => 0
+    t.string   "name"
+    t.string   "field_type"
+    t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  create_table "subfield_subdomain_dirs", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.string   "name"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+    t.string   "eng_name"
+    t.integer  "syllabus_type"
+    t.integer  "credit"
+    t.integer  "hours"
+    t.integer  "theory_hours"
+    t.integer  "practice_hours"
+    t.string   "applicable_major"
+    t.string   "pre_course"
+    t.integer  "visits",           :default => 0
+    t.integer  "des_status",       :default => 0
+  end
+
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
+  create_table "system_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "content"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.text     "description"
+    t.string   "subject"
+  end
+
+  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_actions", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "action_type"
+    t.integer  "action_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "user_activities", :force => true do |t|
+    t.string   "act_type"
+    t.integer  "act_id"
+    t.string   "container_type"
+    t.integer  "container_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "user_id"
+  end
+
+  add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index"
+
+  create_table "user_extensions", :force => true do |t|
+    t.integer  "user_id",                            :null => false
+    t.date     "birthday"
+    t.string   "brief_introduction"
+    t.integer  "gender"
+    t.string   "location"
+    t.string   "occupation"
+    t.integer  "work_experience"
+    t.integer  "zip_code"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.string   "technical_title"
+    t.integer  "identity"
+    t.string   "student_id"
+    t.string   "teacher_realname"
+    t.string   "student_realname"
+    t.string   "location_city"
+    t.integer  "school_id"
+    t.string   "description",        :default => ""
+  end
+
+  create_table "user_feedback_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "journals_for_message_id"
+    t.string   "journals_for_message_type"
+    t.integer  "viewed"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
+  add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id"
+  add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at"
+
+  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 "user_wechats", :force => true do |t|
+    t.integer  "subscribe"
+    t.string   "openid"
+    t.string   "nickname"
+    t.integer  "sex"
+    t.string   "language"
+    t.string   "city"
+    t.string   "province"
+    t.string   "country"
+    t.string   "headimgurl"
+    t.string   "subscribe_time"
+    t.string   "unionid"
+    t.string   "remark"
+    t.integer  "groupid"
+    t.integer  "user_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  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
+    t.integer  "gid"
+    t.integer  "visits",                          :default => 0
+    t.integer  "excellent_teacher",               :default => 0
+    t.integer  "excellent_student",               :default => 0
+  end
+
+  add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
+  add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
+  add_index "users", ["type"], :name => "index_users_on_type"
+
+  create_table "versions", :force => true do |t|
+    t.integer  "project_id",      :default => 0,      :null => false
+    t.string   "name",            :default => "",     :null => false
+    t.string   "description",     :default => ""
+    t.date     "effective_date"
+    t.datetime "created_on"
+    t.datetime "updated_on"
+    t.string   "wiki_page_title"
+    t.string   "status",          :default => "open"
+    t.string   "sharing",         :default => "none", :null => false
+  end
+
+  add_index "versions", ["project_id"], :name => "versions_project_id"
+  add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
+
+  create_table "visitors", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "master_id"
+    t.datetime "updated_on"
+    t.datetime "created_on"
+  end
+
+  add_index "visitors", ["master_id"], :name => "index_visitors_master_id"
+  add_index "visitors", ["updated_on"], :name => "index_visitors_updated_on"
+  add_index "visitors", ["user_id"], :name => "index_visitors_user_id"
+
+  create_table "watchers", :force => true do |t|
+    t.string  "watchable_type", :default => "", :null => false
+    t.integer "watchable_id",   :default => 0,  :null => false
+    t.integer "user_id"
+  end
+
+  add_index "watchers", ["user_id", "watchable_type"], :name => "watchers_user_id_type"
+  add_index "watchers", ["user_id"], :name => "index_watchers_on_user_id"
+  add_index "watchers", ["watchable_id", "watchable_type"], :name => "index_watchers_on_watchable_id_and_watchable_type"
+
+  create_table "web_footer_companies", :force => true do |t|
+    t.string   "name"
+    t.string   "logo_size"
+    t.string   "url"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "web_footer_oranizers", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "wechat_logs", :force => true do |t|
+    t.string   "openid",       :null => false
+    t.text     "request_raw"
+    t.text     "response_raw"
+    t.text     "session_raw"
+    t.datetime "created_at",   :null => false
+  end
+
+  add_index "wechat_logs", ["openid"], :name => "index_wechat_logs_on_openid"
+
+  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/redmine.rb b/lib/redmine.rb
index cfd8b6824..ed40b4c04 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -198,7 +198,7 @@ Redmine::AccessControl.map do |map|
   map.project_module :news do |map|
     map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
     map.permission :view_news, {:news => [:index, :show]}, :public => true, :read => true
-    map.permission :comment_news, {:comments => :create}
+    map.permission :comment_news, {:comments => [:create, :reply]}
   end
 
   map.contest_module :contestnotifications do |map|
diff --git a/public/images/sy/bg_sy.jpg b/public/images/sy/bg_sy.jpg
new file mode 100644
index 000000000..2a36dd530
Binary files /dev/null and b/public/images/sy/bg_sy.jpg differ
diff --git a/public/images/sy/icons_smile.png b/public/images/sy/icons_smile.png
new file mode 100644
index 000000000..b760d82fc
Binary files /dev/null and b/public/images/sy/icons_smile.png differ
diff --git a/public/images/sy/icons_sy.png b/public/images/sy/icons_sy.png
new file mode 100644
index 000000000..09cdd32cb
Binary files /dev/null and b/public/images/sy/icons_sy.png differ
diff --git a/public/images/sy/icons_tan.png b/public/images/sy/icons_tan.png
new file mode 100644
index 000000000..eaac3551b
Binary files /dev/null and b/public/images/sy/icons_tan.png differ
diff --git a/public/images/sy/liststyle.png b/public/images/sy/liststyle.png
new file mode 100644
index 000000000..0d73a985f
Binary files /dev/null and b/public/images/sy/liststyle.png differ
diff --git a/public/images/sy/logo_class.jpg b/public/images/sy/logo_class.jpg
new file mode 100644
index 000000000..f9b475bcf
Binary files /dev/null and b/public/images/sy/logo_class.jpg differ
diff --git a/public/images/sy/male.jpg b/public/images/sy/male.jpg
new file mode 100644
index 000000000..46d58f26e
Binary files /dev/null and b/public/images/sy/male.jpg differ
diff --git a/public/images/sy/massage.jpg b/public/images/sy/massage.jpg
new file mode 100644
index 000000000..6ec412180
Binary files /dev/null and b/public/images/sy/massage.jpg differ
diff --git a/public/images/sy/sy_icons_close.png b/public/images/sy/sy_icons_close.png
new file mode 100644
index 000000000..e500a2a27
Binary files /dev/null and b/public/images/sy/sy_icons_close.png differ
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index fb7c6cda2..b7468366a 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1261,6 +1261,7 @@ function elocalStorage(editor,mdu){
             h = h < 10 ? '0' + h : h;
             m = m < 10 ? '0' + m : m;
             s = s < 10 ? '0' + s : s;
+            editor.sync();
             if(!editor.isEmpty()){
                 add_data("content",mdu,editor.html());
                 $('#e_tip').html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
@@ -1340,40 +1341,6 @@ function expand_all_reply(container, btnid, id, type, div_id) {
     }
 }
 
-function expand_journal_reply(container, btnid, id, type, div_id, allow_delete) {
-    var target = $(container);
-    var btn = $(btnid);
-    if (btn.data('init') == '0') {
-        btn.data('init', 1);
-        $.get(
-            '/users/all_journals',
-            {
-                type: type,
-                id: id,
-                div_id: div_id,
-                allow_delete: allow_delete
-            },
-            function(data) {
-
-            }
-        );
-        btn.html('收起回复');
-        //target.show();
-    } else if(btn.data('init') == '1') {
-        btn.data('init', 3);
-        btn.html('展开更多');
-        target.hide();
-        target.eq(0).show();
-        target.eq(1).show();
-        target.eq(2).show();
-    }
-    else {
-        btn.data('init', 1);
-        btn.html('收起回复');
-        target.show();
-    }
-}
-
 function expand_message_reply(container, btnid, id, type, div_id, is_course, is_board) {
     var target = $(container);
     var btn = $(btnid);
diff --git a/public/javascripts/syllabus.js b/public/javascripts/syllabus.js
index 4dd387595..24b997496 100644
--- a/public/javascripts/syllabus.js
+++ b/public/javascripts/syllabus.js
@@ -31,10 +31,11 @@ function submit_syllabus() {
 }
 
 //编辑英文名称
-function show_edit_eng_name() {
+function show_edit_eng_name(str) {
     EngEdit = true;
     $("#syllabus_eng_name_show").hide();
     $("#syllabus_eng_name_edit").show();
+    $("#syllabus_eng_name_edit").val(str);
     $("#syllabus_eng_name_edit").focus();
 }
 
@@ -57,7 +58,7 @@ function show_edit_title(str) {
     IsEdit = true;
     $("#syllabus_title_show").hide();
     $("#syllabus_title_edit").show();
-    $("#syllabus_title_edit").text(str);
+    $("#syllabus_title_edit").val(str);
     $("#syllabus_title_edit").focus();
 }
 
@@ -82,13 +83,13 @@ function toggle_all_syllabus_attr(){
     var none = $("#all_syllabus_attr li.none_attr");
     if(btn.data('init')=='0'){
         btn.data('init',1);
-        btn.removeClass('homepageLeftMenuMoreIcon');
-        btn.addClass('homepageLeftMenuHideIcon');
+        btn.removeClass('homepageLeftMenuMoreIcon2');
+        btn.addClass('homepageLeftMenuHideIcon2');
         target.show();
     }else{
         btn.data('init',0);
-        btn.addClass('homepageLeftMenuMoreIcon');
-        btn.removeClass('homepageLeftMenuHideIcon');
+        btn.addClass('homepageLeftMenuMoreIcon2');
+        btn.removeClass('homepageLeftMenuHideIcon2');
         none.hide();
     }
 }
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index 0647ebe9a..4a29a5b82 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -497,7 +497,7 @@ a:hover.testEdit{ background:url(../images/icons.png) -21px -272px  no-repeat;}
 /*20151123课程排行榜Tim*/
 .courseMenuSetting {background:url(/images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top:3px; float:right; margin-right:5px;}
 .courseMenuSetting:hover {background:url(/images/homepage_icon2.png) -190px -407px no-repeat;}
-.rankList {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;}
+.rankList {width:208px; background: #fff; border: 1px solid #e5e5e5; border-bottom: none; padding:10px 15px;}
 .rankList li {width:73px; padding:8px 0px 0px 0px; text-align:center; float:left; position:relative;}
 .rankList li p {width:100%; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;}
 .rankPortrait {border-radius:50%; width:35px; height:35px;}
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index a4820b273..82e27aa1f 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -7,7 +7,7 @@
 /*主内容左右分栏*/
 #LSide{ width:240px;}
 #RSide{ width:670px; background:#fff; padding:10px; margin-left: 10px; margin-bottom:10px;}
-
+.courseRSide{ width:730px; background:#fff; padding:10px; margin-left: 10px; margin-bottom:10px;}
 /*资源库*/
 .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
 .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 2c0a7a9a1..be8bbc65b 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -330,6 +330,8 @@ a.projectsLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(/images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
 .homepageLeftMenuHideIcon {background:url(/images/homepage_icon.png) 100px -624px no-repeat;display:block; height:18px;}
+.homepageLeftMenuMoreIcon2 {background:url(/images/homepage_icon.png) -90px -240px no-repeat; display:block; height:18px;}
+.homepageLeftMenuHideIcon2 {background:url(/images/homepage_icon.png) 85px -624px no-repeat;display:block; height:18px;}
 .homepageMenuSetting {display:inline-block; background:url(/images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
 .homepageMenuSetting:hover {background:url(/images/homepage_icon2.png) -190px -407px no-repeat;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
diff --git a/public/stylesheets/sy_public.css b/public/stylesheets/sy_public.css
new file mode 100644
index 000000000..faae17d1d
--- /dev/null
+++ b/public/stylesheets/sy_public.css
@@ -0,0 +1,206 @@
+/* 字体颜色 */
+.sy_cblack{ color: #333;}
+.sy_cgrey{ color: #888;}
+.sy_corange{ color: #ee4a1f;}
+.sy_f14{ font-size: 14px;}
+.sy_f16{ font-size: 16px;}
+a.sy_cgrey{ color: #888;}
+a:hover.sy_cgrey{ color:#ee4a1f;}
+a.sy_corange{ color: #ee4a1f; }
+a:hover.sy_corange{ text-decoration:underline;}
+a.sy_cblue{ color: #3b94d6;}
+a.sy_cblack{ color: #333;}
+a.sy_cgrey{ color: #888;}
+a.sy_cmore{ font-size:12px; color:#888; font-weight:normal;}
+a:hover.sy_cmore{color: #ee4a1f;}
+/* 按钮*/
+a.btn_orange_big{
+    border: 1px solid #ee4a1f;
+    color: #ee4a1f;
+    text-align: center;
+    font-size: 14px;
+    padding:0 10px;
+    height: 30px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.btn_orange_big{
+    background: #ee4a1f;
+    color: #fff;
+}
+a.btn_green_big{
+    border: 1px solid #60b25e;
+    color: #60b25e;
+    text-align: center;
+    font-size: 14px;
+    padding:0 10px;
+    height: 30px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.btn_green_big{
+    background: #60b25e;
+    color: #fff;
+}
+a.sy_btn_green{
+    color: #fff;
+    background: #60b25e;
+    text-align: center;
+    font-size: 12px;
+    padding:0 15px;
+    height: 30px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.sy_btn_green{ background: #51a74f;}
+a.sy_btn_grey{
+    color: #333;
+    background: #e1e1e1;
+    text-align: center;
+    font-size: 12px;
+    padding:0 15px;
+    height: 30px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.sy_btn_grey{ background: #c3c3c3;}
+a.sy_btn_blue{
+    color: #fff;
+    background: #3b94d6;
+    text-align: center;
+    font-size: 12px;
+    padding:0 15px;
+    height: 30px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.sy_btn_blue{ background: #2788d0;}
+/* 排序 */
+.sy_category{
+    height: 50px;
+    line-height: 50px;
+    padding-left: 15px;
+    border-bottom:1px solid #ddd;
+}
+.sy_category span{ float: left;}
+a.sortupbtn{
+    background: url(../images/sy/liststyle.png) 0 3px no-repeat;
+    width:12px;
+    height:17px;
+    display:block;
+    margin-right:10px;
+    cursor:pointer;
+}
+a.sortdownbtn{
+    background: url(../images/sy/liststyle.png) 0 -12px no-repeat;
+    width:12px;
+    height:17px;
+    display:block;
+    cursor:pointer;
+}
+/* 翻页 */
+.pages a{
+    display:block;
+    border:1px solid #d1d1d1;
+    color:#888;
+    float:left;
+    width:30px;
+    text-align:center;
+    padding:3px 0;
+    line-height:1.9;
+    margin-right:5px;
+}
+.pages a:hover{
+    background-color:#3b94d6;
+    border:1px solid #3b94d6;
+    color:#fff;
+}
+a.pages-big{
+    width:50px;
+}
+.pages .active{
+    background-color:#3b94d6;
+    border:1px solid #3b94d6;
+    color:#fff;
+}
+.pages{
+    width:330px;
+
+    margin:20px auto 10px;
+}
+/* 输入框 */
+.sy_contanier input,.sy_contanier select{
+    border:1px solid #ccc;
+    padding:5px;
+    background:#fff;
+}
+/* 加入班级弹窗 */
+#sy_popup_box{
+    width:460px;
+    background:#fff;
+    padding-bottom:30px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+}
+.sy_popup_top{
+    background:#3b94d6;
+    height:40px;
+    -webkit-border-radius: 5px 5px 0px 0px;
+    -moz-border-radius: 5px 5px 0px 0px;
+    -o-border-radius: 5px 5px 0px 0px;
+    border-radius: 5px 5px 0px 0px;
+}
+.sy_popup_top h3{
+    font-size:18px;
+    color:#fff;
+    font-weight:normal;
+    line-height:40px;
+    padding-left:10px;
+}
+a.sy_icons_close{
+    width:20px;
+    height:20px;
+    display:block;
+    background: url(../images/sy/sy_icons_close.png) 0 0px no-repeat;
+    margin:8px 10px 0 0;
+}
+.sy_popup_con{
+    margin:30px auto 0;
+    font-size:14px;
+    width:330px;
+}
+.sy_popup_add label{
+    display:block;
+    float:left;
+    width:85px;
+    text-align:right;
+    line-height:40px;
+}
+.sy_popup_add li{
+    line-height:40px;
+}
+.sy_input_txt{
+    border:1px solid #dedede;
+    height:36px;
+    background:#fff;
+    padding:0 5px;
+    width:220px;
+}
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 91c69f47a..3b856ad67 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -56,6 +56,9 @@ input.syllabus_input_min{
     background: #fff;
     border: 1px solid #dddddd;
 }
+.sy_tab_con{
+    width:740px;  padding:20px 20px 0 20px; position:relative;
+}
 .syllabuscon_title{
     color:#000; text-align:center;
 }
@@ -146,3 +149,465 @@ a:hover.course-title{ color:#269ac9;}
 .homepageSyllabusName {font-size:16px; color:#484848; float:left; max-width:120px;}
 .syllabusTitleTextarea {resize:none; width:120px; margin-left: 10px; height:80px; max-width:120px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 0px;}
 
+/* */
+/* 课程大纲头部 */
+.sy_top{
+    background:#f5f5f5;
+    width: 100%;
+    height: 138px;
+}
+.sy_top_con{
+    background: url(../images/sy/bg_sy.jpg) no-repeat;
+    width: 1280px;
+    margin: 0 auto;
+    height: 108px;
+    text-align:center;
+    padding-top: 30px;
+}
+.sy_top_con h2{
+    font-size: 30px;
+    color: #cc3433;
+    font-weight:normal;
+}
+.sy_top_con p{
+    font-size: 18px;
+    color: #333;
+}
+/* 课程大纲tab */
+.sy_content{
+    width: 1000px;
+    margin: 0 auto;
+    margin-top:12px;
+}
+.sy_con_l{
+    width: 785px;
+    border: 1px solid #e7e7e7;
+    background: #fff;
+}
+#sy_tab_nav {
+    border-bottom:1px solid #e7e7e7;
+    height:50px;
+    background: #f8f8f8;
+}
+#sy_tab_nav li {
+    float:left;
+    padding:0px 50px;
+    text-align:center;
+    height: 47px;
+    line-height: 47px;
+}
+#sy_tab_nav li a{
+    font-size:16px;
+    color: #333;
+}
+.sy_tab_hover {
+    border-top:3px solid #ee4a1f;
+    border-bottom:1px solid #fff;
+    background: #fff;
+}
+.sy_tab_nomal {
+    border-bottom:none;
+}
+.undis {
+    display:none;
+}
+.dis {
+    display:block;
+}
+/* 课程大纲 */
+.icons_tishi{
+    width: 110px;
+    height: 110px;
+    margin: 135px auto 20px;
+}
+.sy_tab_con_p{
+    font-size: 16px;
+    text-align: center;
+    margin-bottom:100px;
+    color:#888;
+}
+.sy_classlist{
+    padding: 15px 15px;
+    border-bottom: 1px dashed #e6e6e6;
+}
+.sy_classlist_title{
+    font-size: 16px;
+    font-weight: normal;
+    margin-bottom: 5px;
+    max-width:600px;
+    overflow:hidden;
+    white-space: nowrap;
+    text-overflow:ellipsis;
+}
+.sy_con_r{
+    width:205px;
+}
+.sy_right_box{
+    border:1px solid #e7e7e7;
+    border-bottom:none;
+    background:#fff;
+    width:205px;
+    padding-bottom:15px;
+}
+.sy_right_title{
+    border-left:5px solid #ee4a1f;
+    height:30px;
+    line-height:30px;
+    font-size:16px;
+    padding-left:10px;
+    margin-top:5px;
+}
+.sy_info label{
+    width:70px;
+    text-align:right;
+    display:block;
+    float:left;
+    margin-right:5px;
+}
+.sy_info input,.sy_info select{
+    width:105px;
+    border:1px solid #e7e7e7;
+    margin-bottom:5px;
+}
+.sy_info select{
+    width:115px;
+}
+.sy_info li{
+    height:30px;
+    line-height:30px;
+}
+input.sy_info_input_min{
+    width:30px;
+}
+.sy_teachers_list{
+    margin:10px;
+}
+.sy_teachers_list li{
+    padding:10px 0;
+}
+.sy_teachers_img{
+    width:60px;
+    height:60px;
+    border:3px solid #e6e6e6;
+    -webkit-border-radius:50px;
+    -moz-border-radius:50px;
+    -o-border-radius:50px;
+    border-radius:50px;
+}
+a.sy_teachers_name{
+    color: #000;
+    display:block;
+    width:95px;
+    font-size:16px;
+    margin:5px 0 10px;
+}
+a:hover.sy_teachers_name{
+    color: #ee4a1f;
+}
+.sy_teachers_span{
+    font-size:12px;
+    color:#fff;
+    width:150px;
+    padding:2px 5px;
+    background:#ffb400;
+    -webkit-border-radius:50px;
+    -moz-border-radius:50px;
+    -o-border-radius:50px;
+    border-radius:50px;
+}
+/* 班级主页 */
+.sy_class_infobox{
+    padding:15px;
+    background:#fff;
+    margin:12px auto 0;
+    width:968px;
+    border:1px solid #e5e5e5;
+    position: relative;
+}
+.homepagePostSetting {
+    position:absolute;
+    width:20px;
+    height:20px;
+    right:10px;
+    top:10px;
+}
+.homepagePostSetting ul li:hover ul {
+    display:block;
+}
+.homepagePostSettingIcon {
+    background:url(../images/sy/icons_sy.png) 1px -408px no-repeat;
+    width:20px;
+    height:20px;
+}
+.homepagePostSettiongText {
+    width:75px;
+    text-align: center;
+    line-height:2;
+    font-size:12px;
+    color:#616060;
+    background-color:#ffffff;
+    border:1px solid #eaeaea;
+    border-radius:3px;
+    position:absolute;
+    left:-60px;
+    top:20px;
+    padding:5px 0px;
+    display:none;
+    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+}
+.homepagePostSettingIcon:hover {
+    background:url(../images/sy/icons_sy.png) -28px -408px no-repeat;
+}
+a.postOptionLink {
+    color:#616060;
+    display:block;
+    width:55px;
+    padding:0px 10px;
+}
+a.postOptionLink:hover {
+    color:#fff;
+    background-color:#3b94d6;
+}
+
+.sy_class_logo{
+    width:110px;
+    height:110px;
+}
+.sy_class_id{
+    width:110px;
+    height:80px;
+    background:#f1f1f1;
+    text-align:center;
+    padding-top:30px;
+}
+.sy_class_id p{
+    font-size:16px;
+    color:#333;
+}
+.sy_class_title{
+    font-size: 18px;
+    font-weight: normal;
+    margin-bottom: 5px;
+    max-width:440px;
+    overflow:hidden;
+    white-space: nowrap;
+    text-overflow:ellipsis;
+}
+.icon_si{
+    display:block;
+    width:30px;
+    height:22px;
+    background:url(../images/sy/icons_sy.png) 0 -452px no-repeat;
+    color:#fff;
+    font-size:12px;
+    padding-left:10px;
+    line-height: 22px;
+}
+.sy_class_titbox{margin-bottom:5px; padding-top:10px; }
+a.sy_btn_orange{
+    display:block;
+    border:1px solid #ee4a1f;
+    background:#fff url(../images/sy/icons_sy.png) 8px -548px no-repeat;
+    color:#ee4a1f;
+    text-align:center;
+    height:26px;
+    line-height:26px;
+    width:60px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+    padding-left:20px;
+}
+a:hover.sy_btn_orange{
+    border:1px solid #fff;
+    background:#ee4a1f url(../images/sy/icons_sy.png) 8px -516px no-repeat;
+    color:#fff;
+}
+/* 班级主页左侧导航 */
+.sy_class_leftnav{ width:240px;}
+.accordion li > a {
+    display: block;
+    padding: 0 10px 0 40px;
+    height:49px;
+    line-height:49px;
+    color: #333;
+    font-size:16px;
+    background: #f8f8f8;
+    border:1px solid #e5e5e5;
+    border-bottom:none;
+}
+.accordion > li:hover > a{
+    color: #ee4a1f;
+    background: #fff;
+}
+.accordion > li:target > a,
+.accordion > li > a.active {
+    color: #ee4a1f;
+    background: #fff;
+    border:1px solid #e5e5e5;
+    border-left:3px solid #ee4a1f;
+    border-bottom:none;
+}
+.accordion  li{ position:relative;}
+
+.accordion li > a span {
+    margin-top:15px;
+    font-size:12px;
+    padding: 0 10px;
+    background: #dbdbdb;
+    -webkit-border-radius: 15px;
+    -moz-border-radius: 15px;
+    border-radius: 15px;
+    margin-left:10px;
+    color: #333;
+}
+.accordion > li:hover > a span,
+.accordion > li:target > a span,
+.accordion > li > a.active span {
+    margin-left:10px;
+    color: #333;
+    background: #dbdbdb;
+}
+/* Images */
+.accordion > li > a:before {
+    position: absolute;
+    top: 0;
+    left: 0;
+    content: '';
+    width: 24px;
+    height: 50px;
+    margin: 4px 8px;
+    background-repeat: no-repeat;
+    background-image: url(../images/sy/icons_sy.png);
+    background-position: 5px 13px;
+}
+.accordion li.sy_icons_index > a:before { background-position: 5px 13px; }
+.accordion li.sy_icons_index:hover > a:before,
+.accordion li.sy_icons_index:target > a:before,
+.accordion li.sy_icons_index > a.active:before { background-position: -23px 13px; }
+
+.accordion li.sy_icons_boards > a:before { background-position: 5px -23px; }
+.accordion li.sy_icons_boards:hover > a:before,
+.accordion li.sy_icons_boards:target > a:before,
+.accordion li.sy_icons_boards > a.active:before { background-position: -23px -23px; }
+
+.accordion li.sy_icons_more > a:before { background-position: 5px -60px; }
+.accordion li.sy_icons_more:hover > a:before,
+.accordion li.sy_icons_more:target > a:before,
+.accordion li.sy_icons_more > a.active:before { background-position: -23px -60px; }
+
+.accordion li.sy_icons_hwork > a:before { background-position: 5px -100px; }
+.accordion li.sy_icons_hwork:hover > a:before,
+.accordion li.sy_icons_hwork:target > a:before,
+.accordion li.sy_icons_hwork > a.active:before { background-position: -23px -100px; }
+
+.accordion li.sy_icons_news > a:before { background-position: 5px -134px; }
+.accordion li.sy_icons_news:hover > a:before,
+.accordion li.sy_icons_news:target > a:before,
+.accordion li.sy_icons_news > a.active:before { background-position: -23px -134px; }
+
+.accordion li.sy_icons_files > a:before { background-position: 5px -172px; }
+.accordion li.sy_icons_files:hover > a:before,
+.accordion li.sy_icons_files:target > a:before,
+.accordion li.sy_icons_files > a.active:before { background-position: -23px -172px; }
+
+.accordion li.sy_icons_feedback > a:before { background-position: 5px -214px; }
+.accordion li.sy_icons_feedback:hover > a:before,
+.accordion li.sy_icons_feedback:target > a:before,
+.accordion li.sy_icons_feedback > a.active:before { background-position: -23px -214px;}
+
+.accordion li.sy_icons_poll > a:before { background-position: 5px -251px; }
+.accordion li.sy_icons_poll:hover > a:before,
+.accordion li.sy_icons_poll:target > a:before,
+.accordion li.sy_icons_poll > a.active:before { background-position: -23px -251px; }
+
+.accordion li.sy_icons_exercise > a:before { background-position: 5px -290px; }
+.accordion li.sy_icons_exercise:hover > a:before,
+.accordion li.sy_icons_exercise:target > a:before,
+.accordion li.ssy_icons_exercise > a.active:before { background-position: -23px -290px; }
+
+.accordion li.sy_icons_st > a:before { background-position: 5px -330px; }
+.accordion li.sy_icons_st:hover > a:before,
+.accordion li.sy_icons_st:target > a:before,
+.accordion li.sy_icons_st > a.active:before { background-position: -23px -330px; }
+/* Sub Menu */
+.sub-menu li a {
+    color: #797979;
+    background: #f8f8f8;
+    height:39px;
+    line-height:39px;
+    font-size:14px;
+}
+.sub-menu li:last-child a { border-bottom:1px solid #e5e5e5; }
+.accordion li > .sub-menu {
+    display: none;
+}
+.accordion li:target > .sub-menu {
+    display: block;
+}
+.accordion > li > a.sy_class_add:before{background-image:none;}
+.accordion > li > a.sy_class_add {
+    padding:0;
+    border:none;
+    display:block;
+    position: absolute;
+    top:15px;
+    right:10px;
+    width:20px;
+    height:20px;
+    background: url(../images/sy/icons_sy.png) 0px -487px no-repeat;
+}
+.sub-menu > li > a.sy_class_add {
+    padding:0;
+    border:none;
+    display:block;
+    position: absolute;
+    top:15px;
+    right:10px;
+    width:20px;
+    height:20px;
+    background: url(../images/sy/icons_sy.png) 0px -487px no-repeat;
+}
+.accordion  li .sy_class_add:hover {
+    background: url(../images/sy/icons_sy.png) -32px -487px no-repeat;
+    padding:0;
+    border:none;
+}
+
+.sy_class_leftbox{ width:208px; background: #fff; border: 1px solid #e5e5e5; border-bottom: none; padding:10px 15px;}
+.sy_class_users{ width:50px; margin:0 15px 10px 4px;  }
+.sy_class_users span{ display:block; height:20px;width:50px; overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
+.sy_class_users img{
+    width:40px;
+    height:40px;
+    margin:5px 0;
+    border: 3px solid #fff;
+    -webkit-border-radius:50px;
+    -moz-border-radius:50px;
+    -o-border-radius:50px;
+    border-radius:50px;
+}
+.sy_class_users img:hover{border: 3px solid #e6e6e6;}
+.sy_class_leftbox h3{
+    height:30px;
+    line-height:30px;
+    font-size:14px;
+    font-weight:normal;
+}
+.sy_sq_orange{ display: block;width: 15px; height: 15px; background:#f79981; color: #fff; text-align:center; line-height: 15px;}
+a.sy_class_ltitle{display: block; font-size: 14px; width: 185px; color:#888; }
+a:hover.sy_class_ltitle{ color:#333;}
+.sy_cir_grey{
+    font-size:12px;
+    padding: 0 10px;
+    background: #dbdbdb;
+    -webkit-border-radius: 15px;
+    -moz-border-radius: 15px;
+    border-radius: 15px;
+    color: #888;
+}
+.sy_class_lclass li{ padding:10px 0; border-bottom: 1px dashed #ebebeb;}
+.sy_class_lclass li:last-child { border-bottom:none;}
+.sy_class_r{ width: 748px; background: #fff; border: 1px solid #e5e5e5;}
+