diff --git a/.access_token b/.access_token
index 610b08d2e..2e228963c 100644
--- a/.access_token
+++ b/.access_token
@@ -1 +1 @@
-{"access_token":"oEEf8ZKAB8Y2G0o_xnTPkPJHKKk8iHkLC-f5ptvQ2nCMj9IpC86ivLD2-p38GfOkuG-HuQp3pWZqhs3NJXUMdPLWsr5k67hPZYuqg4ozLccx0xdLswapj0mn8ovZhK1tKIKiAFAOMO","expires_in":7200,"got_token_at":1467012449}
\ No newline at end of file
+{"access_token":"b_Pc60Dd5eyg_ut3cHbsjQO9EJJdj2Qj5F99o9LH9ltKSme7_FZ3Of22lWLL-K2V0siWzv-bd9PO0Dn-L1PBvIy9LhXa0qPVaFl6vTtZHR2kA8qjo1ps2ancya0t7KmzURGbAFAAXM","expires_in":7200,"got_token_at":1467976842}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index dbc349c80..1ef7e63ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,7 @@
 /config/database.yml
 /config/configuration.yml
 /config/additional_environment.rb
-/config/menu.yml
-/config/wechat.yml
+
 
 /files/*
 /log/*
@@ -35,3 +34,5 @@ vendor/cache
 1234567
 public/javascripts/wechat/node_modules/
 .ruby-version
+.access_token
+tmux*.log
diff --git a/Gemfile b/Gemfile
index bb94100a5..3bea83669 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,8 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
   if RUBY_PLATFORM =~ /darwin/
     gem "rmagick", "= 2.15.4" ## osx must be this version
-  else
-    gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
+  elsif RUBY_PLATFORM =~ /linux/
+    #gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
   end
   gem 'certified'
   gem 'net-ssh', '2.9.1'
@@ -57,7 +57,7 @@ group :development do
   gem 'grape-swagger'
   gem 'better_errors', '~> 1.1.0'
   # gem "query_reviewer"
-  # gem 'rack-mini-profiler', '~> 0.9.3'
+  gem 'rack-mini-profiler', '~> 0.9.3'
   if RUBY_PLATFORM =~ /w32/
     gem  'win32console'
   end
diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index c555eb633..9b4bdb5d6 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -19,6 +19,7 @@ module Mobile
   require_relative 'apis/new_comment'
   require_relative 'apis/praise'
   require_relative 'apis/resources'
+  require_relative 'apis/syllabuses'
 
   class API < Grape::API
     version 'v1', using: :path
@@ -73,6 +74,7 @@ module Mobile
     mount Apis::NewComment
     mount Apis::Praise
     mount Apis::Resources
+    mount Apis::Syllabuses
 
     add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 661925012..b4fb90ea7 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -10,30 +10,44 @@ module Mobile
         params do
           requires :page, type: Integer
           requires :token, type: String
+          requires :container_type, type: String
         end
         post do
           authenticate!
 
           user = current_user
 
-          shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
-          shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
+          container_type = params[:container_type] ? params[:container_type] : "All"
+
+          if container_type == "All" || container_type == "Project"
+            shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
+            user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
+            project_types = "('Message','Issue','Project')"
+          end
+
+          if container_type == "All" || container_type == "Course"
+            shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
+            user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
+            course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+          end
+
           page = params[:page] ? params[:page] : 0
-          user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
-          user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
-          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-          project_types = "('Message','Issue','Project')"
           principal_types = "JournalsForMessage"
           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 + ")"
           watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").count == 0 ? " " :Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
           blog_ids = "(" + watched_user_blog_ids + ")"
 
-          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}) " +
-                                                    "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
-
+          if container_type == "Course"
+            activities = UserActivity.where("(container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc')
+          elsif container_type == "Project"
+            activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})").order('updated_at desc')
+          else
+            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}) " +
+                                                      "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
+          end
           all_count = activities.count
           activities = activities.limit(10).offset(page * 10)
           count = activities.count
@@ -42,6 +56,7 @@ module Mobile
           present :count, count
           present :page, page
           present :status, 0
+          present :container_type, container_type
         end
       end
     end
diff --git a/app/api/mobile/apis/blog_comments.rb b/app/api/mobile/apis/blog_comments.rb
index 5a064245a..bb5758e71 100644
--- a/app/api/mobile/apis/blog_comments.rb
+++ b/app/api/mobile/apis/blog_comments.rb
@@ -7,7 +7,7 @@ module Mobile
 
         desc "get special topic"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          user = current_user
           blog = BlogComment.find params[:id]
           present :data, blog, with: Mobile::Entities::BlogComment,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 42303b63d..301417781 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -107,7 +107,7 @@ module Mobile
           status = cs.join_course({role: "10", openid: params[:openid], invite_code: params[:invite_code]}, current_user)
           {
               status: status[:state],
-              messsge:CoursesService::JoinCourseError.message(status[:state])
+              message:CoursesService::JoinCourseError.message(status[:state])
           }
         end
 
@@ -396,6 +396,23 @@ module Mobile
           present :status,0
         end
 
+        desc '删除课程'
+        params do
+          requires :token, type: String
+        end
+        post ':course_id/del' do
+          authenticate!
+          c = Course.find(params[:course_id])
+          # if c.members.count > 1
+          #   {status: -1, message: '已经有成员加入,不能删除'}
+          # else
+            c.delete!
+            present :status,0
+          # end
+
+
+        end
+
       end
     end
   end
diff --git a/app/api/mobile/apis/resources.rb b/app/api/mobile/apis/resources.rb
index fca94a642..6dfe8e599 100644
--- a/app/api/mobile/apis/resources.rb
+++ b/app/api/mobile/apis/resources.rb
@@ -46,9 +46,25 @@ module Mobile
         end
 
 
-      end
+        desc '发送资源'
+        params do
+          requires :token, type: String
+          requires :course_ids, type: Array[Integer]
+          requires :send_id, type: Integer
+        end
+        post 'send' do
+          authenticate!
 
+          rs = ResourcesService.new
+          ori, flag, save_message = rs.send_resource_to_course(current_user,params)
+          if flag
+            present :status, 0
+          else
+            {status: -1, message: save_message.first}
+          end
+        end
 
+      end
 
     end
   end
diff --git a/app/api/mobile/apis/syllabuses.rb b/app/api/mobile/apis/syllabuses.rb
new file mode 100644
index 000000000..57db4cb9e
--- /dev/null
+++ b/app/api/mobile/apis/syllabuses.rb
@@ -0,0 +1,103 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class Syllabuses < Grape::API
+
+      resources :syllabuses do
+        desc "获取大纲列表"
+        params do
+          requires :token, type: String
+        end
+        get do
+          authenticate!
+
+          cs = SyllabusesService.new
+          courses = cs.user_syllabus(current_user)
+          present :data, courses, with: Mobile::Entities::Syllabus
+          present :status, 0
+        end
+
+        desc "获取某个大纲"
+        params do
+          requires :token, type: String
+        end
+        get ':id' do
+          authenticate!
+
+          ss  = SyllabusesService.new
+
+          sy = ::Syllabus.find(params[:id])
+          sy.courses = sy.courses.not_deleted
+          sy = ss.judge_can_setting(sy,current_user)
+
+          present :data, sy, with: Mobile::Entities::Syllabus
+          present :status, 0
+        end
+
+        desc "获取新建大纲的权限"
+        params do
+          requires :token, type: String
+        end
+        post 'auth' do
+          authenticate!
+
+          auth = 0
+
+          if (current_user.user_extensions && current_user.user_extensions.identity == 0 && current_user.allowed_to?(:add_course, nil, :global => true))
+            auth = 1
+          end
+
+          present :auth, auth
+        end
+
+        desc "新建大纲"
+        params do
+          requires :token, type: String
+          requires :title, type: String, desc: '大纲标题'
+          requires :courses, type: Array[String], desc: '课程名'
+        end
+        post do
+          authenticate!
+
+          ss  = SyllabusesService.new
+
+          sy = ss.create(current_user, params[:title],
+                         params[:courses].map{|c| {name: c} })
+
+          if sy.new_record?
+            {status:-1, message: '创建大纲失败' }
+          else
+            present :data, sy, with: Mobile::Entities::Syllabus
+            present :status, 0
+          end
+
+        end
+
+        desc '编辑大纲'
+        params do
+          requires :token, type: String
+          requires :title, type: String, desc: '大纲标题'
+          # requires :add_courses, type: Array[String], desc: '课程名'
+          # requires :modify_courses, type: Array[Integer,String], desc: '课程名'
+        end
+        post ':id/edit' do
+
+          authenticate!
+
+          ss  = SyllabusesService.new
+
+          #修改课程大纲
+          status = ss.edit(current_user, params)
+
+          if status == -1
+            {status:status, message: '修改课程信息失败' }
+          else
+            present :status, status
+          end
+        end
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index b5ee14d19..a6536e73e 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -53,10 +53,20 @@ module Mobile
           requires :password, type: String, desc: 'password'
         end
         post do
+
+          openid = session[:wechat_openid]
+          logger.debug "openid ============== #{openid}"
+          raise "无法获取到openid,请在微信中打开本页面" unless openid
+
+
           us = UsersService.new
           user = us.register params.merge(:password_confirmation => params[:password],
                                           :should_confirmation_password => true)
-          raise "该邮箱已经被注册过了" if user.new_record?
+          raise user.errors.full_messages.first if user.new_record?
+          UserWechat.create!(
+              openid: openid,
+              user: user
+          )
           
           present :data, user, with: Mobile::Entities::User
           present :status, 0
diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb
index 487a75c4d..d44869a60 100644
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@@ -15,6 +15,8 @@ module Mobile
             #f.img_url if f.respond_to?(:img_url)
           elsif field == :created_at || field == :updated_at
             (format_time(c[field]) if (c.is_a?(Hash) && c.key?(field))) || (format_time(c.send(field)) if c.respond_to?(field))
+          elsif field == :member_count
+            ::Course===c ? c.members.count : 0
           else
             (c[field] if (c.is_a?(Hash) && c.key?(field))) || (c.send(field) if c.respond_to?(field))
           end
@@ -49,6 +51,8 @@ module Mobile
       course_expose :qrcode
       course_expose :updated_at
       course_expose :course_student_num
+      course_expose :member_count
+      course_expose :can_setting
       expose :teacher, using: Mobile::Entities::User do |c, opt|
         if c.is_a? ::Course
           c.teacher
diff --git a/app/api/mobile/entities/syllabus.rb b/app/api/mobile/entities/syllabus.rb
new file mode 100644
index 000000000..4f97dd868
--- /dev/null
+++ b/app/api/mobile/entities/syllabus.rb
@@ -0,0 +1,13 @@
+module Mobile
+  module Entities
+    class Syllabus < Grape::Entity
+      include ApplicationHelper
+
+      expose :title
+      expose :id
+      expose :can_setting
+
+      expose :courses, using: Mobile::Entities::Course
+    end
+  end
+end
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 4014a91bd..52e1f5fd0 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -45,9 +45,78 @@ class AdminController < ApplicationController
     render :action => "projects", :layout => false if request.xhr?
   end
 
-  def courses
+  def syllabuses
     @name = params[:name]
-    @courses = Course.like(@name).order('created_at desc')
+    @syllabuses = Syllabus.like(@name).order('created_at desc')
+    @syllabuses = paginateHelper @syllabuses,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #为班级选择课程
+  def select_course_syllabus
+    @flag = false
+    if params[:syllabus_id] && params[:course_id]
+      course = Course.where("id = #{params[:course_id].to_i}").first
+      unless course.nil?
+        course.update_column('syllabus_id', params[:syllabus_id].to_i)
+        @flag = true
+      end
+    end
+    if @flag
+      render :text=> "succ"
+    else
+      render :text=>'fail'
+    end
+  end
+
+  #新建课程
+  def create_syllabus
+    if params[:course_id]
+      course = Course.where("id = #{params[:course_id]}").first
+      if course
+        @user = course.teacher
+        syllabus = Syllabus.new
+        syllabus.update_attributes(:title => params[:title], :eng_name => params[:eng_name], :user_id => @user.id)
+        syllabus.description = Message.where("id = 19412").first.nil? ? nil : Message.where("id = 19412").first.content
+        if syllabus.save
+          course.update_attribute('syllabus_id', syllabus.id)
+          @flag = params[:flag].to_i
+          @course = course
+          respond_to do |format|
+            format.js
+          end
+        end
+      end
+    end
+  end
+
+  def courses
+    @name = params[:name].to_s.strip.downcase
+    if @name && @name != ""
+      @courses = Course.select{ |course| (course.teacher[:lastname].to_s.downcase + course.teacher[:firstname].to_s.downcase).include?(@name) || course.name.include?(@name)}
+      @courses = @courses.sort{|x, y| y.created_at <=> x.created_at}
+    else
+      @courses = Course.order('created_at desc')
+    end
+    @courses = paginateHelper @courses,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #未配置班级列表
+  def non_syllabus_courses
+    @name = params[:name].to_s.strip.downcase
+    if @name && @name != ""
+      @courses = Course.where("syllabus_id is null and is_delete = 0").select{ |course| (course.teacher[:lastname].to_s.downcase + course.teacher[:firstname].to_s.downcase).include?(@name) || course.name.include?(@name)}
+      @courses = @courses.sort{|x, y| y.created_at <=> x.created_at}
+    else
+      @courses = Course.where("syllabus_id is null and is_delete = 0").order('created_at desc')
+    end
     @courses = paginateHelper @courses,30
     @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
@@ -55,6 +124,17 @@ class AdminController < ApplicationController
     end
   end
 
+  #修改班级名称
+  def update_course_name
+    @course = Course.where("id = #{params[:course_id].to_i}").first
+    unless @course.nil?
+      @course.update_column("name", params[:name])
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   #管理员界面精品课程列表
   def excellent_courses
     @courses = Course.where("is_excellent =? or excellent_option =?", 1, 1 )
@@ -72,10 +152,42 @@ class AdminController < ApplicationController
       courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) #{params[:sort]}, c.id desc")
       @order = params[:order]
       @sort = params[:sort]
+
     elsif params[:sort] && (params[:order]  == 'time')
-      courses = Course.find_by_sql("SELECT * FROM courses WHERE name like '%#{name}%' ORDER BY time #{params[:sort]},id desc")
+      courses = Course.find_by_sql("SELECT * FROM courses WHERE name like '%#{name}%' ORDER BY time #{params[:sort]}, id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order] == 'post')
+      courses = Course.find_by_sql("SELECT c.*, count(m.id) count FROM boards b, courses c, messages m WHERE m.board_id = b.id AND b.course_id = c.id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count #{params[:sort]}, c.id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order] == 'res')
+      courses = Course.find_by_sql("SELECT c.*, count(at.container_id) cat FROM attachments at, courses c WHERE at.container_type = 'Course' AND at.container_id = c.id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY cat #{params[:sort]}, id desc")
       @order = params[:order]
       @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order] == 'works')
+      courses = Course.find_by_sql("SELECT c.*, count(hc.id) chc FROM courses c, homework_commons hc,student_works sw WHERE c.id = hc.course_id AND sw.homework_common_id = hc.id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY chc #{params[:sort]}, id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order]  == 'homework')
+      courses = Course.find_by_sql("SELECT c.*, count(sw.id) csw FROM student_works sw, courses c, homework_commons hc WHERE c.id = hc.course_id AND sw.id = c.id  AND c.name like '%#{name}%' GROUP BY c.id ORDER BY csw #{params[:sort]}, id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order]  == 'std')
+      courses = Course.find_by_sql("SELECT c.*, count(sfc.id) sfc FROM courses c, students_for_courses sfc WHERE sfc.course_id = c.id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY sfc #{params[:sort]}, id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order]  == 'open')
+      courses = Course.find_by_sql("SELECT * FROM courses WHERE name like '%#{name}%' ORDER BY is_public #{params[:sort]},id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
     else
       courses = Course.like(name).order('created_at desc')
     end
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 9a72bb4df..ceb63d7b0 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -125,7 +125,9 @@ class BoardsController < ApplicationController
     if @order.to_i == 2
       @type = 2
       @topics.each do |topic|
-        topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count)
+        all_comments = []
+        count=get_all_children(all_comments, topic).count
+        topic[:infocount] = get_praise_num(topic) + count
         if topic[:infocount] < 0
           topic[:infocount] = 0
         end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index e81251f63..a9d84c2d9 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1090,7 +1090,7 @@ class CoursesController < ApplicationController
   #删除课程
   #删除课程只是将课程的is_deleted状态改为false，is_deleted为false状态的课程只有管理员可以看到
   def destroy
-    @course.update_attributes(:is_delete => true)
+    @course.delete!
     @course = nil
     redirect_to user_url(User.current)
   end
diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index e4f637b6d..c3964c567 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -511,7 +511,7 @@ class ExerciseController < ApplicationController
   def commit_exercise
     # 老师不需要提交
     if User.current.allowed_to?(:as_teacher,@course)
-      if @exercise.publish_time.nil?
+      if @exercise.publish_time.nil? || @exercise.publish_time <= Time.now
         @exercise.update_attributes(:show_result => params[:show_result])
         @exercise.update_attributes(:exercise_status => 2)
         @exercise.update_attributes(:publish_time => Time.now)
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 376f8d5c2..6724f42bb 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -27,6 +27,7 @@ class HomeworkCommonController < ApplicationController
       #@homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
       @homework_commons = @course.homework_commons.where("name like '%#{search}%' and publish_time <= '#{Date.today}'").order("created_at desc")
     end
+    #update_homework_time @homework_commons
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
 
@@ -178,7 +179,7 @@ class HomeworkCommonController < ApplicationController
     @statue = 4 and return unless User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
     @statue = 5 and return if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
     if @homework_detail_manual.comment_status == 1
-      student_works = @homework.student_works
+      student_works = @homework.student_works.has_committed
       if student_works && student_works.size >= 2
         if @homework.homework_type == 3
           student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
@@ -232,8 +233,8 @@ class HomeworkCommonController < ApplicationController
     @homework_detail_manual.update_column('comment_status', 3)
     @homework_detail_manual.update_column('evaluation_end', Date.today)
     #计算缺评扣分
-    work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
-    @homework.student_works.each do |student_work|
+    work_ids = "(" + @homework.student_works.has_committed.map(&:id).join(",") + ")"
+    @homework.student_works.has_committed.each do |student_work|
       absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
       student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
       student_work.save
@@ -263,11 +264,11 @@ class HomeworkCommonController < ApplicationController
     @totle_size = 0
     if @homework_detail_manual.comment_status == 1
       @totle_size = @course.student.count
-      @cur_size = @homework.student_works.size
+      @cur_size = @homework.student_works.has_committed.size
     elsif @homework_detail_manual.comment_status == 2
-      @homework.student_works.map { |work| @totle_size += work.student_works_evaluation_distributions.count}
+      @homework.student_works.has_committed.map { |work| @totle_size += work.student_works_evaluation_distributions.count}
       @cur_size = 0
-      @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
+      @homework.student_works.has_committed.map { |work| @cur_size += work.student_works_scores.select("distinct user_id").where(:reviewer_role => 3).count}
     end
     @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
     @user_activity_id = params[:user_activity_id].to_i
@@ -409,8 +410,8 @@ class HomeworkCommonController < ApplicationController
   def update_homework_time homeworks
     unless homeworks.nil?
       homeworks.each do |h|
-        if h.homework_type == 3
-          student_works = h.student_work_projects.where("is_leader = 1")
+        if h.homework_type == 3 && h.homework_detail_group.base_on_project == 1
+          student_works = h.student_work_projects.where("is_leader = 1 && project_id != -1")
           time = h.updated_at
           unless student_works.nil?
             student_works.each do |s|
@@ -418,7 +419,7 @@ class HomeworkCommonController < ApplicationController
               unless project.nil? && project.gpid.nil?
                 project_time=project.updated_on
                 project_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last
-                if format_time(time) < format_time(project_time)
+                if time.strftime('%Y-%m-%d %H:%M:%S') < project_time.strftime('%Y-%m-%d %H:%M:%S')
                   time = project_time
                 end
                 begin
@@ -428,21 +429,30 @@ class HomeworkCommonController < ApplicationController
                   changesets = g.commits(project.gpid, :ref_name => default_branch)
                   changesets_latest_coimmit = changesets[0]
                   unless changesets[0].blank?
-                    if format_time(time) < format_time(changesets_latest_coimmit.created_at)
+                    if time.strftime('%Y-%m-%d %H:%M:%S') <changesets_latest_coimmit.created_at.strftime('%Y-%m-%d %H:%M:%S')
                       time = changesets_latest_coimmit.created_at
                     end
                   end
                 rescue
-                  logger.error("############## ==> update homework project time")
                 end
               end
             end
           end
-          puts h.updated_at
-          puts time
           s_time = time
-          if format_time(time) > format_time(h.updated_at)
+          if time.strftime('%Y-%m-%d %H:%M:%S') > h.updated_at.strftime('%Y-%m-%d %H:%M:%S')
             h.update_column('updated_at', s_time)
+            course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first
+            if course_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > course_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              course_activity.update_column('updated_at', s_time)
+            end
+            user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first
+            if user_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > user_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              user_activity.update_column('updated_at', s_time)
+            end
+            org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first
+            if org_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > org_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              org_activity.update_column('updated_at', s_time)
+            end
           end
         end
       end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 8ef399d10..f5ad89832 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -44,7 +44,8 @@ class MessagesController < ApplicationController
       offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
       page = 1 + offset / REPLIES_PER_PAGE
     end
-    @reply_count = @topic.children.count
+    all_comments = []
+    @reply_count = get_all_children(all_comments, @topic).count
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     if @course
       messages_replies =  @topic.children.
@@ -137,26 +138,32 @@ class MessagesController < ApplicationController
 
   # Reply to a topic
   def reply
-    if params[:reply][:content] == ""
-      if params[:is_board]
-        if @project
-          (redirect_to project_boards_path(@project), :notice => l(:label_reply_empty);return)
-        elsif @course
-          (redirect_to course_boards_path(@course), :notice => l(:label_reply_empty);return)
-        end
-      else
-        (redirect_to board_message_url(@board, @topic, :r => @reply), :notice => l(:label_reply_empty);return)
-      end
+    if params[:parent_id]
+      parent = Message.find params[:parent_id]
+      @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.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]
+    else
+      @quote = params[:quote][:quote]
+      @reply = Message.new
+      @reply.author = User.current
+      @reply.board = @board
+      @reply.safe_attributes = params[:reply]
+      @reply.content = @quote + @reply.content
+      @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
+      @topic.children << @reply
+      # @reply.reply_id = params[:id]
     end
-    @quote = params[:quote][:quote]
-    @reply = Message.new
-    @reply.author = User.current
-    @reply.board = @board
-    @reply.safe_attributes = params[:reply]
-    @reply.content = @quote + @reply.content
-    @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
-    # @reply.reply_id = params[:id]
-    @topic.children << @reply
+
     update_course_activity(@topic.class,@topic.id)
     update_user_activity(@topic.class,@topic.id)
     update_forge_activity(@topic.class,@topic.id)
@@ -182,14 +189,10 @@ class MessagesController < ApplicationController
       respond_to do |format|
         format.js
       end
-    elsif params[:is_board]
-      if @project
-        redirect_to project_boards_path(@project)
-      elsif @course
-        redirect_to course_boards_path(@course)
-      end
+      return
     else
-      redirect_to board_message_url(@board, @topic, :r => @reply)
+      redirect_to board_message_url(@board, @topic)
+      return
     end
 
   end
@@ -251,6 +254,17 @@ class MessagesController < ApplicationController
 
   # Delete a messages
   def destroy
+    if params[:user_activity_id]
+      @message.destroy
+      @topic = Message.find(params[:activity_id].to_i)
+      @user_activity_id = params[:user_activity_id]
+      @is_course = params[:is_course]
+      @is_board = params[:is_board]
+      respond_to do |format|
+        format.js
+      end
+      return
+    end
     if @project
       (render_403; return false) unless @message.destroyable_by?(User.current)
     elsif @course
@@ -299,12 +313,12 @@ class MessagesController < ApplicationController
   end
 
   def quote
-    @subject = @message.subject
-    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
-
-    @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
-    @temp = Message.new
-    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author.show_name)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
+    # @subject = @message.subject
+    # @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+    #
+    # @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
+    # @temp = Message.new
+    # @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author.show_name)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
   end
 
   def preview
diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index bec66aeff..03ed7945a 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -26,14 +26,25 @@ class QualityAnalysisController < ApplicationController
       job_name = "#{user_name}-#{rep_id}"
       sonar_name = "#{user_name}:#{rep_id}"
 
+      # 考虑到历史数据：有些用户创建类job但是build失败,即sonar没有结果，这个时候需要把job删除,并且删掉quality_analyses表数据
+      # 如果不要这句则需要迁移数据
+      @sonar_address = Redmine::Configuration['sonar_address']
+      projects_date = open(@sonar_address + "/api/projects/index").read
+      arr = JSON.parse(projects_date).map {|m| m["nm"]}   # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+      quality_an = QualityAnalysis.where(:sonar_name => sonar_name).first
+      if @client.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank?
+        logger.info("88888888888888888888")
+        aa = @client.job.delete("#{job_name}")
+        quality_an.delete unless quality_an.blank?
+      end
       # Checks if the given job exists in Jenkins.
       unless @client.job.exists?(job_name)
         @g = Gitlab.client
         branch = params[:branch]
         language = swith_language_type(params[:language])
         path = params[:path].blank? ? "./" : params[:path]
-        qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
-        version = qa.nil? ? 1 : qa.sonar_version + 1
+        # qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
+        version = quality_an.nil? ? 1 : quality_an.sonar_version + 1
         properties = "sonar.projectKey=#{sonar_name}
         sonar.projectName=#{sonar_name}
         sonar.projectVersion=#{version}
@@ -60,37 +71,64 @@ class QualityAnalysisController < ApplicationController
 
         # 判断调用sonar分析是否成功
         # 等待启动时间处理, 最长时间为30分钟
-        for i in 0..60 do
-          sleep(60)
+        for i in 0..360 do
+          sleep(5)
           @current_build_status = @client.job.get_current_build_status("#{job_name}")
-          if (@current_build_status != "not_run" || @current_build_status != "running")
+          if (@current_build_status == "success" || @current_build_status == "failure")
             break
-            if i == 60
+            if i == 360
               @build_console_result = false
               break
             end
           end
         end
 
-        @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')
+        # sonar 缓冲，取数据
+        sleep(5)
+
+        # 获取sonar output结果
+        console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
         logger.info("@current_build_status is ==> #{@current_build_status}")
-        logger.info("@console_build is ==> #{@console_build}")
 
-        d = @client.job.delete("#{job_name}") if jenkins_job == '200' && code != '201'
-        logger.error("delete result ==> #{code}")
-        if qa.blank? && @current_build_status == "success"
-          QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
-                                 :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
+        # 两种情况需要删除job：
+        # 1/创建成功但是build失败则删除job
+        # 2/creat和build成功，调用sonar启动失败则删除job
+        # 错误信息存储需存到Trustie数据库，否则一旦job删除则无法获取这些信息
+        if jenkins_job == '200' && code != '201'
+          @client.job.delete("#{job_name}")
         else
-          qa.update_attribute(:sonar_version, version)
+          if @current_build_status == "failure"
+            reg_console = /Exception:.*?\r/.match(console_build)
+            output = reg_console[0].gsub("\r", "") unless reg_console.nil?
+            se = SonarError.where(:jenkins_job_name => job_name).first
+            se.nil? ? SonarError.create(:project_id => @project.id, :jenkins_job_name => job_name, :output => output) : se.update_column(:output, output)
+            @client.job.delete("#{job_name}")
+          elsif @current_build_status == "success"
+            if quality_an.blank?
+              QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
+                                     :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
+            else
+              qa.update_attribute(:sonar_version, version)
+            end
+          end
         end
       end
     rescue => e
-      puts e
+      @message = e.message
     end
     respond_to do |format|
-      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch, :current_build_status => @current_build_status, :job_name => job_name)}
-      # format.js{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
+      if @current_build_status == "success"
+        format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch, :current_build_status => @current_build_status, :job_name => job_name)}
+      elsif @current_build_status == "failure"
+        format.html{redirect_to error_list_project_quality_analysi_path(:project_id => @project.id, :job_name => job_name)}
+      end
+    end
+  end
+
+  def error_list
+    @error_list = SonarError.where(:jenkins_job_name => params[:job_name]).first
+    respond_to do |format|
+      format.html
     end
   end
 
@@ -145,7 +183,7 @@ class QualityAnalysisController < ApplicationController
       get_current_build_status = @client.job.get_current_build_status("Hjqreturn-1280")
       logger.error("Failed to update job: ==> #{jenkins_job}") unless jenkins_job == '200'
 
-      # 数据更新到Trustie数据库
+      # 数据更新到Trustie数据
       if jenkins_job == '200'
         logger.info("quality_ananlysis will be updated: ==> #{jenkins_job}")
         @quality_analysis.path = path
@@ -168,27 +206,31 @@ class QualityAnalysisController < ApplicationController
       @branch = params[:branch]
       @resource_id = params[:resource_id]
       @sonar_address = Redmine::Configuration['sonar_address']
-      @jenkins_address = Redmine::Configuration['jenkins_address']
       if params[:resource_id].nil?
         @name_flag = true
         projects_date = open(@sonar_address + "/api/projects/index").read
         arr = JSON.parse(projects_date).map {|m| m["nm"]} # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
         @quality_analyses = QualityAnalysis.where(:project_id => @project.id).select{|qa| arr.include?(qa.sonar_name)}
-
       else
-        if params[:current_build_status] == "failure"
-          job_name = params[:job_name]
-          @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
-        end
-        complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+        filter = "sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,files,functions,classes,directories,blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations"
+        complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=#{filter}").read
         @complexity =JSON.parse(complexity_date).first
-        issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
-        @sonar_issues = JSON.parse(issue_date).first
+
+        # 按名称转换成hash键值对
+        @ha = {}
+        @complexity["msr"].each do |com|
+          key = com["key"]
+          if key == "sqale_index"
+            value = com["frmt_val"]
+          else
+            value = com["val"].to_i
+          end
+          @ha.store(key,value)
+        end
       end
     rescue => e
       puts e
     end
-
   end
 
   # Find project of id params[:project_id]
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index d0904ddf5..4764d1cd7 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -38,7 +38,9 @@ class RepositoriesController < ApplicationController
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive, :quality_analysis]
   # 链接gitlab
-  before_filter :connect_gitlab, :only => [:quality_analysis]
+  before_filter :connect_gitlab, :only => [:quality_analysis, :show]
+  # 版本库新增权限
+  before_filter :show_rep, :only => [:show]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -361,44 +363,42 @@ update
 
   def show
     ## TODO: the below will move to filter, done.
-    if !User.current.member_of?(@project) && @project.hidden_repo
-      render_403
-      return
-    end
+
+    # 获取版本库目录结构
     @entries = @repository.entries(@path, @rev)
-    @changeset = @repository.find_changeset_by_name(@rev)
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      g = Gitlab.client
-      @changesets = g.commits(@project.gpid, :ref_name => @rev)
-      g_project = g.project(@project.gpid)
+      @changesets = @g.commits(@project.gpid, :ref_name => @rev)
+      # 最近一次提交
+      @changesets_latest_coimmit = @changesets[0]
+      g_project = @g.project(@project.gpid)
       # 总的提交数
-      @changesets_all_count = @project.gpid.nil? ? 0 : commit_count(@project, @rev)
+      @changesets_all_count = @g.user_static(@project.gpid, :rev => @rev).count
+
+      # 获取默认分支
       @g_default_branch = g_project.default_branch.nil? ?  "master" : g_project.default_branch
-      # 访问该页面的是会后则刷新
-      if @project.project_score.nil?
+
+      # 访问版本庫后更新project_score表数据；changeset_num为提交总数
+      project_score = @project.project_score
+      if project_score.nil?
         ProjectScore.create(:project_id => @project.id, :score => false)
+      else
+        project_score.update_column(:changeset_num, @changesets_all_count)
       end
-      # 刷新改页面的时候，更新统计数
-      if @changesets_all_count != @project.project_score.changeset_num && @changesets_all_count != 0
-        update_commits_count(@project, @changesets_all_count)
-      end
-      # 最近一次提交
-      @changesets_latest_coimmit = @changesets[0]
-      unless @changesets[0].blank?
-        update_commits_date(@project, @changesets_latest_coimmit)
-      end
-      @creator = User.where("id =?", @project.user_id).first.try(:login)
-      # @properties = @repository.properties(@path, @rev)
-      # @repositories = @project.repositories
-      # project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-      # ip = RepositoriesHelper::REPO_IP_ADDRESS
+
+      # unless @changesets_latest_coimmit.blank?
+      #   update_commits_date(@project, @changesets_latest_coimmit)
+      # end
+      @creator = @project.owner.to_s
       gitlab_address = Redmine::Configuration['gitlab_address']
+
       # REDO:需优化，仅测试用
       @zip_path = Gitlab.endpoint.to_s + "/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=" + Gitlab.private_token
+
+      # 获取版本库路径，主要分为两种，一种随Gitlab类型，另一种为Git类型，Git类型为无用数据，最终需要删掉这种类型。
       if @repository.type.to_s == "Repository::Gitlab"
-        @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
+        @repos_url = gitlab_address.to_s+"/" + @creator + "/" + @repository.identifier+"."+"git"
       else
         @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s
       end
@@ -653,9 +653,20 @@ update
 
   # 链接gitlab
   def connect_gitlab
-    @g = Gitlab.client
-    unless @project.gpid.nil?
-      @g_project = @g.project(@project.gpid)
+    begin
+      @g = Gitlab.client
+      unless @project.gpid.nil?
+        @g_project = @g.project(@project.gpid)
+      end
+    rescue => e
+      logger.error("failed to connect gitlab ==> #{e}")
+    end
+  end
+
+  def show_rep
+    if !User.current.member_of?(@project) && @project.hidden_repo
+      render_403
+      return
     end
   end
 
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 661770206..bc1b97a2f 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -110,9 +110,9 @@ class StudentWorkController < ApplicationController
           #status 0:答案正确 -5program_test_ex 函数出错 -4judge代码出错 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
           resultObj[:status] = -3
           CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>-3,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
-        rescue
+        rescue => e
           #-4 judge代码 出错
-          logger.debug "program_test_error 1"
+          logger.debug "program_test_error #{e}"
           resultObj[:status] = -4
           tmpstatus = -4
           CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>0,:wait_time=>0,:student_work_id=>student_work.id)
@@ -197,7 +197,7 @@ class StudentWorkController < ApplicationController
                   resultObj[:status] = 0
                 end
                 student_work.save!
-                resultObj[:time] = student_work_test.created_at.to_s(:db)
+                resultObj[:time] = student_work_test.created_at.strftime(format='%Y-%m-%d %H:%M:%S')
                 resultObj[:index] = student_work.student_work_tests.count
               end
 
@@ -390,7 +390,7 @@ class StudentWorkController < ApplicationController
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
       #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      if (@homework.is_open == 1 && @course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+      if (@homework.is_open == 1 && @course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.has_committed.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
         elsif @order == 'student_id'
@@ -409,7 +409,7 @@ class StudentWorkController < ApplicationController
               @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -420,7 +420,7 @@ class StudentWorkController < ApplicationController
               my_work = @homework.student_works.where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.where(:user_id => User.current.id)
+            my_work = @homework.student_works.has_committed.where(:user_id => User.current.id)
           end
           @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
         elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
@@ -432,17 +432,17 @@ class StudentWorkController < ApplicationController
               my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
             if @order == 'lastname'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
             elsif @order == 'student_id'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
             end
             @show_all = true
           end
@@ -454,9 +454,9 @@ class StudentWorkController < ApplicationController
         return
       end
 
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
-      if (@homework.is_open == 1 &&@course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+      if (@homework.is_open == 1 &&@course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.has_committed.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
         elsif @order == 'student_id'
@@ -475,7 +475,7 @@ class StudentWorkController < ApplicationController
               @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -486,7 +486,7 @@ class StudentWorkController < ApplicationController
               my_work = @homework.student_works.where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.where(:user_id => User.current.id)
+            my_work = @homework.student_works.has_committed.where(:user_id => User.current.id)
           end
           @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
         elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
@@ -498,17 +498,17 @@ class StudentWorkController < ApplicationController
               my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
             if @order == 'lastname'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
             elsif @order == 'student_id'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
             end
             @show_all = true
           end
@@ -519,7 +519,7 @@ class StudentWorkController < ApplicationController
         render_403
         return
       end
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count
 
     end
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -547,10 +547,10 @@ class StudentWorkController < ApplicationController
       return
     end
     @user = User.current
-    @student_work = @homework.student_works.where("user_id = ?",User.current.id).first
-    if @student_work.nil?
+    #@student_work = @homework.student_works.where("user_id = ?",User.current.id).first
+    #if @student_work.nil?
       @student_work = StudentWork.new
-    end
+    #end
     respond_to do |format|
       format.html{ render :layout => "new_base_user"}
     end
@@ -560,7 +560,7 @@ class StudentWorkController < ApplicationController
     # 提交作品前先判断是否已经提交
     @has_commit = false;
     if hsd_committed_work?(User.current.id, @homework.id)
-      @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
+      @work = StudentWork.where("user_id =? and homework_common_id =? and work_status != 0", User.current.id, @homework.id).first
       @has_commit = true;
       #flash[:notice] = l(:notice_successful_create)
       #redirect_to edit_student_work_url(params[:student_work])
@@ -572,6 +572,7 @@ class StudentWorkController < ApplicationController
     if params[:student_work]
       @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
+      student_work = StudentWork.where("user_id =? and homework_common_id =? and work_status = 0", User.current.id, @homework.id).first
       student_work ||= StudentWork.new
       student_work.name = params[:student_work][:name] == "#{@homework.name}的作品提交(可修改)" ? "#{@homework.name}的作品提交" : params[:student_work][:name]
       student_work.description = params[:student_work][:description]
@@ -586,8 +587,10 @@ class StudentWorkController < ApplicationController
       #提交作品时，计算是否迟交
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
         student_work.late_penalty = @homework.late_penalty
+        student_work.work_status = 2
       else
         student_work.late_penalty = 0
+        student_work.work_status = 1
       end
       if student_work.save
         if @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1
@@ -800,6 +803,9 @@ class StudentWorkController < ApplicationController
     @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
     @new_score.user_id = User.current.id
     @new_score.student_work_id = @work.id
+    if @is_teacher && @work.work_status == 0
+      @work.update_column('work_status', 1)
+    end
     if User.current.admin?
       @new_score.reviewer_role = 1
     else
@@ -1148,7 +1154,7 @@ class StudentWorkController < ApplicationController
   end
 
   def hsd_committed_work?(user, homework)
-    sw = StudentWork.where("user_id =? and homework_common_id =?", user, homework).first
+    sw = StudentWork.where("user_id =? and homework_common_id =? and work_status != 0", user, homework).first
     sw.nil? ? result = false : result = true
     result
   end
@@ -1225,7 +1231,7 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
         sheet1[count_row,5] = homework.name
-        sheet1[count_row,6] = strip_html homework.description
+        sheet1[count_row,6] = strip_html homework.description if !homework.description.nil?
         sheet1[count_row,7] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
         sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
         if @homework.anonymous_comment ==0
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 8ff88823d..8d7195f38 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -6,7 +6,7 @@ class SyllabusesController < ApplicationController
   include CoursesHelper
 
   before_filter :is_logged, :only => [:index, :show, :edit, :new, :update, :destroy, :delete_syllabus]
-  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :update_base_info, :delete_syllabus, :delete_des]
+  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :edit_syllabus_title, :update_base_info, :delete_syllabus, :delete_des]
   def index
     user = User.current
     @syllabuses = user.syllabuses
@@ -140,6 +140,16 @@ class SyllabusesController < ApplicationController
     end
   end
 
+  #修改课程名称
+  def edit_syllabus_title
+    if @syllabus && params[:title] != ""
+      @syllabus.update_column("title",params[:title])
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #修改英文名称
   def edit_syllabus_eng_name
     if @syllabus
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 69a38610e..83a794cd9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -90,6 +90,8 @@ class UsersController < ApplicationController
     case params[:type]
       when 'JournalsForMessage'
         @comment = JournalsForMessage.find params[:comment].to_i
+      when 'Message'
+        @comment = Message.find params[:comment].to_i
     end
   end
 
@@ -111,6 +113,13 @@ class UsersController < ApplicationController
         @user_activity_id = params[:user_activity_id]
         @activity_id = params[:activity_id]
         @type = 'JournalsForMessage'
+      when 'Message'
+        @reply = Message.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @is_course = params[:is_course]
+        @is_board = params[:is_board]
+        @type = 'Message'
     end
     respond_to do |format|
       format.js
@@ -941,8 +950,10 @@ class UsersController < ApplicationController
       #提交作品时，计算是否迟交
       if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
         student_work.late_penalty = homework.late_penalty
+        student_work.work_status = 2
       else
         student_work.late_penalty = 0
+        student_work.work_status = 1
       end
 
       student_work.save
@@ -1033,6 +1044,26 @@ class UsersController < ApplicationController
           homework_detail_manual.save if homework_detail_manual
           homework_detail_programing.save if homework_detail_programing
           homework_detail_group.save if homework_detail_group
+
+          if homework.homework_type != 3
+            students = homework.course.student
+            if !homework.course.nil? && !students.empty?
+              name = homework.name
+              name_str = name + "的作品提交"
+              str = ""
+              students.each do |student|
+                if str != ""
+                  str += ","
+                end
+                str += "('#{name_str}',#{homework.id},#{student.student_id}, '#{format_time(Time.now)}', '#{format_time(Time.now)}')"
+              end
+              #('#{name}的作品提交',#{homework.id},#{student.student_id}, '#{format_time(Time.now)}', '#{format_time(Time.now)}')
+              sql = "insert into student_works (name, homework_common_id,user_id, created_at, updated_at) values" + str
+              #StudentWork.create(:name => "#{name}的作品提交", :homework_common_id => homework.id, :user_id => student.student_id)
+              ActiveRecord::Base.connection.execute sql
+            end
+          end
+
           if params[:quotes] && !params[:quotes].blank?
             quotes_homework = HomeworkCommon.find params[:quotes].to_i
             quotes_homework.update_column(:quotes, quotes_homework.quotes+1)
@@ -1991,44 +2022,8 @@ class UsersController < ApplicationController
   def add_exist_file_to_course
     @flag = true
     if params[:send_id].present?
-      send_id  = params[:send_id]
-      @ori = Attachment.find_by_id(send_id)
-      course_ids = params[:course_ids]
-      if course_ids.nil?
-        @flag = false
-      end
-      unless course_ids.nil?
-        course_ids.each do |id|
-          next if @ori.blank?
-          @exist = false
-          Course.find(id).attachments.each do |att|  #如果课程中包含该资源
-            if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
-              att.created_on = Time.now
-              att.save
-              @exist = true
-              break
-            end
-          end
-          next if @exist
-          attach_copied_obj = @ori.copy
-          attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
-          attach_copied_obj.container = Course.find(id)
-          attach_copied_obj.created_on = Time.now
-          attach_copied_obj.author_id = User.current.id
-          attach_copied_obj.is_public = 0
-          attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
-          if attach_copied_obj.attachtype == nil
-            attach_copied_obj.attachtype = 4
-          end
-          if attach_copied_obj.save
-            # 更新引用次数
-            quotes = @ori.quotes.to_i + 1
-            @ori.update_attribute(:quotes, quotes) unless @ori.nil?
-            @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
-          end
-          @save_message = attach_copied_obj.errors.full_messages
-        end
-      end
+      rs = ResourcesService.new
+      @ori, @flag, @save_message = rs.send_resource_to_course(User.current, params)
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(",")
       course_ids = params[:course_ids]
@@ -2773,8 +2768,8 @@ class UsersController < ApplicationController
 
   # 获取我的课程资源
   def get_course_resources author_id, user_course_ids, order, score
-    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
-                                      "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and container_type = 'Course')"+
+                                      "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
@@ -3281,7 +3276,12 @@ class UsersController < ApplicationController
           @journals = obj.children.reorder("created_at desc")
         when 'Message'
           obj = Message.where('id = ?', params[:id].to_i).first
-          @journals = obj.children.reorder("created_on desc")
+          @type = 'Message'
+          @is_course = params[:is_course]
+          @is_board = params[:is_board]
+          @user_activity_id = params[:div_id].to_i if params[:div_id]
+          comments = []
+          @journals = get_all_children(comments, obj)
         when 'News'
           obj = News.where('id = ?', params[:id].to_i).first
           @journals = obj.comments.reorder("created_on desc")
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 4a79d6d93..f49398ff7 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -8,7 +8,11 @@ class WechatsController < ActionController::Base
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
-    sendBindClass(request, {invite_code: content})
+    if join_request(request)
+      sendBindClass(request, {invite_code: content})
+    else
+      request.reply.text '您的意见已收到，感谢您的反馈！'
+    end
   end
 
   # When receive 'help', will trigger this responder
@@ -142,6 +146,11 @@ class WechatsController < ActionController::Base
     end
   end
 
+  def join_request(request)
+    openid = request[:FromUserName]
+    wl = WechatLog.where("openid = '#{openid}' and request_raw like '%\"Event\":\"click\"%'").order('id desc').first
+    wl && JSON(wl.request_raw)["EventKey"] == 'JOIN_CLASS'
+  end
 
   def sendBindClass(request, params)
     begin
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 98eb100ed..23fd401fd 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2631,7 +2631,7 @@ module ApplicationHelper
   def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
     if homework.homework_detail_manual.comment_status == 0 ||Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
-    elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
+    elsif homework.student_works.has_committed.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
         link = link_to '启动匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?is_in_course=" + is_in_course.to_s + "&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s, id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
@@ -2681,40 +2681,41 @@ module ApplicationHelper
 
   #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
   def user_for_homework_common homework,is_teacher
+    count = homework.student_works.has_committed.count
     if User.current.member_of_course?(homework.course)
       if is_teacher #老师显示作品数量
-        link_to "作品(#{homework.student_works.count})", student_work_index_url_in_org(homework.id), :class => "c_blue"
+        link_to "作品(#{count})", student_work_index_url_in_org(homework.id), :class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
         project = cur_user_projects_for_homework homework
         if work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
           if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
-            link_to "提交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再提交作品'
+            link_to "提交作品(#{count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再提交作品'
           else
-            link_to "提交作品(#{homework.student_works.count})",  new_student_work_url_without_domain(homework.id),:class => 'c_blue'
+            link_to "提交作品(#{count})",  new_student_work_url_without_domain(homework.id),:class => 'c_blue'
           end
         elsif work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
           if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
-            link_to "补交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再补交作品'
+            link_to "补交作品(#{count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再补交作品'
           else
-            link_to "补交作品(#{homework.student_works.count})",  new_student_work_url_without_domain(homework.id),:class => 'c_red'
+            link_to "补交作品(#{count})",  new_student_work_url_without_domain(homework.id),:class => 'c_red'
           end
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
-            link_to "查看作品(#{homework.student_works.count})",student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "匿评已结束"
+            link_to "查看作品(#{count})",student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
-            link_to "修改作品(#{homework.student_works.count})", new_student_work_url_without_domain(homework.id),:class => 'c_blue'
+            link_to "修改作品(#{count})", new_student_work_url_without_domain(homework.id),:class => 'c_blue'
           elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id
-            link_to "修改作品(#{homework.student_works.count})", edit_student_work_url_without_domain(work.id),:class => 'c_blue'
+            link_to "修改作品(#{count})", edit_student_work_url_without_domain(work.id),:class => 'c_blue'
           else
-            link_to "查看作品(#{homework.student_works.count})", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
+            link_to "查看作品(#{count})", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
           end
         end
       end
     else
-      link_to "作品(#{homework.student_works.count})",student_work_index_url_in_org(homework.id),:class => "c_blue"
+      link_to "作品(#{count})",student_work_index_url_in_org(homework.id),:class => "c_blue"
     end
 
   end
@@ -2752,7 +2753,7 @@ module ApplicationHelper
 
   #获取当前用户在指定作业下提交的作业的集合
   def cur_user_works_for_homework homework
-    work = homework.student_works.where("user_id = ?",User.current).first
+    work = homework.student_works.where("user_id = ? && work_status != 0",User.current).first
     if homework.homework_type == 3
       pro = homework.student_work_projects.where("user_id = #{User.current.id}").first
       if pro.nil? || pro.student_work_id == "" || pro.student_work_id.nil?
@@ -3138,9 +3139,9 @@ def get_reply_parents_no_root parents_rely, comment
   parents_rely
 end
 
-#获取留言的所有子节点
+#获取所有子节点
 def get_all_children result, jour
-  if jour.kind_of? JournalsForMessage
+  if (jour.kind_of? JournalsForMessage) || (jour.kind_of? Message)
     jour.children.each do |jour_child|
       result << jour_child
       get_all_children result, jour_child
@@ -3281,7 +3282,7 @@ end
 
 def strip_html(text,len=0,endss="...")
   ss = ""
-  if text.length>0
+  if !text.nil? && text.length>0
     ss=text.gsub(/<\/?.*?>/, '').strip
     ss = ss.gsub(/&nbsp;/, ' ')
 
@@ -3322,3 +3323,21 @@ def get_group_member_names work
   end
   result
 end
+
+def course_syllabus_option user = User.current
+  syllabuses = user.syllabuses
+  type = []
+  option1 = []
+  option1 << "请选择课程"
+  option1 << 0
+  type << option1
+  unless syllabuses.empty?
+    syllabuses.each do |syllabus|
+      option = []
+      option << syllabus.title
+      option << syllabus.id
+      type << option
+    end
+  end
+  type
+end
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 55a4da73a..d1f4bfe97 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -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 => "pr_join_a", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))
+        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))
       else
-        link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "pr_join_a")
+        link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "Blue-btn", :style => "margin_left: 0px;")
       end
     else
-      link = "<span class='pr_join_span  mr5' >#{l(:label_course_join_student)}</span>"
+      link = "<span class='pr_join_span mr5' >#{l(:label_course_join_student)}</span>"
     end
     link.html_safe
   end
diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 2a7d350e7..5940dd255 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -3,16 +3,16 @@ module QualityAnalysisHelper
 
   def sqale_rating_status val
     arr = []
-    if val < 5
+    if val <= 5
       arr << "很好"
       arr << "b_green2"
-    elsif  val. > 5  && val < 10
+    elsif  val. > 5  && val <= 10
       arr << "较好"
       arr << "b_slow_yellow"
-    elsif  val > 10  && val < 20
+    elsif  val > 10  && val <= 20
       arr << "中等"
       arr << "b_yellow"
-    elsif  val > 20  && val < 50
+    elsif  val > 20  && val <= 50
       arr << "较差"
       arr << "b_slow_red"
     elsif val > 20
@@ -23,10 +23,10 @@ module QualityAnalysisHelper
 
   def complexity_status val
     arr = []
-    if val < 10
+    if val <= 10
       arr << "良好"
       arr << "b_green2"
-    elsif  val > 10  && val < 15
+    elsif  val > 10  && val <= 15
       arr << "较高"
       arr << "b_yellow"
     elsif val > 15
@@ -37,10 +37,10 @@ module QualityAnalysisHelper
 
   def duplicated_lines_density_status val
     arr = []
-    if val < 30
+    if val <= 30
       arr << "良好"
       arr << "b_green2"
-    elsif  val > 30  && val < 50
+    elsif  val > 30  && val <= 50
       arr << "较高"
       arr << "b_yellow"
     elsif val > 50
@@ -51,10 +51,10 @@ module QualityAnalysisHelper
 
   def comment_lines_density_status val
     arr = []
-    if val < 20
+    if val <= 20
       arr << "较低"
       arr << "b_yellow"
-    elsif  val > 20  && val < 50
+    elsif  val > 20  && val <= 50
       arr << "正常"
       arr << "b_green2"
     elsif val > 50
@@ -64,15 +64,15 @@ module QualityAnalysisHelper
   end
 
   def score_sqale_rating val
-    if val > 0 && val < 5
+    if val >= 0 && val <= 5
       "5"
-    elsif  val > 5  && val < 10
+    elsif  val > 5  && val <= 10
       "4"
-    elsif  val > 10  && val < 20
+    elsif  val > 10  && val <= 20
       "3"
-    elsif  val > 20  && val < 50
+    elsif  val > 20  && val <= 50
       "2"
-    elsif val > 20
+    elsif val > 50
       "1"
     end
   end
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index 74788751b..42a3a6538 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -52,6 +52,19 @@ module StudentWorkHelper
     result
   end
 
+  def get_status status
+    str = ""
+    case status
+      when 0
+        str = "未提交"
+      when 1
+        str = "已提交"
+      when 2
+        str = "迟交"
+    end
+    str
+  end
+
   #获取赞的总数
   def praise_homework_count obj_id
     PraiseTread.where("praise_tread_object_id = #{obj_id} AND praise_tread_object_type = 'StudentWork'").count
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index f312d2275..98b993183 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -388,6 +388,21 @@ module UsersHelper
     return result
   end
 
+
+  #获取指定用户的课程大纲
+  def user_syllabus(user)
+    results = []
+    courses = user_courses_list(user)
+
+    other = Syllabus.new(title: '未命名课程')
+
+    courses.each do |c|
+      other << c unless c.syllabus
+    end
+
+    user.syllabuses.to_a << other
+  end
+
   #获取用户参与的公开的课程列表
   def user_public_course_list user
     membership = user.coursememberships.all#@user.coursememberships.all(:conditions => Course.visible_condition(User.current))
diff --git a/app/models/course.rb b/app/models/course.rb
index e4b08697b..561a031ae 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -4,6 +4,8 @@ require 'elasticsearch/model'
 class Course < ActiveRecord::Base
   include Redmine::SafeAttributes
 
+  include CoursesHelper
+
   STATUS_ACTIVE     = 1
   STATUS_CLOSED     = 5
   STATUS_ARCHIVED   = 9
@@ -22,7 +24,7 @@ class Course < ActiveRecord::Base
     end
   end
   
-  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete
+  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete, :syllabus_id
   #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
   belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
@@ -69,8 +71,10 @@ class Course < ActiveRecord::Base
   
   validates_presence_of :term,:name
   validates_format_of  :class_period, :with =>/^[1-9]\d*$/
-  validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/
+  validates_format_of :time, :with => /^\d{4}$/
+  validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]*$/
   validates_length_of :description, :maximum => 10000
+
   before_save :self_validate
   # 公开课程变成私有课程，所有资源都变成私有
   after_update :update_files_public,:update_course_ealasticsearch_index
@@ -169,6 +173,10 @@ class Course < ActiveRecord::Base
     )
   end
 
+  def delete!
+    update_attribute(:is_delete, true)
+  end
+
   def visible?(user=User.current)
     user.allowed_to?(:view_course, self)
   end
@@ -296,6 +304,13 @@ class Course < ActiveRecord::Base
     end
   end
 
+
+  def update_default_value
+    self.time = Time.now.year unless time
+    self.term = cur_course_term unless term
+    self.class_period = 10 unless class_period
+  end
+
   # 创建课程讨论区
   def create_board_sync
     @board = self.boards.build
@@ -480,7 +495,7 @@ class Course < ActiveRecord::Base
   def generate_qrcode
     ticket = self.qrcode
     if !ticket || ticket.size < 10
-      response = Wechat.api.qrcode_create_scene(invite_code)
+      response = Wechat.api.qrcode_create_scene(invite_code, 2592000)
       logger.debug "response = #{response}"
       self.qrcode = response['ticket']
       save! && reload
diff --git a/app/models/sonar_error.rb b/app/models/sonar_error.rb
new file mode 100644
index 000000000..05fcfc5b9
--- /dev/null
+++ b/app/models/sonar_error.rb
@@ -0,0 +1,3 @@
+class SonarError < ActiveRecord::Base
+  attr_accessible :jenkins_job_name, :output, :project_id
+end
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index ddd91df38..3fcc9fb8a 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -13,6 +13,8 @@ class StudentWork < ActiveRecord::Base
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
   has_many :attachments, :dependent => :destroy
 
+  scope :has_committed, lambda{where("work_status != 0")}
+
   before_destroy :delete_praise
   before_save :set_program_score, :set_src
 
@@ -172,7 +174,7 @@ class StudentWork < ActiveRecord::Base
 
   # status == 0 : delay
   def act_as_message
-    if self.created_at > self.homework_common.end_time + 1
+    if self.work_status != 0 && self.created_at > self.homework_common.end_time + 1
       self.course_messages << CourseMessage.new(:user_id => self.user_id, :course_id => self.homework_common.course_id, :viewed => false, :status => false)
     end
   end
diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb
index 5e368f341..29b675d25 100644
--- a/app/models/syllabus.rb
+++ b/app/models/syllabus.rb
@@ -9,8 +9,19 @@ class Syllabus < ActiveRecord::Base
   belongs_to :user
   has_many :courses
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
-  attr_accessible :description, :title, :eng_name, :syllabus_type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course
-  safe_attributes 'title', 'description', 'eng_name', 'syllabus_type', 'credit', 'hours', 'theory_hours', 'practice_hours', 'credit', 'applicable_major', 'pre_course'
+  attr_accessible :description, :user_id, :title, :eng_name, :syllabus_type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course
+  safe_attributes 'title','user', 'description', 'eng_name', 'syllabus_type', 'credit', 'hours', 'theory_hours', 'practice_hours', 'credit', 'applicable_major', 'pre_course'
+
+  validates :title, :user_id, presence: true
+
+  scope :like, lambda {|arg|
+    if arg.blank?
+      where(nil)
+    else
+      pattern = "%#{arg.to_s.strip.downcase}%"
+      where(" LOWER(title) LIKE :p ", :p => pattern)
+    end
+  }
 
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::SYLLABUS
diff --git a/app/models/wechat_log.rb b/app/models/wechat_log.rb
new file mode 100644
index 000000000..118a9fade
--- /dev/null
+++ b/app/models/wechat_log.rb
@@ -0,0 +1,4 @@
+#coding=utf-8
+#
+class WechatLog < ActiveRecord::Base
+end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index f59beb7e5..a55a81e89 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -44,6 +44,8 @@ class CoursesService
     }
   end
 
+
+
   #搜索课程
   def search_course params,current_user
     courses_all = Course.all_course
@@ -324,9 +326,9 @@ class CoursesService
     define_error [
         0, '加入成功',
         1, '密码错误',
-        2, '班级已过期 请联系班级管理员重启班级。',
-        3, '您已经加入了班级',
-        4, '您加入的班级不存在',
+        2, '课程已过期 请联系课程管理员重启课程。',
+        3, '您已经加入了课程',
+        4, '您的邀请码不正确',
         5, '您还未登录',
         6, '申请成功，请等待审核完毕',
         7, '您已经发送过申请了，请耐心等待',
diff --git a/app/services/resources_service.rb b/app/services/resources_service.rb
new file mode 100644
index 000000000..a0fec585a
--- /dev/null
+++ b/app/services/resources_service.rb
@@ -0,0 +1,53 @@
+#coding=utf-8
+
+class ResourcesService
+
+  #发送资源到课程
+  def send_resource_to_course user,params
+    send_id  = params[:send_id]
+    @ori = Attachment.find_by_id(send_id)
+    course_ids = params[:course_ids]
+    @flag = false
+    unless course_ids.nil?
+      course_ids.each do |id|
+        next if @ori.blank?
+        @exist = false
+        Course.find(id).attachments.each do |att|  #如果课程中包含该资源
+          if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
+            att.created_on = Time.now
+            att.save
+            @exist = true
+            @flag = true
+            break
+          end
+        end
+        next if @exist
+        attach_copied_obj = @ori.copy
+        attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
+        attach_copied_obj.container = Course.find(id)
+        attach_copied_obj.created_on = Time.now
+        attach_copied_obj.author_id = user.id
+        attach_copied_obj.is_public = 0
+        attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
+        if attach_copied_obj.attachtype == nil
+          attach_copied_obj.attachtype = 4
+        end
+        if attach_copied_obj.save
+          # 更新引用次数
+          quotes = @ori.quotes.to_i + 1
+          @ori.update_attribute(:quotes, quotes) unless @ori.nil?
+          @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+          @flag = true
+        else
+          @flag = false
+          @save_message = attach_copied_obj.errors.full_messages
+          break
+        end
+
+      end
+    end
+
+    [@ori, @flag, @save_message]
+  end
+
+end
\ No newline at end of file
diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb
new file mode 100644
index 000000000..b3190182c
--- /dev/null
+++ b/app/services/syllabuses_service.rb
@@ -0,0 +1,143 @@
+#coding=utf-8
+
+class SyllabusesService
+
+  include ApplicationHelper
+  include CoursesHelper
+
+  def judge_can_setting(sy,user)
+    sy[:can_setting] = sy[:user_id] == user.id ? true : false
+
+    sy[:can_setting] = false if sy[:id].nil?
+
+    sy.courses.each do |c|
+      c[:can_setting] = false
+
+      member = c.members.where("user_id=#{user.id} and course_id=#{c.id}")[0]
+      roleName = member.roles[0].name if member
+
+      if roleName && (roleName == "TeachingAsistant" || roleName == "Teacher" )
+        c[:can_setting] = true
+      end
+
+      if c.tea_id == user.id
+        c[:can_setting] = true
+      end
+    end
+
+    sy
+  end
+  #获取指定用户的课程大纲
+  def user_syllabus(user)
+    courses = CoursesService.new.user_courses_list(user)
+
+    other = Syllabus.new(title: '未命名课程',user_id: user.id)
+
+    courses.each do |c|
+      other.courses << c[:course] unless c[:course].syllabus
+    end
+    
+    # user.syllabuses.each do |syllabus|
+    #   syllabus.courses = syllabus.courses.not_deleted
+    # end
+    #
+    # user.syllabuses.to_a << other
+
+    courses = user.courses.not_deleted
+    syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
+    syllabuses = Syllabus.where("id in #{syllabus_ids} or user_id = #{user.id}").order("updated_at desc")
+
+    syllabuses.each do |syllabus|
+      syllabus.courses = courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("time desc")
+    end
+
+    syllabuses.to_a << other
+
+    #管理权限 can_setting
+    syllabuses.each do |s|
+      s = judge_can_setting(s,user)
+    end
+
+    syllabuses
+  end
+
+  def after_create_course(course, user)
+      #unless User.current.admin?
+      r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+      m = Member.new(:user => user, :roles => [r])
+      m.project_id = -1
+      course_info = CourseInfos.new(:user_id => user.id, :course_id => course.id)
+      #user_grades = UserGrade.create(:user_id => User.current.id, :course_id => @course.id)
+      course.members << m
+      course.course_infos << course_info
+  end
+
+  #创建大纲
+  # params {title: '大纲名称', [{course}, {course}]}
+  def create(user, title, courses = [])
+    sy = Syllabus.new(title: title, user_id: user.id)
+    ActiveRecord::Base.transaction() do
+      sy.save!
+
+      courses.each do |course|
+        if ::Course === course
+          course.syllabus_id = sy.id
+          course.save!
+        elsif Hash === course
+          c = ::Course.new(course)
+          c.tea_id = user.id
+          c.syllabus_id = sy.id
+          c.update_default_value
+          c.is_public = 0
+          c.save!
+          after_create_course(c, user)
+        end
+      end
+
+    end
+    sy[:can_setting] = true
+    sy
+  end
+
+  #修改课程大纲的名称、班级名称、新增班级
+  def edit(user, option)
+    courses = []
+    status = -1
+    syllabus_id = option[:id]
+
+    sy = Syllabus.where("id=?",option[:id]).first
+
+    if sy && sy.user_id == user.id
+      syllabus_title = option[:title]
+
+      sy.title = syllabus_title
+      sy.save!
+      #修改班级名称
+      modify_courses = option[:modify_courses]
+      modify_courses.each do |c|
+        course = Course.where("id=?",c.id).first
+
+        if course && course.tea_id == user.id
+          course.name = c.name
+          !course.save
+        end
+      end
+
+      #新增班级
+      add_courses = option[:add_courses]
+      add_courses.each do |c|
+        course = Course.new()
+        course.name = c
+        course.tea_id = user.id
+        course.syllabus_id = sy.id
+        course.update_default_value
+        course.is_public = 0
+        course.save!
+        after_create_course(course, user)
+      end
+      status = 0
+    end
+    status
+  end
+
+end
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 8df42fb41..ab1bb2ec4 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -319,4 +319,8 @@ class UsersService
     my_jours_arr
   end
 
+
+
+
+
 end
diff --git a/app/views/admin/_course_detail_tr.html.erb b/app/views/admin/_course_detail_tr.html.erb
index bea14fd3d..189cbc8f6 100644
--- a/app/views/admin/_course_detail_tr.html.erb
+++ b/app/views/admin/_course_detail_tr.html.erb
@@ -6,6 +6,9 @@
               <%= link_to(course.name, course_path(course.id)) %>
             </span>
   </td>
+  <td align="center">
+    <%= checked_image course.is_public? %>
+  </td>
   <td align="center">
     <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
   </td>
@@ -22,7 +25,7 @@
     <%= visable_attachemnts_incourse(course).count%>
   </td>
   <td class="center">
-    <%= course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", course.boards.first.id, nil).count %>
+    <%= Message.where("board_id =?", course.boards.first.id).count %>
   </td>
   <td class="center">
     <%= course.course_activities.count%>
diff --git a/app/views/admin/_courselist_detail_tr.html.erb b/app/views/admin/_courselist_detail_tr.html.erb
new file mode 100644
index 000000000..83b7904ce
--- /dev/null
+++ b/app/views/admin/_courselist_detail_tr.html.erb
@@ -0,0 +1,33 @@
+<td style="text-align: center;">
+  <%= course.id %>
+</td>
+<td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>'>
+            <span>
+              <%= link_to(course.name, course_path(course.id)) %>
+            </span>
+</td>
+<td align="center">
+  <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
+</td>
+<td align="center">
+  <%= course.class_period %>
+</td>
+<td class="center">
+  <%= checked_image course.is_public? %>
+</td>
+<td class="center">
+  <%= course.is_delete == 0 ? '正常' : '归档' %>
+</td>
+<td class="center">
+  <%= format_date(course.created_at) %>
+</td>
+<td class="center">
+  <%= course.updated_at.strftime('%Y-%m-%d %H:%M:%S') %>
+</td>
+<td class="center">
+  <%= select_tag :syllabus_id,options_for_select(course_syllabus_option(course.teacher),course.syllabus_id), {:id=>"new_syllabus_id_#{course.id}", :class=>"course_syllabus_input", :onchange=>"select_syllabus(#{course.id});"}%>
+</td>
+<td class="center">
+  <a href="javascript:void(0)" onclick="alert_new_syllabus(<%=course.id %>, 0)">新建课程</a>
+  <%#= link_to "新建课程", admin_create_syllabus_path%>
+</td>
\ No newline at end of file
diff --git a/app/views/admin/_rename_course_name.html.erb b/app/views/admin/_rename_course_name.html.erb
new file mode 100644
index 000000000..8cc061c76
--- /dev/null
+++ b/app/views/admin/_rename_course_name.html.erb
@@ -0,0 +1,3 @@
+<span>
+  <a title="<%= course.name %>" id="rename_course_name_<%= course.id %>" ondblclick="rename_course_name($(this),'<%=course.name %>','<%=course.id %>');"><%= course.name %></a>
+</span>
\ No newline at end of file
diff --git a/app/views/admin/_tab_syllabuses_courses.erb b/app/views/admin/_tab_syllabuses_courses.erb
new file mode 100644
index 000000000..7530b3af7
--- /dev/null
+++ b/app/views/admin/_tab_syllabuses_courses.erb
@@ -0,0 +1,7 @@
+<div class="tabs">
+  <ul>
+    <li><%= link_to '课程列表', {:action => 'syllabuses'},   class: "#{current_page?(all_syllabuses_path)? 'selected' : nil }" %></li>
+    <li><%= link_to '全部班级列表',  {:action => 'courses'},  class: "#{current_page?(all_courses_path)? 'selected' : nil }" %></li>
+    <li><%= link_to '未配置班级列表',  {:action => 'non_syllabus_courses'},  class: "#{current_page?(non_syllabus_courses_path)? 'selected' : nil }" %></li>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/courses.html.erb b/app/views/admin/courses.html.erb
index 8e2f146a0..8695bc6b9 100644
--- a/app/views/admin/courses.html.erb
+++ b/app/views/admin/courses.html.erb
@@ -5,15 +5,20 @@
 <h3>
   <%=l(:label_course_all)%>
 </h3>
+<%= render 'tab_syllabuses_courses' %>
+
+<h3>
+  班级列表
+</h3>
 
 <%= form_tag({}, :method => :get) do %>
     <fieldset>
       <label for='name'>
-        课程:
+        班级:
       </label>
-      <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '课程名称' %>
+      <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '班级、老师名称' %>
       <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
-      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'courses'},:remote => true, :class => 'icon icon-reload' %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'courses'}, :class => 'icon icon-reload' %>
     </fieldset>
 <% end %>
 &nbsp;
@@ -22,50 +27,45 @@
   <table class="list" style="width: 100%;table-layout: fixed">
     <thead>
     <tr>
-      <th style="width: 30px;">
+      <th style="width: 20px;">
         序号
       </th>
-      <th style="width: 120px;">
-        课程
+      <th style="width: 70px;">
+        班级
       </th>
-      <th style="width: 50px;">
+      <th style="width: 35px;">
         主讲老师
       </th>
-      <th style="width: 30px;">
+      <th style="width: 20px;">
         学时
       </th>
-      <th style="width: 20px;">
+      <th style="width: 15px;">
         <%=l(:field_is_public)%>
       </th>
-      <th style="width: 70px;">
+      <th style="width: 20px;">
+        状态
+      </th>
+      <th style="width: 45px;">
         <%=l(:field_created_on)%>
       </th>
+      <th style="width: 45px;">
+        动态时间
+      </th>
+      <th style="width:75px">
+        课程
+      </th>
+      <th style="width:35px">
+
+      </th>
     </tr>
     </thead>
     <tbody>
     <% @courses.each do |course| %>
-        <tr class="<%= cycle("odd", "even") %>">
-          <td style="text-align: center;">
-            <%= course.id %>
-          </td>
-          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>'>
-            <span>
-              <%= link_to(course.name, course_path(course.id)) %>
-            </span>
-          </td>
-          <td align="center">
-            <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
-          </td>
-          <td align="center">
-            <%= course.class_period %>
-          </td>
-          <td class="center">
-            <%= checked_image course.is_public? %>
-          </td>
-          <td class="center">
-            <%= format_date(course.created_at) %>
-          </td>
+        <% unless course.teacher.nil? %>
+        <tr class="<%= cycle("odd", "even") %>" id="course_<%=course.id %>">
+          <%=render :partial => 'courselist_detail_tr', :locals => {:course => course} %>
         </tr>
+        <% end %>
     <% end %>
     </tbody>
   </table>
@@ -75,4 +75,19 @@
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
 </div>
 
+<script type="text/javascript">
+  function select_syllabus(id){
+      val = $("#new_syllabus_id_"+id).children('option:selected').val();
+      if(val != "0") {
+          $.ajax({
+              type: "post",
+              url: "/admin/select_course_syllabus",
+              data: {syllabus_id: val,
+                  course_id: id},
+              success: function (data) {
+              }
+          });
+      }
+  }
+</script>
 <% html_title(l(:label_course_all)) -%>
diff --git a/app/views/admin/create_syllabus.js.erb b/app/views/admin/create_syllabus.js.erb
new file mode 100644
index 000000000..ac37abd78
--- /dev/null
+++ b/app/views/admin/create_syllabus.js.erb
@@ -0,0 +1,10 @@
+hideModal();
+<%courses = Course.where("tea_id = #{@user.id}") %>
+<% unless courses.empty? %>
+    <% courses.each do |course|%>
+        $("#course_<%=course.id %>").html("<%=escape_javascript(render :partial => 'courselist_detail_tr', :locals => {:course => course}) %>");
+    <% end %>
+<% end %>
+<% if @flag == 1 %>
+    $("#course_<%=@course.id %>").html("");
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/excellent_all_courses.html.erb b/app/views/admin/excellent_all_courses.html.erb
index eb5f8c1a2..805c81d1f 100644
--- a/app/views/admin/excellent_all_courses.html.erb
+++ b/app/views/admin/excellent_all_courses.html.erb
@@ -27,32 +27,35 @@
       <th style="width: 25px;">
         序号
       </th>
-      <th style="width: 120px;">
+      <th style="width: 105px;">
         课程名
       </th>
-      <th style="width: 50px;">
+      <th style="width: 35px;" class = "<%= @order == 'open' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '公开', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'open') %>
+      </th>
+      <th style="width: 35px;">
         主讲老师
       </th>
-      <th style="width: 30px;">
-        学生数
+      <th style="width: 30px;" class = "<%= @order == 'std' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '学生数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'std') %>
       </th>
-      <th style="width: 25px;">
-        作业数
+      <th style="width: 30px;" class = "<%= @order == 'homework' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '作业数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'homework') %>
       </th>
-      <th style="width: 25px;">
-        作品数
+      <th style="width: 30px;" class = "<%= @order == 'works' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '作品数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'works') %>
       </th>
-      <th style="width: 25px;">
-        资源数
+      <th style="width: 30px;" class = "<%= @order == 'res' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '资源数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'res') %>
       </th>
-      <th style="width: 30px;">
-        帖子数
+      <th style="width: 30px;" class = "<%= @order == 'post' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '帖子数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'post') %>
       </th>
-      <th style="width: 30px;" class = "<%= @order == 'act' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
-        <%=link_to '动态数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'act') %>
+      <th style="width: 40px;" class = "<%= @order == 'act' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '动态数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'act') %>
       </th>
       <th style="width: 40px;" class = "<%= @order == 'time' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
-        <%=link_to '开课学期', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'time') %>
+        <%= link_to '开课学期', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'time') %>
       </th>
       <th style="width: 40px;">
       </tr>
diff --git a/app/views/admin/excellent_courses.html.erb b/app/views/admin/excellent_courses.html.erb
index c107713a0..0418ebf30 100644
--- a/app/views/admin/excellent_courses.html.erb
+++ b/app/views/admin/excellent_courses.html.erb
@@ -16,7 +16,7 @@
         序号
       </th>
       <th style="width: 120px;">
-        课程名
+        班级名
       </th>
       <th style="width: 50px;">
         主讲老师
diff --git a/app/views/admin/non_syllabus_courses.html.erb b/app/views/admin/non_syllabus_courses.html.erb
new file mode 100644
index 000000000..1be979eeb
--- /dev/null
+++ b/app/views/admin/non_syllabus_courses.html.erb
@@ -0,0 +1,172 @@
+<div class="contextual">
+  <%= link_to l(:label_course_new), {:controller => 'courses', :action => 'new'}, :class => 'icon icon-add' %>
+</div>
+
+<h3>
+  未配置班级列表
+</h3>
+<%= render 'tab_syllabuses_courses' %>
+
+<h3>
+  未配置班级列表
+</h3>
+
+<%= form_tag({}, :method => :get) do %>
+    <fieldset>
+      <label for='name'>
+        班级:
+      </label>
+      <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '班级、老师名称' %>
+      <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'non_syllabus_courses'}, :class => 'icon icon-reload' %>
+    </fieldset>
+<% end %>
+&nbsp;
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 20px;">
+        序号
+      </th>
+      <th style="width: 70px;">
+        班级
+      </th>
+      <th style="width: 35px;">
+        主讲老师
+      </th>
+      <th style="width: 20px;">
+        学时
+      </th>
+      <th style="width: 15px;">
+        <%=l(:field_is_public)%>
+      </th>
+      <th style="width: 20px;">
+        状态
+      </th>
+      <th style="width: 45px;">
+        <%=l(:field_created_on)%>
+      </th>
+      <th style="width: 45px;">
+        动态时间
+      </th>
+      <th style="width:75px">
+        课程
+      </th>
+      <th style="width:35px">
+
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @courses.each do |course| %>
+        <% unless course.teacher.nil? %>
+        <tr class="<%= cycle("odd", "even") %>" id="course_<%=course.id %>">
+          <td style="text-align: center;">
+            <%= course.id %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>' id="syllabus_course_name_<%=course.id %>">
+            <span>
+              <a title="<%=course.name %>" id="rename_course_name_<%=course.id %>" ondblclick="rename_course_name($(this),'<%=course.name %>','<%=course.id %>');"><%= course.name%></a>
+            </span>
+          </td>
+          <td align="center">
+            <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
+          </td>
+          <td align="center">
+            <%= course.class_period %>
+          </td>
+          <td class="center">
+            <%= checked_image course.is_public? %>
+          </td>
+          <td class="center">
+            <%= course.is_delete == 0 ? '正常' : '归档' %>
+          </td>
+          <td class="center">
+            <%= format_date(course.created_at) %>
+          </td>
+          <td class="center">
+            <%= course.updated_at.strftime('%Y-%m-%d %H:%M:%S') %>
+          </td>
+          <td class="center">
+            <%= select_tag :syllabus_id,options_for_select(course_syllabus_option(course.teacher),course.syllabus_id), {:id=>"new_syllabus_id_#{course.id}", :class=>"course_syllabus_input", :onchange=>"select_syllabus(#{course.id});"}%>
+          </td>
+          <td class="center">
+            <a href="javascript:void(0)" onclick="alert_new_syllabus(<%=course.id %>, 1)">新建课程</a>
+          </td>
+        </tr>
+    <% end %>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<script type="text/javascript">
+    var tagNameHtml; //当前双击的链接的父节点的html
+    var parentCssBorder; //当前双击的链接的父节点
+    var ele;    //当前双击的链接
+    var tagId; //班级的id
+    var tagName; //班级名称
+
+    function rename_course_name(domEle,name,id){
+        isdb = true; //这是双击
+        //clearTimeout(clickFunction);
+        if (domEle.children().get(0) != undefined) { //已经是编辑框的情况下不要动
+            return;
+        }
+        tagNameHtml = domEle.parent().html();
+        parentCssBorder = domEle.parent().css("border");
+        ele = domEle;
+        tagId = id;
+        tagName = name;
+        domEle.html('<input name=""  id="renameCourseName" maxlength="120" minlength="1" style="width:125px;" value="' + name + '"/>');
+        domEle.parent().css("border", "1px solid #ffffff");
+        $("#renameCourseName").focus();
+    }
+
+    $(function(){
+        $("#renameCourseName").live("blur",function(){
+            updateCourseName();
+        }).live("keypress",function(e){
+            if (e.keyCode == '13') {
+                updateCourseName();
+            }
+        });
+    });
+
+    //执行修改courseName方法
+    function updateCourseName(){
+        if(isdb){
+            isdb = false;
+            if($("#renameCourseName").val() == tagName){ //如果值一样，则恢复原来的状态
+                ele.parent().css("border","");
+                ele.parent().html(tagNameHtml);
+            }
+            else{
+                $.post(
+                        '<%= admin_update_course_name_path %>',
+                        {"course_id": tagId, "name": $("#renameCourseName").val().trim()}
+                );
+            }
+        }
+    }
+    function select_syllabus(id){
+        val = $("#new_syllabus_id_"+id).children('option:selected').val();
+        if(val != "0") {
+            $.ajax({
+                type: "post",
+                url: "/admin/select_course_syllabus",
+                data: {syllabus_id: val,
+                    course_id: id},
+                success: function (data) {
+                }
+            });
+        }
+    }
+</script>
+<% html_title(l(:label_course_all)) -%>
diff --git a/app/views/admin/syllabuses.html.erb b/app/views/admin/syllabuses.html.erb
new file mode 100644
index 000000000..782f6b01c
--- /dev/null
+++ b/app/views/admin/syllabuses.html.erb
@@ -0,0 +1,140 @@
+<h3>
+  课程列表
+</h3>
+<%= render 'tab_syllabuses_courses' %>
+
+<h3>
+  课程列表
+</h3>
+
+<%= form_tag({}, :method => :get) do %>
+    <fieldset>
+      <label for='name'>
+        课程:
+      </label>
+      <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '课程名称' %>
+      <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'syllabuses'}, :class => 'icon icon-reload' %>
+    </fieldset>
+<% end %>
+&nbsp;
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 85px;">
+        课程名称
+      </th>
+      <th style="width: 85px;">
+        班级名称
+      </th>
+      <th style="width: 35px;">
+        创建老师
+      </th>
+      <th style="width: 60px;">
+        <%=l(:field_created_on)%>
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @syllabuses.each do |syllabus| %>
+        <tr class="odd">
+          <td style="text-align: center;">
+            <%= syllabus.id %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=syllabus.title%>'>
+            <span>
+              <%= link_to(syllabus.title, syllabus_path(syllabus.id)) %>
+            </span>
+          </td>
+          <td class="center">
+          </td>
+          <td align="center">
+            <%= link_to(syllabus.try(:user).try(:realname).truncate(6, omission: '...'), user_path(syllabus.user)) %>
+          </td>
+          <td class="center">
+            <%= format_date(syllabus.created_at) %>
+          </td>
+        </tr>
+        <% courses = syllabus.courses %>
+        <% courses.each do |course| %>
+            <tr class="even">
+              <td style="text-align: center;">
+                <%= course.id %>
+              </td>
+              <td class="center">
+              </td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>' id="syllabus_course_name_<%=course.id %>">
+                <%= render :partial => 'admin/rename_course_name', :locals => {:course => course} %>
+              </td>
+              <td align="center">
+                <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+              </td>
+              <td class="center">
+                <%= format_date(course.created_at) %>
+              </td>
+            </tr>
+        <% end %>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<script type="text/javascript">
+    var tagNameHtml; //当前双击的链接的父节点的html
+    var parentCssBorder; //当前双击的链接的父节点
+    var ele;    //当前双击的链接
+    var tagId; //班级的id
+    var tagName; //班级名称
+
+    function rename_course_name(domEle,name,id){
+        isdb = true; //这是双击
+        //clearTimeout(clickFunction);
+        if (domEle.children().get(0) != undefined) { //已经是编辑框的情况下不要动
+            return;
+        }
+        tagNameHtml = domEle.parent().html();
+        parentCssBorder = domEle.parent().css("border");
+        ele = domEle;
+        tagId = id;
+        tagName = name;
+        domEle.html('<input name=""  id="renameCourseName" maxlength="120" minlength="1" style="width:125px;" value="' + name + '"/>');
+        domEle.parent().css("border", "1px solid #ffffff");
+        $("#renameCourseName").focus();
+    }
+
+    $(function(){
+        $("#renameCourseName").live("blur",function(){
+            updateCourseName();
+        }).live("keypress",function(e){
+            if (e.keyCode == '13') {
+                updateCourseName();
+            }
+        });
+    });
+
+    //执行修改TAGName方法
+    function updateCourseName(){
+        if(isdb){
+            isdb = false;
+            if($("#renameCourseName").val() == tagName){ //如果值一样，则恢复原来的状态
+                ele.parent().css("border","");
+                ele.parent().html(tagNameHtml);
+            }
+            else{
+                $.post(
+                        '<%= admin_update_course_name_path %>',
+                        {"course_id": tagId, "name": $("#renameCourseName").val().trim()}
+                );
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/admin/update_course_name.js.erb b/app/views/admin/update_course_name.js.erb
new file mode 100644
index 000000000..45c0cb99d
--- /dev/null
+++ b/app/views/admin/update_course_name.js.erb
@@ -0,0 +1 @@
+$("#syllabus_course_name_<%=@course.id %>").html("<%=escape_javascript(render :partial => 'admin/rename_course_name', :locals => {:course => @course}) %>");
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index f8db461a6..78b3d8293 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -7,7 +7,7 @@
         <li class="ml45 mb10">
           <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(syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"}  %>
+              <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"}  %>
           <% else %>
               <span><%=@syllabus.title %></span>
               <input style="display: none;" name="syllabus_id" value="<%=@syllabus.id %>" />
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 903d01f8a..ee0f6c98a 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -31,14 +31,13 @@
           </li>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :syllabus_id,options_for_select(syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input", :style=>'width:280px'}  %>
+            <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input", :style=>'width:280px'}  %>
             <span class="c_red" id="edit_syllabus_notice" style="display: none;">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%></span>
           </li>
           <li class="ml45">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
-            <input  type="text" name="course[name]" id="edit_course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name('edit');" value="<%= @course.name%>">
+            <input  type="text" name="course[name]" id="edit_course_name" autocomplete="off" class="courses_input" maxlength="100" onkeyup="regex_course_name('edit');" value="<%= @course.name%>">
             <span class="c_red" id="edit_course_name_notice" style="display: none;">班级名称不能为空</span>
-            <input type="password" style="top: -100000px;position: fixed;">
           </li>
           <div class="cl"></div>
           <li  class="ml45">
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index f8fe7896c..9d70511e8 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -145,11 +145,11 @@
             alert("测验标题不能为空");
         } else if($.trim($("#exercise_end_time").val()) =="") {
             alert("截止时间不能为空");
-        } else if((Date.parse($("#exercise_end_time").val())+(24*60*60-1)*1000) < Date.now()) {
+        } else if((Date.parse($("#exercise_end_time").val())+(24*60*60-1)*1000) <= Date.now()) {
             alert("截止时间不能小于当前时间");
         } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
             alert("测验时长必须为非零开头的数字");
-        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) {
+        } else if($.trim($("#exercise_publish_time").val()) !="" && ((Date.parse($("#exercise_publish_time").val())+(24*60*60-1)*1000) < Date.now())) {
             alert("发布时间不能小于当前时间");
         } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) < Date.parse($("#exercise_publish_time").val())) {
             alert("截止时间不能小于发布时间");
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 2cf43f896..946449680 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -86,6 +86,14 @@
       </li>
     </ul>
   </div>
+  <div class="cl"></div>
+  <% unless User.current.logged? %>
+      <div class="syllabusbox_tishi mt10">
+        <p style="text-align: center;">您尚未登录，<a href='<%= signin_url_without_domain %>' class='syllabusbox_a_blue' target='_Blank' >登录</a>
+          后可浏览更多信息
+        </p>
+      </div>
+  <% end %>
   <div class="resources mt10" style="padding-bottom:5px;">
     <div class="reTop mb5">
       <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
diff --git a/app/views/files/_hidden_file.html.erb b/app/views/files/_hidden_file.html.erb
index 8e359c605..1ace422b7 100644
--- a/app/views/files/_hidden_file.html.erb
+++ b/app/views/files/_hidden_file.html.erb
@@ -3,7 +3,7 @@
   <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>-->
 <%= form_tag(republish_file_course_file_path(@course,@file), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
 <div class="mb10">
-  <label class="fl c_dark f14" style="margin-top: 4px;">延迟发布：</label>
+  <label class="fl c_dark f14" style="margin-top: 4px;">延期发布：</label>
   <div class="calendar_div fl">
     <input  type="text" name="publish_time" id="attachment_publish_time" placeholder="发布日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%=@file.publish_time %>">
     <%#= calendar_for('attachment_publish_time')%>
@@ -11,7 +11,7 @@
   <span class="fl c_red" style="margin-top: 4px;" id="publish_time_notice"></span>
   <div class="cl"></div>
 </div>
-  <!--<div class="mt15"> <span class="f14 fontGrey3 mr10">延迟发布：</span>
+  <!--<div class="mt15"> <span class="f14 fontGrey3 mr10">延期发布：</span>
     <input type="text" name="" placeholder="请输入0-50数值" class="markInput" />
   </div>-->
   <div>
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index 98b9ad514..40e5163a8 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -57,6 +57,14 @@
       </li>
     </ul>
   </div>
+  <div class="cl"></div>
+  <% unless User.current.logged? %>
+      <div class="syllabusbox_tishi mt10">
+        <p style="text-align: center;">您尚未登录，<a href='<%= signin_url_without_domain %>' class='syllabusbox_a_blue' target='_Blank' >登录</a>
+          后可浏览更多信息
+        </p>
+      </div>
+  <% end %>
   <div class="resources mt10" style="padding-bottom:5px;">
     <div class="reTop mb5">
       <%= form_tag( search_project_project_files_path(@project), method: 'get',:class => "re_search",:remote=>true) do %>
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 0edf22e58..85e0dc8d3 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -8,11 +8,11 @@
       <div class="homepagePostTitle break_word">
         <%# 如果有历史版本则提供历史版本下载 %>
         <% if file.attachment_histories.count == 0 %>
-            <%= link_to truncate(file.filename,length: 35, omission: '...'),
+            <%= link_to truncate(file.filename,length: 40, omission: '...'),
                       download_named_attachment_path(file.id, file.filename),
                       :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
         <% else %>
-            <%= link_to truncate(file.filename,length: 35, omission: '...'), attachment_history_download_path(file.id),
+            <%= link_to truncate(file.filename,length: 40, omission: '...'), attachment_history_download_path(file.id),
                       :title => file.filename+"\n"+file.description.to_s,
                       :class => "linkGrey3 f_14",
                       :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %>
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 516e42c68..6a60442b8 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -35,6 +35,14 @@
       </ul>
     </ul>
   </div>
+  <div class="cl"></div>
+  <% unless User.current.logged? %>
+      <div class="syllabusbox_tishi mt10">
+        <p style="text-align: center;">您尚未登录，<a href='<%= signin_url_without_domain %>' class='syllabusbox_a_blue' target='_Blank' >登录</a>
+          后可浏览更多信息
+        </p>
+      </div>
+  <% end %>
   <div class="resources mt10" style="padding-bottom:5px;">
     <div class="reTop mb5">
       <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search",:remote=>true) do %>
diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 0a35c783c..1171f296b 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -32,7 +32,7 @@
 
           <% if User.current.allowed_to?(:as_teacher,course) %>
               <div class="mb5">
-                <label class="fl c_dark f14" style="margin-top: 4px;">延迟发布：</label>
+                <label class="fl c_dark f14" style="margin-top: 4px;">延期发布：</label>
                 <div class="calendar_div fl">
                     <input  type="text" name="publish_time" id="attachment_publish_time" placeholder="发布日期(可选)" class="InputBox fl W120 calendar_input" readonly="readonly">
                     <%#= calendar_for('attachment_publish_time')%>
diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb
index 85f02310d..abfebd828 100644
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@@ -8,31 +8,29 @@
   <% end %>
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
-<div class="pr_info_id fl f14">
+<div class="pr_info_id fl f14 pr_info_name" style="margin-top: 0px;">
+  <!--<span class="pr_info_name hidden">-->
   <% if @course.syllabus%>
-      <a class="pr_info_name fb c_dark fl hidden" title="<%=@course.syllabus.title %>" style="max-width: 120px;" href="<%= Setting.protocol%>://<%= Setting.host_name%>/syllabuses/<%= @course.syllabus_id%>" target="_blank">
-        <%=@course.syllabus.title %>
+      <a class="c_dark" title="<%=@course.syllabus.title %>" href="<%= Setting.protocol%>://<%= Setting.host_name%>/syllabuses/<%= @course.syllabus_id%>" target="_blank">
+        <%= @course.syllabus.title + " •" %>
       </a>
   <% end %>
-  <div class="cl"></div>
-
-  <span class="hidden fl" style="max-width: 80px;" title="<%= @course.name %><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %>"><%= @course.name %></span><span class="fl"><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %></span>
-  </br>
-  <div class="cl"></div>
+  &nbsp;<%= @course.name %><%=@course.is_public == 0 ? '（私有）' :  '（公开）' %>
   <% if is_excellent_course(@course) %>
-    <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" />
-  <% end %>
-</div>
-<div class="pr_info_id fl f14" style="margin-top: 0px;">
-  <% unless is_teacher %>
-    <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
+      <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" />
   <% end %>
+  <!--</span>-->
 </div>
 <div class="cl"></div>
+
 <div>
-  <span class="f14">邀请码：</span>
-  <span class="f14 fontBlue2"><%=@course.generate_invite_code %></span>
+  <span class="f14 fl">邀请码：</span>
+  <span class="f14 fontBlue2 fl"><%=@course.generate_invite_code %></span>
+  <% unless is_teacher %>
+      <div id="join_in_course_header" class="fl ml30"><%= join_in_course_header(@course, User.current) %></div>
+  <% end %>
 </div>
+
 <div class="cl"></div>
 <div class="pr_info_foot ">
 <%= l(:label_account_identity_teacher)%>（<%= course_teacher_link teacher_num %>）
@@ -46,6 +44,9 @@
     <ul>
       <li class="homepagePostSettingIcon">
         <ul class="homepagePostSettiongText boxShadow">
+          <% if @course.syllabus %>
+              <li><%= link_to "查看课程", syllabus_path(@course.syllabus), :class => "postOptionLink", :target => "_blank" %></li>
+        <% end %>
           <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>
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 54f9b7ba3..ba31c4379 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -51,7 +51,7 @@
           <li><a href="<%= poll_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name%></a></li>
       <% elsif ma.course_message_type == "Message" %>
           <% content = ma.course_message.parent_id.nil? ? ma.course_message.subject : ma.course_message.content.html_safe %>
-          <% href = course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id) %>
+          <% href = board_message_path(ma.course_message.board_id, ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id) %>
           <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.author.show_name %> <%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %><%= content%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span><%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %><%= content%></a></li>
       <% elsif ma.course_message_type == "StudentWorksScore" %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.student_work.homework_common_id) %>" target="_blank" title="<%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%>"><span class="shadowbox_news_user"><%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> </span><%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%></a></li>
@@ -104,7 +104,7 @@
       <% elsif ma.forge_message_type == "Journal" %>
           <li><a href="<%=issue_path(:id => ma.forge_message.journalized_id) %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 更新了问题状态：<%= ma.forge_message.journalized.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>更新了问题状态：<%= ma.forge_message.journalized.subject%></a></li>
       <% elsif ma.forge_message_type == "Message" %>
-          <li><a href="<%=project_boards_path(ma.forge_message.project,:parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,:topic_id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
+          <li><a href="<%=board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
       <% elsif ma.forge_message_type == "News" %>
           <li><a href="<%=news_path(ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 发布了新闻：<%= ma.forge_message.title.html_safe%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>发布了新闻：<%= ma.forge_message.title.html_safe%></a></li>
       <% elsif ma.forge_message_type == "Comment" %>
diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb
index ae6da2ac3..387ac58f7 100644
--- a/app/views/layouts/_syllabus_base_info.html.erb
+++ b/app/views/layouts/_syllabus_base_info.html.erb
@@ -1,9 +1,9 @@
 <ul class="syllabus_leftinfo" id="all_syllabus_attr">
+  <li class="fl"><label >创建教师：</label><span><%=syllabus.user.show_name %></span></li>
   <% 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);", :class => 'fr', :onclick => "show_edit_base_info();"%>
+      <%= 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();"%>
   <% end %>
   <div class="cl"></div>
-  <li><label >创建教师：</label><span><%=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>
   <% end %>
diff --git a/app/views/layouts/_syllabus_edit_info.html.erb b/app/views/layouts/_syllabus_edit_info.html.erb
index 4c24fccb9..6a298bfc3 100644
--- a/app/views/layouts/_syllabus_edit_info.html.erb
+++ b/app/views/layouts/_syllabus_edit_info.html.erb
@@ -1,9 +1,9 @@
 <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>-->
       <div class="cl"></div>
-      <li><label >创建教师：</label><span><%=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=>"syllabus_select"}  %>
       <div class="cl"></div>
diff --git a/app/views/layouts/_syllabus_eng_name.html.erb b/app/views/layouts/_syllabus_eng_name.html.erb
index 6b9b6f3c7..ed8035736 100644
--- a/app/views/layouts/_syllabus_eng_name.html.erb
+++ b/app/views/layouts/_syllabus_eng_name.html.erb
@@ -4,5 +4,5 @@
     <span class="fontGrey">课程英文名称</span>
 <% end %>
 <% if User.current == syllabus.user %>
-    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_eng_name();"%>
+    <%= 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
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
index b67cb4c4d..a5207af68 100644
--- a/app/views/layouts/_syllabus_info.html.erb
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -1,22 +1,25 @@
-<% teachers_num = teacher_count @syllabus%>
-<% students_num = student_count @syllabus%>
-<% files_num = file_count @syllabus%>
-<div class="pr_info_logo fl mb5">
+<%# 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 ml15">
-  <p class="homepageSyllabusName mb5" title="<%=@syllabus.title %>"><%=@syllabus.title %></p>
-  <div class="cl"></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" onblur="edit_syllabus_title('<%= edit_syllabus_title_syllabus_path(@syllabus.id)%>');"><%= @syllabus.title %></textarea>
 </div>
 <div class="cl"></div>
 <div>
-  <div class="mb5" id="syllabus_eng_name_show">
+  <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" onblur="edit_syllabus_eng_name('<%= edit_syllabus_eng_name_syllabus_path(@syllabus.id)%>');"><%= @syllabus.eng_name %></textarea>
 </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>
\ No newline at end of file
+  教师（<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>-->
diff --git a/app/views/layouts/_syllabus_title.html.erb b/app/views/layouts/_syllabus_title.html.erb
new file mode 100644
index 000000000..5180da82d
--- /dev/null
+++ b/app/views/layouts/_syllabus_title.html.erb
@@ -0,0 +1,5 @@
+<span style="word-break: normal; word-wrap: break-word;"><%=@syllabus.title %></span>
+
+<% if User.current == syllabus.user %>
+    <%= 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();"%>
+<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/base_admin.html.erb b/app/views/layouts/base_admin.html.erb
index cff80a15d..81cc2df9d 100644
--- a/app/views/layouts/base_admin.html.erb
+++ b/app/views/layouts/base_admin.html.erb
@@ -19,6 +19,10 @@
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
 		<%= yield :header_tags -%>
+        <!-- MathJax的配置 -->
+        <script type="text/javascript"
+                src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+        </script>
 	</head>
 	<body class="<%= h body_css_classes %>">
 		<div id="wrapper">
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
index 2eb51d229..5aa23b3c5 100644
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -42,12 +42,12 @@
 <div class="homepageContentContainer">
   <div class="homepageContent">
     <div class="homepageLeft">
-      <div class="homepagePortraitContainer mt15">
+      <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">
+      <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>
 
@@ -55,7 +55,7 @@
         <div class="homepageLeftMenuBlock">
           <%=link_to '班级', {:controller => "syllabuses", :action => "syllabus_courselist", :id => @syllabus.id}, :class => 'homepageMenuText' %>
           <% if is_current_user%>
-              <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+              <% 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">
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 560925070..232be1f35 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -95,9 +95,10 @@
         </span>
       </div>
     </div>
-    <% unless @replies.empty? %>
+    <% all_comments = []%>
+    <% comments = get_all_children(all_comments, @topic) %>
     <div class="" id="reply_div_<%=  @topic.id %>">
-      <% @replies.each_with_index  do |reply,i| %>
+      <% comments.each_with_index  do |reply,i| %>
           <script type="text/javascript">
               $(function(){
                   showNormalImage('reply_message_description_<%= reply.id %>');
@@ -110,32 +111,41 @@
             </div>
             <div class="homepagePostReplyDes">
               <div class="homepagePostReplyPublisher">
-                <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                <%= 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 %>
               <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.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>
+              <div class="orig_reply mb10 mt-10">
+                <div class="reply">
+                <span class="reply-right">
+                <span id="reply_praise_count_<%= reply.id %>">
+                  <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
+                </span>
+                <span style="position: relative" class="fr mr20">
                   <%= link_to(
                               l(:button_reply),
                               {:action => 'quote', :id => reply},
                               :remote => true,
                               :method => 'get',
-                              :class => 'fr newsBlue mr10',
                               :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                  <span id="reply_iconup_<%= reply.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                </span>
                   <%= link_to(
                               l(:button_delete),
                               {:action => 'destroy', :id => reply},
                               :method => :post,
-                              :class => 'fr newsGrey mr10',
+                              :class => 'fr mr20',
                               :data => {:confirm => l(:text_are_you_sure)},
                               :title => l(:button_delete)
                       ) if reply.course_destroyable_by?(User.current) %>
+                </span>
+
+                  <div class="cl"></div>
                 </div>
               </div>
               <p id="reply_message_<%= reply.id%>"></p>
@@ -145,7 +155,6 @@
       <% end %>
     </div>
 
-  <% end %>
     <div class="cl"></div>
     <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
         <div class="talkWrapMsg" nhname="about_talk_reply">
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 43b0798aa..164e4c326 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -156,61 +156,65 @@
         </span>
         </div>
       </div>
-      <% unless @replies.empty? %>
-          <div class="" id="reply_div_<%=  @topic.id %>">
-            <% @replies.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.content.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(
-                                    l(:button_reply),
-                                    {:action => 'quote', :id => reply},
-                                    :remote => true,
-                                    :method => 'get',
-                                    :class => 'fr newsBlue mr10',
-                                    :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
-                        <%= link_to(
-                                    l(:button_delete),
-                                    {:action => 'destroy', :id => reply},
-                                    :method => :post,
-                                    :class => 'fr newsGrey mr10',
-                                    :data => {:confirm => l(:text_are_you_sure)},
-                                    :title => l(:button_delete)
-                            ) if reply.destroyable_by?(User.current) %>
-                      </div>
-                    </div>
-                    <p id="reply_message_<%= reply.id%>"></p>
-                  </div>
-                  <div class="cl"></div>
+      <% all_comments = []%>
+      <% comments = get_all_children(all_comments, @topic) %>
+      <div class="" id="reply_div_<%=  @topic.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">
+                  <%= 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>
-            <% end %>
-          </div>
+                <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
+                    <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
+                <% end %>
+                <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                  <%= reply.content.html_safe%>
+                </div>
+                <div class="orig_reply mb10 mt-10">
+                  <div class="reply">
+                <span class="reply-right">
+                <span id="reply_praise_count_<%= reply.id %>">
+                  <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
+                </span>
+                <span style="position: relative" class="fr mr20">
+                  <%= link_to(
+                              l(:button_reply),
+                              {:action => 'quote', :id => reply},
+                              :remote => true,
+                              :method => 'get',
+                              :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                  <span id="reply_iconup_<%= reply.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                </span>
+                  <%= link_to(
+                              l(:button_delete),
+                              {:action => 'destroy', :id => reply},
+                              :method => :post,
+                              :class => 'fr mr20',
+                              :data => {:confirm => l(:text_are_you_sure)},
+                              :title => l(:button_delete)
+                      ) if reply.course_destroyable_by?(User.current) %>
+                </span>
 
-      <% end %>
+                    <div class="cl"></div>
+                  </div>
+                </div>
+                <p id="reply_message_<%= reply.id%>"></p>
+              </div>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+      </div>
       <div class="cl"></div>
       <% if !@topic.locked? && authorize_for('messages', 'reply') %>
           <div class="talkWrapMsg" nhname="about_talk_reply">
diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb
index d4d9d77a0..923734001 100644
--- a/app/views/messages/_reply_message.html.erb
+++ b/app/views/messages/_reply_message.html.erb
@@ -4,11 +4,12 @@
   <div class="ReplyToMessageInputContainer mb10">
     <% if User.current.logged? %>
         <div nhname='new_message_<%= reply.id%>'>
-          <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-              <input type="hidden" name="quote[quote]" id="quote_quote">
-              <input type="hidden" name="reply[subject]" id="reply_subject">
+          <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :method => "post", :id => 'new_form' do |f| %>
+              <%= 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 =>@topic.id %>
               <div nhname='toolbar_container_<%= reply.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
+              <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%>'></p>
diff --git a/app/views/messages/destroy.js.erb b/app/views/messages/destroy.js.erb
new file mode 100644
index 000000000..109df3a0e
--- /dev/null
+++ b/app/views/messages/destroy.js.erb
@@ -0,0 +1,8 @@
+<%if @project%>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>");
+<%elsif @course%>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>");
+<% elsif @org_subfield %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+<%end%>
+sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity");
\ No newline at end of file
diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb
index 89f953bb9..9bd723157 100644
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@@ -1,16 +1,8 @@
-/*$('#message_subject').val("<%#= raw escape_javascript(@subject) %>");
-$('#message_quote').html("<%#= raw escape_javascript(@temp.content.html_safe) %>");
-//$('#message_content').val("<#%= raw escape_javascript(@content) %>");
-$('#quote_quote').html("<%#= raw escape_javascript(@temp.content.html_safe) %>");
-
-showAndScrollTo("reply", "message_content");
-$('#message_content').scrollTop = $('#message_content').scrollHeight - $('#message_content').clientHeight;
-$("img").removeAttr("align");*/
 if($("#reply_message_<%= @message.id%>").length > 0) {
-    $("#reply_message_<%= @message.id%>").replaceWith("<%= escape_javascript(render :partial => 'reply_message', :locals => {:reply => @message,:temp =>@temp,:subject =>@subject}) %>");
+    $("#reply_message_<%= @message.id%>").replaceWith("<%= escape_javascript(render :partial => 'reply_message', :locals => {:reply => @message}) %>");
     $(function(){
-        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
-        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
+        /*$('#reply_subject').val("<%#= raw escape_javascript(@subject) %>");
+        $('#quote_quote').val("<%#= raw escape_javascript(@temp.content.html_safe) %>");*/
         sd_create_editor_from_data(<%= @message.id%>,null,"100%", "<%=@message.class.to_s%>");
     });
 }else if($("#reply_to_message_<%= @message.id%>").length >0) {
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 8d8f591c4..510a743b1 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -71,7 +71,7 @@
           <%= user_for_homework_common activity,is_teacher %>
         </div>
         <% work = cur_user_works_for_homework activity %>
-        <% if activity.end_time < Date.today && !is_teacher && !work.nil? %>
+        <% if activity.end_time < Date.today && !is_teacher && !work.nil? && work.user == User.current %>
             <div class="homepagePostSubmit">
               <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
             </div>
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
index 9e6cdf5aa..306f000b0 100644
--- a/app/views/quality_analysis/_hightchars.html.erb
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -94,7 +94,7 @@
                     },
                     series: [{
                         name: '代码质量',
-                        data: [<%= @complexity["msr"][9].nil? ? 0 : @complexity["msr"][9]["val"] %>]
+                        data: [<%= @ha["sqale_rating"].nil? ? 0 : @ha["sqale_rating"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -209,7 +209,7 @@
                     },
                     series: [{
                         name: '复杂度',
-                        data: [<%= @complexity["msr"][6].nil? ? 0 : @complexity["msr"][6]["val"] %>]
+                        data: [<%= @ha["function_complexity"].nil? ? 0 : @ha["function_complexity"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -329,7 +329,7 @@
                     },
                     series: [{
                         name: '重复率',
-                        data: [<%= @complexity["msr"][7].nil? ? 0 : @complexity["msr"][7]["val"] %>]
+                        data: [<%= @ha["duplicated_lines_density"].nil? ? 0 : @ha["duplicated_lines_density"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
@@ -454,7 +454,7 @@
                     },
                     series: [{
                         name: '质量等级',
-                        data: [<%= @complexity["msr"][5].nil? ? 0 : @complexity["msr"][5]["val"] %>]
+                        data: [<%= @ha["comment_lines_density"].nil? ? 0 : @ha["comment_lines_density"] %>]
 //                        tooltip: {
 //                            valueSuffix: ' km/h'
 //                        }
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index b0b8abafe..3e2a7d373 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -17,10 +17,10 @@
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
         <ul class="analysis-result-list">
-          <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => (qa.branch.nil? ? "master" : qa.branch)), :class => "analysis-result-name fl fontBlue2" %></li>
-          <li class="analysis-result-version fl fontBlue2" title="分支名"><%= qa.branch %></li>
-          <li class="analysis-result-loc fl fontBlue2" title="语言"><%= qa.language %></li>
-          <li class="analysis-result-debt fl fontBlue2" title="时间"><%= qa.path %></li>
+          <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => (qa.branch.nil? ? "master" : qa.branch)), :class => "analysis-result-name fl fontBlue2 hidden" %></li>
+          <li class="analysis-result-version fl fontBlue2 hidden" title="分支名"><%= qa.branch %></li>
+          <li class="analysis-result-loc fl fontBlue2 hidden" title="语言"><%= qa.language %></li>
+          <li class="analysis-result-debt fl fontBlue2 hidden" title="路径"><%= qa.path %></li>
             <% if User.current.try(:login) == qa.author_login %>
               <li class="analysis-result-time fl" title="编辑">
                 <%=link_to "编辑", edit_project_quality_analysi_path(qa, :project_id => @project.id), :remote => true, :class => "fontBlue2" %>
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 1a7869fd0..0f5aebc2d 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -3,131 +3,169 @@
   <h2 class="project_h2" style="width:180px;">质量分析</h2>
 </div>
 <div class="button-rep">当前分支：<%= params[:branch] %></div>
-  <div class="cl"></div>
-  <div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">概要信息</span></div>
-<% if @complexity["msr"].count > 3 %>
-    <%= render :partial => "hightchars" %>
-    <div class="analysis-block mt10 mb40 f14">
-      <div class="flex mb10">
-        <div class="analysis-genral">
-          <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-          <p class="fontGrey3">质量等级</p>
-          <p class="fontBlue2 pr"><%= @complexity["msr"][9].nil? ? "A" : @complexity["msr"][9]["frmt_val"] %>
-            <span class="f10 c_white analysis-genral-icon <%=@complexity["msr"][9].nil? ? "" :  sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][9].blank? ? "很好" : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
-        </div>
-        <div class="analysis-genral" >
-          <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-          <p class="fontGrey3">复杂度</p>
-          <p class="fontBlue2 pr"><%= @complexity["msr"][6].nil? ? 0 : @complexity["msr"][6]["val"] %>
-            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][6].nil? ? "" : complexity_status(@complexity["msr"][6]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][6].nil? ? 0 : complexity_status(@complexity["msr"][6]["val"].to_i)[0] %></span></p>
-        </div>
-      </div>
-      <div class="flex">
-        <div class="analysis-genral">
-          <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-          <p class="fontGrey3">代码重复度</p>
-          <p class="fontBlue2 pr"><%= @complexity["msr"][7].nil? ? 0 : @complexity["msr"][7]["frmt_val"] %>
-            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][7].nil? ? "" : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][7].nil? ? 0 : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %></span></p>
-        </div>
-        <div class="analysis-genral">
-          <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
-          <p class="fontGrey3">注释率</p>
-          <p class="fontBlue2 pr"><%= @complexity["msr"][5].nil? ? 0 : @complexity["msr"][5]["frmt_val"] %>
-            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][5].nil? ? "" : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][5].nil? ? 0 : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %></span></p>
-        </div>
-      </div>
-    </div>
-<% end %>
-
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%=@complexity["msr"][9].nil? ? 0 : score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span>
-    <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%=@complexity["msr"][9].nil? ? "很好" : sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
-  <div class="analysis-block mt10 mb40 f14">
-    <div><span class="fontGrey3 mr30">技术债务</span><span class="w70 pInline"><%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %></span>
-      <span class="fontGrey2"><a class="linkBlue2" target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
-    <div><span class="fontGrey3 mr30 fl">质量问题</span>
-      <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%=@sonar_issues["msr"][0].nil? ? 0 : @sonar_issues["msr"][0]["frmt_val"] %></a></span><span class="fontGrey2">&nbsp;问题分类如下：</span></div>
-    <div class="ml90 mt15">
-      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span>
-        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=BLOCKER" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1].nil? ? 0 : @sonar_issues["msr"][1]["frmt_val"] %></a>
-        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][1].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span>
-        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=CRITICAL" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2].nil? ? 0 : @sonar_issues["msr"][2]["frmt_val"] %></a>
-        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][2].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span>
-        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MAJOR" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3].nil? ? 0 : @sonar_issues["msr"][3]["frmt_val"] %></a>
-        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][3].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
-      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span>
-        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MINOR" class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][4].nil? ? 0 : @sonar_issues["msr"][4]["frmt_val"] %></a>
-        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][4].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
-      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span>
-        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=INFO" class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][5].nil? ? 0 : @sonar_issues["msr"][5]["frmt_val"] %></a>
-        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][5].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
-    </div>
-  </div>
-  <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%=@complexity["msr"][0].nil? ? 0 : lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %></span></span></div>
-  <div class="analysis-block mt10 mb40 flex f14">
-    <div class="analysis-genral">
-      <p class="fontGrey3">代码行数</p>
-      <p class="fontBlue2"><%= @complexity["msr"][0].nil? ? 0 : @complexity["msr"][0]["frmt_val"] %></p>
-    </div>
+<div class="cl"></div>
+<div class="tac f20 fb mt35 mb30">项目代码质量分析报告</div>
+<div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">概要信息</span></div>
+<%= render :partial => "hightchars" %>
+<div class="analysis-block mt10 mb40 f14">
+  <div class="flex mb10">
     <div class="analysis-genral">
-      <p class="fontGrey3">文件</p>
-      <p class="fontBlue2"><%= @complexity["msr"][2].nil? ? 0 : @complexity["msr"][2]["frmt_val"] %></p>
+      <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
+      <p class="fontGrey3">质量等级</p>
+      <p class="fontBlue2 pr"><%= @ha["sqale_rating"] %>
+        <span class="f10 c_white analysis-genral-icon <%= sqale_rating_status(@ha["sqale_rating"].to_i)[1] %> borderRadius">
+          <%= @ha["sqale_rating"].nil? ? "很好" : sqale_rating_status(@ha["sqale_rating"].to_i)[0] %>
+        </span>
+      </p>
     </div>
-    <div class="analysis-genral">
-      <p class="fontGrey3">目录</p>
-      <p class="fontBlue2"><%= @complexity["msr"][3].nil? ? 0 : @complexity["msr"][3]["frmt_val"] %></p>
+    <div class="analysis-genral" >
+      <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
+      <p class="fontGrey3">复杂度</p>
+      <p class="fontBlue2 pr"><%= @ha["function_complexity"].nil? ? 0 : @ha["function_complexity"] %>
+        <span class="f10 c_white analysis-genral-icon <%= complexity_status(@ha["function_complexity"].to_i)[1] %> borderRadius">
+          <%= @ha["function_complexity"].nil? ? "良好" : complexity_status(@ha["function_complexity"].to_i)[0] %>
+        </span>
+      </p>
     </div>
+  </div>
+  <div class="flex">
     <div class="analysis-genral">
-      <p class="fontGrey3">类</p>
-      <p class="fontBlue2"><%= @complexity["msr"][1].nil? ? 0 : @complexity["msr"][1]["frmt_val"] %></p>
+      <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
+      <p class="fontGrey3">代码重复度</p>
+      <p class="fontBlue2 pr"><%= @ha["duplicated_lines_density"].nil? ? 0 : @ha["duplicated_lines_density"] %>
+        <span class="f10 c_white analysis-genral-icon <%= duplicated_lines_density_status(@ha["duplicated_lines_density"].to_i)[1] %> borderRadius">
+          <%= @ha["duplicated_lines_density"].nil? ? 0 : duplicated_lines_density_status(@ha["duplicated_lines_density"].to_i)[0] %>
+        </span>
+      </p>
     </div>
     <div class="analysis-genral">
-      <p class="fontGrey3">方法</p>
-      <p class="fontBlue2"><%=@complexity["msr"][4].nil? ? 0 : @complexity["msr"][4]["frmt_val"] %></p>
+      <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
+      <p class="fontGrey3">注释率</p>
+      <p class="fontBlue2 pr"><%= @ha["comment_lines_density"].nil? ? 0 : @ha["comment_lines_density"] %>
+        <span class="f10 c_white analysis-genral-icon <%= comment_lines_density_status(@ha["comment_lines_density"].to_i)[1] %> borderRadius">
+          <%= @ha["comment_lines_density"].nil? ? 0 : comment_lines_density_status(@ha["comment_lines_density"].to_i)[0] %>
+        </span>
+      </p>
     </div>
   </div>
-  <!--<div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>-->
-  <!--<div class="analysis-block mt10 f12">-->
-    <!--<ul class="contribute-list">-->
-      <!--<li class="fl fontGrey2 contribute-list-avatar">&nbsp;</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-code">代码行数</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-problem">引入质量问题数</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-rate">引入质量问题数/代码行数</li>-->
-      <!--<div class="cl"></div>-->
-    <!--</ul>-->
-    <!--<ul class="contribute-list">-->
-      <!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
-        <!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
-          <!--<p class="fontGrey2 hidden">小明</p>-->
-        <!--</div>-->
-      <!--</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">18340</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">230</li>-->
-      <!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.012540</li>-->
-      <!--<div class="cl"></div>-->
-    <!--</ul>-->
-    <!--<ul class="contribute-list">-->
-      <!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
-        <!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
-          <!--<p class="fontGrey2 hidden">小王</p>-->
-        <!--</div>-->
-      <!--</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">834</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">34</li>-->
-      <!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.04077</li>-->
-      <!--<div class="cl"></div>-->
-    <!--</ul>-->
-    <!--<ul class="contribute-list">-->
-      <!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
-        <!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
-          <!--<p class="fontGrey2 hidden">小亮</p>-->
-        <!--</div>-->
-      <!--</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">134</li>-->
-      <!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">10</li>-->
-      <!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.07462</li>-->
-      <!--<div class="cl"></div>-->
-    <!--</ul>-->
-  <!--</div>-->
+</div>
+
+
+<div class="analysis-tag-wrap f16">
+  <span class="analysis-tag fl mr15"></span>
+  <span class="fb fl mr10">质量等级</span>
+  <span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%= @ha["sqale_rating"].nil? ? 0 : score_sqale_rating(@ha["sqale_rating"].to_i) %></span>/5分</span>
+  <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= @ha["sqale_rating"].nil? ? "很好" : sqale_rating_status(@ha["sqale_rating"].to_i)[0] %></span></span></div>
+<div class="analysis-block mt10 mb40 f14">
+  <div><span class="fontGrey3 mr30">技术债务</span>
+      <span class="w100 pInline">
+        <% if @ha["sqale_index"].to_i == 0 %>
+            0天
+        <% else %>
+            <%= /[0-9]*/.match(@ha["sqale_index"])[0] %>天
+            <%= / [0-9]*/.match(@ha["sqale_index"]).nil? ? "" : (/ [0-9]*/.match(@ha["sqale_index"]).to_s + "小时") %>
+        <% end %>
+      </span>
+    <span class="fontGrey2"><a class="linkBlue2" target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
+  <div><span class="fontGrey3 mr30 fl">&nbsp;质量问题</span>
+    <span class="fontBlue2 w100 pInline">
+      <a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false">
+        <%= @ha["violations"].nil? ? 0 : @ha["violations"] %>
+      </a>
+    </span><span class="fontGrey2">&nbsp;问题分类如下：</span></div>
+  <div class="ml90 mt15">
+    <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span>
+      <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=BLOCKER" class="fontBlue2 w70 pInline">
+        <%= @ha["blocker_violations"].nil? ? 0 : @ha["blocker_violations"] %>
+      </a>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@ha["blocker_violations"].nil? ? 0 : statistics_result_percentage(@ha["blocker_violations"].to_i, 3000) %>%;"></span></span></div>
+    <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span>
+      <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=CRITICAL" class="fontBlue2 w70 pInline">
+        <%= @ha["critical_violations"].nil? ? 0 : @ha["critical_violations"] %>
+      </a>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["critical_violations"].nil? ? 0 : statistics_result_percentage(@ha["critical_violations"].to_i, 3000) %>%;"></span></span></div>
+    <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span>
+      <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MAJOR" class="fontBlue2 w70 pInline">
+        <%= @ha["major_violations"].nil? ? 0 : @ha["major_violations"] %>
+      </a>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["major_violations"].nil? ? 0 : statistics_result_percentage(@ha["major_violations"].to_i, 3000) %>%;"></span></span></div>
+    <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span>
+      <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MINOR" class="fontBlue2 w70 pInline">
+        <%= @ha["minor_violations"].nil? ? 0 : @ha["minor_violations"] %>
+      </a>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["minor_violations"].nil? ? 0 : statistics_result_percentage(@ha["minor_violations"].to_i, 3000) %>%;"></span></span></div>
+    <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span>
+      <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=INFO" class="fontBlue2 w70 pInline">
+        <%= @ha["info_violations"].nil? ? 0 : @ha["info_violations"] %>
+      </a>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["info_violations"].nil? ? 0 : statistics_result_percentage(@ha["info_violations"].to_i, 3000) %>%;"></span></span></div>
+  </div>
+</div>
+<div class="analysis-tag-wrap f16">
+  <span class="analysis-tag fl mr15"></span>
+  <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%= @ha["lines"].nil? ? 0 : lines_scale(@ha["lines"].to_i) %></span></span></div>
+<div class="analysis-block mt10 mb40 flex f14">
+  <div class="analysis-genral">
+    <p class="fontGrey3">代码行数</p>
+    <p class="fontBlue2"><%= @ha["lines"].nil? ? 0 : @ha["lines"] %></p>
+  </div>
+  <div class="analysis-genral">
+    <p class="fontGrey3">文件</p>
+    <p class="fontBlue2"><%= @ha["lines"].nil? ? 0 : @ha["lines"] %></p>
+  </div>
+  <div class="analysis-genral">
+    <p class="fontGrey3">目录</p>
+    <p class="fontBlue2"><%= @ha["directories"].nil? ? 0 : @ha["directories"] %></p>
+  </div>
+  <div class="analysis-genral">
+    <p class="fontGrey3">类</p>
+    <p class="fontBlue2"><%= @ha["classes"].nil? ? 0 : @ha["classes"] %></p>
+  </div>
+  <div class="analysis-genral">
+    <p class="fontGrey3">方法</p>
+    <p class="fontBlue2"><%=@ha["functions"].nil? ? 0 : @ha["functions"] %></p>
+  </div>
+</div>
+<!--<div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>-->
+<!--<div class="analysis-block mt10 f12">-->
+<!--<ul class="contribute-list">-->
+<!--<li class="fl fontGrey2 contribute-list-avatar">&nbsp;</li>-->
+<!--<li class="fl fontGrey2 contribute-list-code">代码行数</li>-->
+<!--<li class="fl fontGrey2 contribute-list-problem">引入质量问题数</li>-->
+<!--<li class="fl fontGrey2 contribute-list-rate">引入质量问题数/代码行数</li>-->
+<!--<div class="cl"></div>-->
+<!--</ul>-->
+<!--<ul class="contribute-list">-->
+<!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
+<!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
+<!--<p class="fontGrey2 hidden">小明</p>-->
+<!--</div>-->
+<!--</li>-->
+<!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">18340</li>-->
+<!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">230</li>-->
+<!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.012540</li>-->
+<!--<div class="cl"></div>-->
+<!--</ul>-->
+<!--<ul class="contribute-list">-->
+<!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
+<!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
+<!--<p class="fontGrey2 hidden">小王</p>-->
+<!--</div>-->
+<!--</li>-->
+<!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">834</li>-->
+<!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">34</li>-->
+<!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.04077</li>-->
+<!--<div class="cl"></div>-->
+<!--</ul>-->
+<!--<ul class="contribute-list">-->
+<!--<li class="fl fontGrey2 contribute-list-avatar contribute-list-height">-->
+<!--<div class="mt8"><img src="images/homepageImage.jpg" width="50" class="image-cir" />-->
+<!--<p class="fontGrey2 hidden">小亮</p>-->
+<!--</div>-->
+<!--</li>-->
+<!--<li class="fl fontGrey2 contribute-list-code contribute-list-height contribute-list-line-height">134</li>-->
+<!--<li class="fl fontGrey2 contribute-list-problem contribute-list-height contribute-list-line-height">10</li>-->
+<!--<li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height">.07462</li>-->
+<!--<div class="cl"></div>-->
+<!--</ul>-->
+<!--</div>-->
diff --git a/app/views/quality_analysis/create.html.erb b/app/views/quality_analysis/create.html.erb
index e7c81f662..4f01fa2c8 100644
--- a/app/views/quality_analysis/create.html.erb
+++ b/app/views/quality_analysis/create.html.erb
@@ -1,9 +1,11 @@
-<% if @current_build_status == "success" %>
-    <%= render :partial => "show", :locals => {:branch => params[:branch]} %>
-<% else %>
-    <% if @build_console_result %>
-        运行结果超时
-    <% else %>
-        <%= render :partial => "console_output" %>
-    <% end %>
-<% end %>
\ No newline at end of file
+<div class="project_r_h">
+  <h2 class="project_h2" style="width:180px;">质量分析</h2>
+</div>
+<div>
+  <div class="c_red">本次分析失败，原因如下：</div>
+  <% if @build_console_result == false %>
+      分析超时
+  <% else %>
+      <%= h @sonar_error.to_json %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/quality_analysis/error_list.html.erb b/app/views/quality_analysis/error_list.html.erb
new file mode 100644
index 000000000..84f2777fa
--- /dev/null
+++ b/app/views/quality_analysis/error_list.html.erb
@@ -0,0 +1,11 @@
+<div class="project_r_h">
+  <h2 class="project_h2" style="width:180px;">质量分析</h2>
+</div>
+<div>
+  <div class="c_red">本次分析失败，原因如下：</div>
+  <% if @build_console_result == false %>
+      分析超时
+  <% else %>
+      <%= h @error_list.output %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
index 7925f6120..06455cebe 100644
--- a/app/views/quality_analysis/index.html.erb
+++ b/app/views/quality_analysis/index.html.erb
@@ -1,14 +1,6 @@
 <% if @name_flag %>
     <%= render :partial => "result_list" %>
 <% else %>
-    <% if params[:current_build_status].nil? || params[:current_build_status] == "success" %>
-        <%= render :partial => "show", :locals => {:branch => @branch} %>
-    <% else %>
-        <% if params[:build_console_result] %>
-            运行结果超时
-        <% else %>
-            <%= render :partial => "console_output" %>
-        <% end %>
-    <% end %>
+    <%= render :partial => "show", :locals => {:branch => @branch} %>
 <% end %>
 
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 4dee108ee..7a378dcb2 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -9,7 +9,7 @@
     <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
       <td style="padding-left: <%=18 * depth%>px;" class="filename_no_report hidden">
         <% if entry.is_dir? %>
-<%# 展开文件目录 %>
+        <%# 展开文件目录 %>
             <span class="expander" onclick="scmEntryClick('<%= tr_id %>', '<%= escape_javascript(url_for(
                        :action => 'show',
                        :id     => @project,
@@ -20,17 +20,10 @@
                        :depth  => (depth + 1),
                        :parent_id => tr_id)) %>');">&nbsp;</span>
         <% end %>
-        <!--<a class="<%#= (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}") %>">-->
-          <!--<%#= h(ent_name) %>-->
-        <!--</a>-->
-        <%#= h(ent_name), :class => "(entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
-<%=  link_to h(ent_name),
-          {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
-           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
+        <%=  link_to h(ent_name),
+                     {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
+                     :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
       </td>
-      <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
-      <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
-<%# if @repository.report_last_commit %>
       <div id="children_tree">
         <td class="tree-comments c_grey hidden">
           <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
@@ -46,10 +39,8 @@
           <div class="hidden" title="<%= format_time(latest_changes.time) %>">
             <%# 为了转换UTC时间，时差8小时 %>
             <%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>
-            <%#= latest_changes.time if latest_changes && latest_changes.time %>
           </div>
         </td>
       </div>
-<%# end %>
     </tr>
 <% end %>
diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb
index d99df5ed1..bf7c19879 100644
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@@ -21,9 +21,9 @@
           <%= select_tag :branch, options_for_select(@repository.branches, @rev), :id => 'branch' %>
       <% end -%>
 
-      <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
-          <%= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag', :style=>" display:none" %>
-      <% end -%>
+      <%# if !@repository.tags.nil? && @repository.tags.length > 0 -%>
+          <%#= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag', :style=>" display:none" %>
+      <%# end -%>
 
       <% if @repository.supports_all_revisions? %>
           <%= hidden_field_tag 'rev', @rev, :size => 8 %>
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index 0053849a3..936e513f5 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -15,7 +15,7 @@
             <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#","c"]), :id => 'branch', :class => "analysis-option-box" %>
           </div>
         </div>
-        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-indicator').text('正在分析中…………(大概需要30分钟，请耐心等待)').show();$('#quality_analyses_form').submit();hideModal()">提交</a></div>
+        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-indicator').css('opacity','0.8').text('正在分析中…………(大概需要30分钟，请耐心等待)').show();$('#quality_analyses_form').submit();hideModal()">提交</a></div>
         <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
         <div class="cl"></div>
       </div>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 05f25822b..823d0c1ad 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,17 +1,11 @@
-<%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
+<%#= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <% unless @entries.nil? %>
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-      <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
-      <%# if User.current.member_of?(@project) %>
       <% if quality_analysis(User.current.try(:login), @repository.id).nil? && User.current.member_of?(@project) && @project.is_public? %>
         <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
       <% end %>
-      <%# end %>
-      <%# else %>
-      <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
-      <%# end %>
   <% end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
@@ -23,29 +17,29 @@
               该版本库还没有上传代码!
             </div>
         <% end %>
-        <% if @repository.type.to_s=="Repository::Gitlab" %>
+        <% if @repository.type.to_s == "Repository::Gitlab" %>
             版本库地址：<%= @repos_url %>
         <% else %>
             版本库地址：<%= h @repository.url %>
         <% end %>
-        <!-- added by bai -->
         <div class="cl"></div>
       </div>
   <% else %>
       <%= render :partial => 'navigation' %>
       <div class="fl c_grey02 mt5 mr5">克隆网址:</div>
-      <textarea id="copy_rep_content" class="cloneUrl mt5 fl" type="input" ><%= @repository.type.to_s=="Repository::Gitlab" ? @repos_url.to_s.lstrip : @repository.url %></textarea>
+      <textarea id="copy_rep_content" class="cloneUrl mt5 fl" type="input" ><%= @repos_url.to_s.lstrip %></textarea>
       <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
       <div class="fl mt5 ml15">
         <%=link_to "代码统计", stats_repository_project_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :creator => @creator, :default_branch => @g_default_branch ), :class => "fl vl_zip" %>
       </div>
-      <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
+
       <% if User.current.id != @project.user_id %>
           <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :target => "_blank", :confirm=>"平台将为您创建一个新的同名项目和版本库，请问是否继续？" %>
             <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span>
           </div>
       <% end %>
       <div class="cl"></div>
+
       <div class="recordBanner mt10">
         <% if @changesets && !@changesets.empty? %>
             <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
@@ -71,24 +65,14 @@
       </div>
   <% end %>
 
-<!--contextual end-->
-
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
-    <%# 数据统计 %>
-    <%#= render :partial => 'summary' %>
-    <%# end %>
     <%= render :partial => 'dir_list' %>
 <% end %>
-<%#= render_properties(@properties) %>
-
-<!-- 代码修订 -->
-<%#= render_properties(@properties) %>
-
 
 <a href="https://<%=Setting.host_name %>/forums/1/memos/1232" >如何提交代码</a>
 </div>
-<% content_for :header_tags do %>
-    <%= stylesheet_link_tag "scm" %>
-<% end %>
+<%# content_for :header_tags do %>
+    <%#= stylesheet_link_tag "scm" %>
+<%# end %>
 
 <% html_title(l(:label_repository)) -%>
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 9875a4cc6..55e1b57c1 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,32 +1,31 @@
 <table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
-    <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
+    <th class="hworkList40 hworkH30 pl5 pr5">序号</th>
     <th class="hworkList50">&nbsp;</th>
     <% if @homework.homework_type != 3 %>
-        <th class="<%= @homework.homework_type == 2 ? 'hworkList210' : 'hworkList260' %> hide-text" style="text-align:left;">作品名称</th>
-        <th class="hworkList80 hide-text">
+        <th class="<%= @homework.homework_type == 2 ? 'hworkList160' : 'hworkList200' %> hide-text">
           <span class="HomeworkStuTitle f14 fb">姓名</span>
         </th>
-        <th class="hworkList80 hide-text">
+        <th class="<%= @homework.homework_type == 2 ? 'hworkList160' : 'hworkList190' %> hide-text">
           <span class="HomeworkStuTitle f14 fb">学号</span>
         </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <th class="hworkList260" style="text-align:left;">作品名称</th>
+        <th class="hworkList230" style="text-align:left;">组长</th>
         <th class="hworkList160">
           <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
         </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-        <th class="hworkList420" style="text-align:left;">作品名称</th>
+        <th class="hworkList390" style="text-align:left;">组长</th>
     <% end %>
     <th class="hworkList130 pl10">
-      时间
+      状态
     </th>
     <% if @homework.homework_type == 2%>
-        <th class="hworkList50">
+        <th class="hworkList70">
           系统
         </th>
     <% end%>
-    <th class="hworkList50 pr10 pl10" style="font-size:12px;">
+    <th class="hworkList70 pr10 pl10" style="font-size:12px;">
       我的评分
     </th>
   </tr>
diff --git a/app/views/student_work/_evaluation_un_common_title.html.erb b/app/views/student_work/_evaluation_un_common_title.html.erb
new file mode 100644
index 000000000..6f8d4800a
--- /dev/null
+++ b/app/views/student_work/_evaluation_un_common_title.html.erb
@@ -0,0 +1,48 @@
+<tr class="b_grey hworkH30">
+  <th class="hworkList40 hworkH30 pl5 pr5">序号</th>
+  <th class="hworkList50">&nbsp;</th>
+  <th class="<%= @homework.anonymous_comment == 1 ? 'hworkList130' : 'hworkList100' %>  pl5 pr5 hide-text">
+    <%= link_to "姓名", @show_all ? student_work_index_path(:homework => @homework.id, :order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "lastname" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "lastname", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="<%= @homework.anonymous_comment == 1 ? 'hworkList130' : 'hworkList90' %>  pl5 pr5 hide-text">
+    <%= link_to "学号", @show_all ? student_work_index_path(:homework => @homework.id, :order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "student_id" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "student_id", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="hworkList130">
+    <%= link_to "时间", @show_all ? student_work_index_path(:homework => @homework.id, :order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "created_at" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "created_at", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="hworkList70">
+    <%= link_to "教师", @show_all ? student_work_index_path(:homework => @homework.id, :order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "teacher_score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "teacher_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="hworkList70">
+    <%= link_to "教辅", @show_all ? student_work_index_path(:homework => @homework.id, :order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "teaching_asistant_score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <% if @homework.anonymous_comment == 0 %>
+      <th class="hworkList70">
+        <%= link_to "匿评", @show_all ? student_work_index_path(:homework => @homework.id, :order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+        <% if @show_all && @order == "student_score" %>
+            <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "student_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+        <% end %>
+      </th>
+  <% end %>
+  <th class="hworkList70">
+    <%= link_to "成绩", @show_all ? student_work_index_path(:homework => @homework.id, :order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+</tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_common_work.html.erb b/app/views/student_work/_evaluation_un_common_work.html.erb
new file mode 100644
index 000000000..73accd2cb
--- /dev/null
+++ b/app/views/student_work/_evaluation_un_common_work.html.erb
@@ -0,0 +1,79 @@
+<tr class="hworkListRow" id="student_work_<%= student_work.id %>">
+  <td class="none"><a name="<%= student_work.id %>"></a></td>
+  <td class="hworkList40 pl5 pr5" id="work_num_<%= student_work.id %>"><%= index + 1 %></td>
+  <td class="hworkPortrait pr10 float-none">
+    <%= link_to(image_tag(url_to_avatar(student_work.user), :width => "40", :height => "40", :style => "display:block;"), user_activities_path(student_work.user)) %>
+  </td>
+  <td class="<%= @homework.anonymous_comment == 1 ? 'hworkStName130' : 'hworkStName100' %> pr10 float-none student_work_<%= student_work.id %>" title="<%= student_work.user.show_name %>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+    <%= student_work.user.show_name %>
+  </td>
+  <td class="<%= @homework.anonymous_comment == 1 ? 'hworkStName130' : 'hworkStID90' %> pr10 float-none student_work_<%= student_work.id %>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+    <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
+  </td>
+  <td class="hworkList130 c_grey student_work_<%= student_work.id %>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <% if student_work.created_at && @homework.end_time %>
+        <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M") %>&nbsp;
+        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
+            <span class="c_red">[迟交]</span>
+        <% end %>
+    <% end %>
+  </td>
+  <td class="hworkList70 <%= score_color student_work.teacher_score %>">
+    <%= student_work.teacher_score.nil? ? "--" : format("%.1f", student_work.teacher_score) %>
+  </td>
+  <td class="hworkList70 <%= score_color student_work.teaching_asistant_score %>">
+    <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f", student_work.teaching_asistant_score) %>
+  </td>
+  <% if @homework.anonymous_comment == 0 %>
+      <td class="hworkList70 <%= score_color student_work.student_score %> student_score_info">
+        <% if student_work.student_score.nil? %>
+            <span title="该作品未被匿评">未参与</span>
+        <% else %>
+            <%= format("%.1f", student_work.student_score) %>
+        <% end %>
+        <% unless student_work.student_score.nil? %>
+        <span class="linkBlue">
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>)
+        </span>
+
+            <div class="infoNi none">
+              现共有
+              <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>&nbsp;</span>
+              名学生进行了匿评，平均分为
+              <span class="c_red">&nbsp;<%= format("%.1f", student_work.student_score) %>&nbsp;</span>分。
+            </div>
+        <% end %>
+      </td>
+  <% end %>
+  <!-- 成绩 -->
+  <% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %>
+      <% score = student_work.respond_to?("score") ? student_work.score : student_work.teacher_score %>
+  <% else %>
+      <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty %>
+  <% end %>
+  <td class="hworkList70 <%= score_color score %> student_final_scor_info">
+    <%= score.nil? ? "--" : format("%.1f", score<0 ? 0 : score) %>
+    <% unless score.nil? %>
+        <div class="infoNi none width180">
+          作品最终评分为
+          <span class="c_red">&nbsp;<%= student_work.final_score %>&nbsp;</span>分。
+          迟交扣分
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
+            &nbsp;</span>分，
+          缺评扣分
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty %>
+            &nbsp;</span>分，
+          最终成绩为
+          <span class="c_red">&nbsp;<%= format("%.1f", score<0 ? 0 : score) %>&nbsp;</span>分。
+        </div>
+    <% end %>
+  </td>
+  <td>
+    <div style="position:relative;">
+      <div class="hworkTip" style="display: none" id="work_click_<%= student_work.id %>">
+        <em></em><span></span><font class="fontGrey2">点击查看详情</font></div>
+    </div>
+  </td>
+</tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_group_title.html.erb b/app/views/student_work/_evaluation_un_group_title.html.erb
new file mode 100644
index 000000000..cb69c0fc2
--- /dev/null
+++ b/app/views/student_work/_evaluation_un_group_title.html.erb
@@ -0,0 +1,44 @@
+<tr class="b_grey hworkH30">
+  <th class="hworkList40 hworkH30 pl5 pr5">序号</th>
+  <th class="hworkList50">&nbsp;</th>
+  <% if @homework.homework_detail_group.base_on_project == 1 %>
+      <th class="hworkList130  pl5 pr5" style="text-align:left;">组长</th>
+      <th class="<%= @homework.anonymous_comment == 1 ? 'hworkList140' : 'hworkList70' %>">
+        <span class="c_dark f14 fb">关联项目</span>
+      </th>
+  <% elsif @homework.homework_detail_group.base_on_project == 0 %>
+      <th class="<%= @homework.anonymous_comment == 1 ? 'hworkList270' : 'hworkList200' %>  pl5 pr5" style="text-align:left;">组长</th>
+  <% end %>
+  <th class="hworkList130">
+    <%= link_to "时间", @show_all ? student_work_index_path(:homework => @homework.id, :order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "created_at" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "created_at", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="hworkList70">
+    <%= link_to "教师", @show_all ? student_work_index_path(:homework => @homework.id, :order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "teacher_score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "teacher_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="hworkList70">
+    <%= link_to "教辅", @show_all ? student_work_index_path(:homework => @homework.id, :order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "teaching_asistant_score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <% if @homework.anonymous_comment == 0 %>
+      <th class="hworkList70">
+        <%= link_to "匿评", @show_all ? student_work_index_path(:homework => @homework.id, :order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+        <% if @show_all && @order == "student_score" %>
+            <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "student_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+        <% end %>
+      </th>
+  <% end %>
+  <th class="hworkList70">
+    <%= link_to "成绩", @show_all ? student_work_index_path(:homework => @homework.id, :order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+</tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb
new file mode 100644
index 000000000..b4337eeb2
--- /dev/null
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@@ -0,0 +1,89 @@
+<tr class="hworkListRow" id="student_work_<%= student_work.id%>">
+  <td class="none"><a name="<%= student_work.id%>"></a></td>
+  <td class="hworkList40 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
+  <td class="hworkPortrait pr10 float-none">
+    <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
+  </td>
+  <% if @homework.homework_detail_group.base_on_project == 1 %>
+      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width130" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+        <div>
+          <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+        </div>
+      </td>
+      <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+          <td  class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="项目名称">
+            <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+          </td>
+      <% else %>
+          <td class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="该项目是私有的">
+            <%= student_work.project.name %>
+          </td>
+      <% end %>
+  <% elsif @homework.homework_detail_group.base_on_project == 0 %>
+      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%=@homework.anonymous_comment == 1 ? 'width280' : 'width210' %>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+        <div>
+          <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+        </div>
+      </td>
+  <% end %>
+  <td class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <% if student_work.created_at && @homework.end_time%>
+        <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
+            <span class="c_red">[迟交]</span>
+        <% end %>
+    <% end %>
+  </td>
+  <td class="hworkList70 <%= score_color student_work.teacher_score%>">
+    <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
+  </td>
+  <td class="hworkList70 <%= score_color student_work.teaching_asistant_score%>">
+    <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
+  </td>
+  <% if @homework.anonymous_comment == 0%>
+      <td class="hworkList70 <%= score_color student_work.student_score%> student_score_info">
+        <% if student_work.student_score.nil? %>
+            <span title="该作品未被匿评">未参与</span>
+        <% else %>
+            <%=format("%.1f",student_work.student_score) %>
+        <% end %>
+        <% unless student_work.student_score.nil?%>
+        <span class="linkBlue">
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>)
+        </span>
+            <div class="infoNi none">
+              现共有
+              <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>&nbsp;</span>
+              名学生进行了匿评，平均分为
+              <span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
+            </div>
+        <% end%>
+      </td>
+  <% end %>
+  <!-- 成绩 -->
+  <% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %>
+      <% score = student_work.respond_to?("score") ? student_work.score : student_work.teacher_score %>
+  <% else %>
+      <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
+  <% end %>
+  <td class="hworkList70 <%= score_color score%> student_final_scor_info">
+    <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
+    <% unless score.nil?%>
+        <div class="infoNi none width180">
+          作品最终评分为
+          <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
+          迟交扣分
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
+            &nbsp;</span>分，
+          缺评扣分
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%>
+            &nbsp;</span>分，
+          最终成绩为
+          <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
+        </div>
+    <% end%>
+  </td>
+  <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
+</tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_pro_title.html.erb b/app/views/student_work/_evaluation_un_pro_title.html.erb
new file mode 100644
index 000000000..86c102a4d
--- /dev/null
+++ b/app/views/student_work/_evaluation_un_pro_title.html.erb
@@ -0,0 +1,55 @@
+<tr class="b_grey hworkH30">
+  <th class="hworkList40 hworkH30 pl5 pr5">序号</th>
+  <th class="hworkList50">&nbsp;</th>
+  <th class="<%= @homework.anonymous_comment == 1 ? 'hworkList110' : 'hworkList60' %>  pl5 pr5 hide-text">
+    <%= link_to "姓名", @show_all ? student_work_index_path(:homework => @homework.id, :order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "lastname" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "lastname", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="<%= @homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList80' %>  pl5 pr5 hide-text">
+    <%= link_to "学号", @show_all ? student_work_index_path(:homework => @homework.id, :order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "student_id" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "student_id", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+
+  <th class="hworkList110">
+    <%= link_to "时间", @show_all ? student_work_index_path(:homework => @homework.id, :order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "created_at" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "created_at", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="hworkList70">
+    <%= link_to "教师", @show_all ? student_work_index_path(:homework => @homework.id, :order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "teacher_score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "teacher_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="hworkList70">
+    <%= link_to "教辅", @show_all ? student_work_index_path(:homework => @homework.id, :order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "teaching_asistant_score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <th class="hworkList70">
+    <%= link_to "系统", @show_all ? student_work_index_path(:homework => @homework.id, :order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "system_score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "system_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+  <% if @homework.anonymous_comment == 0 %>
+      <th class="hworkList70">
+        <%= link_to "匿评", @show_all ? student_work_index_path(:homework => @homework.id, :order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+        <% if @show_all && @order == "student_score" %>
+            <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "student_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+        <% end %>
+      </th>
+  <% end %>
+  <th class="hworkList70">
+    <%= link_to "成绩", @show_all ? student_work_index_path(:homework => @homework.id, :order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+    <% if @show_all && @order == "score" %>
+        <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+    <% end %>
+  </th>
+</tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_pro_work.html.erb b/app/views/student_work/_evaluation_un_pro_work.html.erb
new file mode 100644
index 000000000..0aed8f708
--- /dev/null
+++ b/app/views/student_work/_evaluation_un_pro_work.html.erb
@@ -0,0 +1,83 @@
+<tr class="hworkListRow" id="student_work_<%= student_work.id %>">
+  <td class="none"><a name="<%= student_work.id %>"></a></td>
+  <td class="hworkList40 pl5 pr5" id="work_num_<%= student_work.id %>"><%= index + 1 %></td>
+  <td class="hworkPortrait pr10 float-none">
+    <%= link_to(image_tag(url_to_avatar(student_work.user), :width => "40", :height => "40", :style => "display:block;"), user_activities_path(student_work.user)) %>
+  </td>
+  <td class="<%= @homework.anonymous_comment == 1 ? 'hworkStName110' : 'hworkStName' %> pr10 float-none student_work_<%= student_work.id %>" title="<%= student_work.user.show_name %>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+    <%= student_work.user.show_name %>
+  </td>
+  <td class="<%= @homework.anonymous_comment == 1 ? 'hworkStID100' : 'hworkStID' %> pr10 float-none student_work_<%= student_work.id %>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+    <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
+  </td>
+  <td class="hworkList110 c_grey student_work_<%= student_work.id %>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <% if student_work.created_at && @homework.end_time %>
+        <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M") %>&nbsp;
+        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
+            <span class="c_red">[迟交]</span>
+        <% end %>
+    <% end %>
+  </td>
+  <td class="hworkList70 <%= score_color student_work.teacher_score %>">
+    <%= student_work.teacher_score.nil? ? "--" : format("%.1f", student_work.teacher_score) %>
+  </td>
+  <td class="hworkList70 <%= score_color student_work.teaching_asistant_score %>">
+    <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f", student_work.teaching_asistant_score) %>
+  </td>
+  <!-- 系统评分 -->
+  <td class="hworkList70 <%= score_color student_work.system_score %>">
+    <%= student_work.system_score.nil? ? "--" : format("%.1f", student_work.system_score) %>
+  </td>
+  <% if @homework.anonymous_comment == 0 %>
+      <td class="hworkList70 <%= score_color student_work.student_score %> student_score_info">
+        <% if student_work.student_score.nil? %>
+            <span title="该作品未被匿评">未参与</span>
+        <% else %>
+            <%= format("%.1f", student_work.student_score) %>
+        <% end %>
+        <% unless student_work.student_score.nil? %>
+        <span class="linkBlue">
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>)
+        </span>
+
+            <div class="infoNi none">
+              现共有
+              <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>&nbsp;</span>
+              名学生进行了匿评，平均分为
+              <span class="c_red">&nbsp;<%= format("%.1f", student_work.student_score) %>&nbsp;</span>分。
+            </div>
+        <% end %>
+      </td>
+  <% end %>
+  <!-- 成绩 -->
+  <% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %>
+      <% score = student_work.respond_to?("score") ? student_work.score : student_work.teacher_score %>
+  <% else %>
+      <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty %>
+  <% end %>
+  <td class="hworkList70 <%= score_color score %> student_final_scor_info">
+    <%= score.nil? ? "--" : format("%.1f", score<0 ? 0 : score) %>
+    <% unless score.nil? %>
+        <div class="infoNi none width180">
+          作品最终评分为
+          <span class="c_red">&nbsp;<%= student_work.final_score %>&nbsp;</span>分。
+          迟交扣分
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
+            &nbsp;</span>分，
+          缺评扣分
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty %>
+            &nbsp;</span>分，
+          最终成绩为
+          <span class="c_red">&nbsp;<%= format("%.1f", score<0 ? 0 : score) %>&nbsp;</span>分。
+        </div>
+    <% end %>
+  </td>
+  <td>
+    <div style="position:relative;">
+      <div class="hworkTip" style="display: none" id="work_click_<%= student_work.id %>">
+        <em></em><span></span><font class="fontGrey2">点击查看详情</font></div>
+    </div>
+  </td>
+</tr>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 1b3683506..4fdd6384f 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,77 +1,86 @@
 <table class="hwork-table-wrap" id="homework_table">
-  <tr class="b_grey hworkH30">
-    <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
-    <th class="hworkList50">&nbsp;</th>
-    <% if @homework.homework_type != 3 %>
-      <th class="<%= @homework.homework_type == 2 ? 'hworkList80 pl5 pr5 hide-text' : 'hworkList130  pl5 pr5 hide-text'%>" style="text-align:left;">作品名称</th>
-      <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%>  pl5 pr5 hide-text">
-      <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb" ,:remote => true%>
-      <% if @show_all && @order == "lastname"%>
-          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none" ,:style => "line-height:30px; vertical-align:middle;",:remote => true%>
-      <% end%>
-    </th>
-    <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%>  pl5 pr5 hide-text">
-      <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb" ,:remote => true%>
-      <% if @show_all && @order == "student_id"%>
-          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none" ,:style => "line-height:30px; vertical-align:middle;",:remote => true%>
-      <% end%>
-    </th>
-    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <th class="hworkList130  pl5 pr5" style="text-align:left;">作品名称</th>
-        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList210' : 'hworkList160'%>">
-          <span class="c_dark f14 fb">关联项目</span>
+  <%# if @homework.homework_type == 1 %>
+      <%#= render :partial => 'evaluation_un_common_title' %>
+  <%# elsif @homework.homework_type == 2 %>
+      <%#= render :partial => 'evaluation_un_pro_title' %>
+  <%# elsif @homework.homework_type == 3 %>
+      <%#= render :partial => 'evaluation_un_group_title' %>
+  <%# else %>
+      <tr class="b_grey hworkH30">
+        <th class="hworkList40 hworkH30 pl5 pr5">序号</th>
+        <th class="hworkList50">&nbsp;</th>
+        <% if @homework.homework_type != 3 %>
+            <th class="<%= @homework.homework_type == 1 ? (@homework.anonymous_comment == 1 ? 'hworkList130' : 'hworkList100') : (@homework.anonymous_comment == 1 ? 'hworkList110' : 'hworkList60') %> pl5 pr5 hide-text">
+              <%= link_to "姓名", @show_all ? student_work_index_path(:homework => @homework.id, :order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+              <% if @show_all && @order == "lastname" %>
+                  <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "lastname", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+              <% end %>
+            </th>
+            <th class="<%= @homework.homework_type == 1 ? (@homework.anonymous_comment == 1 ? 'hworkList130' : 'hworkList90') : (@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList80') %> pl5 pr5 hide-text">
+              <%= link_to "学号", @show_all ? student_work_index_path(:homework => @homework.id, :order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+              <% if @show_all && @order == "student_id" %>
+                  <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "student_id", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+              <% end %>
+            </th>
+        <% else %>
+            <% if @homework.homework_detail_group.base_on_project == 1 %>
+                <th class="hworkList130  pl5 pr5" style="text-align:left;">组长</th>
+                <th class="<%= @homework.anonymous_comment == 1 ? 'hworkList140' : 'hworkList70' %>">
+                  <span class="c_dark f14 fb">关联项目</span>
+                </th>
+            <% elsif @homework.homework_detail_group.base_on_project == 0 %>
+                <th class="<%= @homework.anonymous_comment == 1 ? 'hworkList270' : 'hworkList200' %>  pl5 pr5" style="text-align:left;">组长</th>
+            <% end %>
+        <% end %>
+        <th class="<%= @homework.homework_type ==2 ? 'hworkList110' : 'hworkList130' %>">
+          <%= link_to "状态", @show_all ? student_work_index_path(:homework => @homework.id, :order => "work_status", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+          <% if @show_all && @order == "work_status" %>
+              <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "work_status", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+          <% end %>
         </th>
-    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList340' : 'hworkList290' %>  pl5 pr5" style="text-align:left;">作品名称</th>
-    <% end %>
-    <th class="hworkList130">
-      <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb" ,:remote => true%>
-      <% if @show_all && @order == "created_at"%>
-          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",:remote => true%>
-      <% end%>
-    </th>
-    <th class="hworkList50">
-      <%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb" ,:remote => true%>
-      <% if @show_all && @order == "teacher_score"%>
-          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none" ,:style => "line-height:30px; vertical-align:middle;",:remote => true%>
-      <% end%>
-    </th>
-    <th class="hworkList50">
-      <%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb",:remote => true%>
-      <% if @show_all && @order == "teaching_asistant_score"%>
-          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",:remote => true%>
-      <% end%>
-    </th>
-    <% if @homework.homework_type == 2%>
-        <th class="hworkList50">
-          <%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb",:remote => true%>
-          <% if @show_all && @order == "system_score"%>
-              <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",:remote => true%>
-          <% end%>
+        <th class="hworkList70">
+          <%= link_to "教师", @show_all ? student_work_index_path(:homework => @homework.id, :order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+          <% if @show_all && @order == "teacher_score" %>
+              <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "teacher_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+          <% end %>
         </th>
-    <% end%>
-    <% if @homework.anonymous_comment == 0%>
-        <th class="hworkList50">
-          <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb",:remote => true%>
-          <% if @show_all && @order == "student_score"%>
-              <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",:remote => true%>
-          <% end%>
+        <th class="hworkList70">
+          <%= link_to "教辅", @show_all ? student_work_index_path(:homework => @homework.id, :order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+          <% if @show_all && @order == "teaching_asistant_score" %>
+              <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+          <% end %>
         </th>
-    <% end %>
-    <th class="hworkList50">
-      <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb",:remote => true%>
-      <% if @show_all && @order == "score"%>
-          <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none",:style => "line-height:30px; vertical-align:middle;",:remote => true%>
-      <% end%>
-    </th>
-  </tr>
-  <% @stundet_works.each_with_index do |student_work, i|%>
-          <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work, :index => i}%>
+        <% if @homework.homework_type == 2 %>
+            <th class="hworkList70">
+              <%= link_to "系统", @show_all ? student_work_index_path(:homework => @homework.id, :order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+              <% if @show_all && @order == "system_score" %>
+                  <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "system_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+              <% end %>
+            </th>
+        <% end %>
+        <% if @homework.anonymous_comment == 0 %>
+            <th class="hworkList70">
+              <%= link_to "匿评", @show_all ? student_work_index_path(:homework => @homework.id, :order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+              <% if @show_all && @order == "student_score" %>
+                  <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "student_score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+              <% end %>
+            </th>
+        <% end %>
+        <th class="hworkList70">
+          <%= link_to "成绩", @show_all ? student_work_index_path(:homework => @homework.id, :order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)", :class => "c_dark f14 fb", :remote => true %>
+          <% if @show_all && @order == "score" %>
+              <%= link_to "", student_work_index_path(:homework => @homework.id, :order => "score", :sort => @score, :name => @name, :group => @group), :class => "#{@score == 'desc' ? 'sort_up' : 'sort_down'} float-none", :style => "line-height:30px; vertical-align:middle;", :remote => true %>
+          <% end %>
+        </th>
+      </tr>
+  <%# end %>
+  <% @stundet_works.each_with_index do |student_work, i| %>
+      <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work, :index => i} %>
       <tr>
         <td colspan="12">
-          <div id="about_hwork_<%= student_work.id%>">
+          <div id="about_hwork_<%= student_work.id %>">
           </div>
         </td>
       </tr>
-  <% end%>
+  <% end %>
 </table>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 93c800879..ed0ba5542 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -1,71 +1,69 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
+<%# if @homework.homework_type == 1 %>
+    <%#= render :partial => 'evaluation_un_common_work', :locals => {:student_work => student_work, :index => index} %>
+<%# elsif @homework.homework_type == 2 %>
+    <%#= render :partial => 'evaluation_un_pro_work', :locals => {:student_work => student_work, :index => index} %>
+<%# elsif @homework.homework_type == 3 %>
+    <%#= render :partial => 'evaluation_un_group_work', :locals => {:student_work => student_work, :index => index} %>
+<%# else %>
 <tr class="hworkListRow" id="student_work_<%= student_work.id%>">
   <td class="none"><a name="<%= student_work.id%>"></a></td>
-  <td class="hworkList30 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
+  <td class="hworkList40 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
   <td class="hworkPortrait pr10 float-none">
     <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
   </td>
   <% if @homework.homework_type != 3 %>
-      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%= @homework.homework_type == 2 ? '' : 'width130'%>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
-        <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-        <div>
-          <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
-        </div>
-      </td>
-        <td class="<%=@homework.anonymous_comment == 1 ? 'hworkStName100' : 'hworkStName'%> pr10 float-none student_work_<%= student_work.id%>" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+        <td class="<%= @homework.homework_type == 1 ? (@homework.anonymous_comment == 1 ? 'hworkStName130' : 'hworkStName100') : (@homework.anonymous_comment == 1 ? 'hworkStName110' : 'hworkStName') %> pr10 float-none student_work_<%= student_work.id%>" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
           <%= student_work.user.show_name%>
         </td>
-        <td class="<%=@homework.anonymous_comment == 1 ? 'hworkStID90' : 'hworkStID'%> pr10 float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+        <td class="<%= @homework.homework_type == 1 ? (@homework.anonymous_comment == 1 ? 'hworkStName130' : 'hworkStID90') : (@homework.anonymous_comment == 1 ? 'hworkStID100' : 'hworkStID') %> pr10 float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
           <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
         </td>
-  <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width130" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
-        <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-        <div>
-          <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
-        </div>
-      </td>
-        <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
-            <td  class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="项目名称">
-              <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
-            </td>
-        <% else %>
-            <td class="hworkPrName student_work_<%= student_work.id%>" title="该项目是私有的">
-              <%= student_work.project.name %>
-            </td>
-        <% end %>
-  <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%=@homework.anonymous_comment == 1 ? 'width340' : 'width290' %>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
-        <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-        <div>
-          <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
-        </div>
-      </td>
+  <% else %>
+      <% if @homework.homework_detail_group.base_on_project == 1 %>
+          <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width130" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+            <div>
+              <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "StudentName break_word"%>
+            </div>
+          </td>
+          <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+              <td  class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="项目名称">
+                <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+              </td>
+          <% else %>
+              <td class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="该项目是私有的">
+                <%= student_work.project.name %>
+              </td>
+          <% end %>
+      <% elsif @homework.homework_detail_group.base_on_project == 0 %>
+          <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%=@homework.anonymous_comment == 1 ? 'width280' : 'width210' %>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+            <div>
+              <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+            </div>
+          </td>
+      <% end %>
   <% end %>
-  <td class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-    <% if student_work.created_at && @homework.end_time%>
-        <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
-            <span class="c_red">[迟交]</span>
-        <% end %>
+  <td class="<%= @homework.homework_type ==2 ? 'hworkList110' : 'hworkList130' %> c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <% if student_work.work_status%>
+        <%=get_status student_work.work_status %>
     <% end %>
   </td>
-  <td class="hworkList50 <%= score_color student_work.teacher_score%>">
+  <td class="hworkList70 <%= score_color student_work.teacher_score%>">
     <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
   </td>
-  <td class="hworkList50 <%= score_color student_work.teaching_asistant_score%>">
+  <td class="hworkList70 <%= score_color student_work.teaching_asistant_score%>">
     <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
   </td>
 
   <% if @homework.homework_type == 2%>
       <!-- 系统评分 -->
-      <td class="hworkList50 <%= score_color student_work.system_score%>">
+      <td class="hworkList70 <%= score_color student_work.system_score%>">
         <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
       </td>
   <% end%>
 
   <% if @homework.anonymous_comment == 0%>
-    <td class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
+    <td class="hworkList70 <%= score_color student_work.student_score%> student_score_info">
       <% if student_work.student_score.nil? %>
         <span title="该作品未被匿评">未参与</span>
       <% else %>
@@ -90,7 +88,7 @@
   <% else %>
     <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
   <% end %>
-  <td class="hworkList50 <%= score_color score%> student_final_scor_info">
+  <td class="hworkList70 <%= score_color score%> student_final_scor_info">
     <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
     <% unless score.nil?%>
         <div class="infoNi none width180">
@@ -111,6 +109,7 @@
   </td>
   <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
 </tr>
+<%# end %>
 <script type="text/javascript">
     $(".student_work_<%= student_work.id%>").mouseenter(function(){
         if($("#about_hwork_<%= student_work.id%>").html().trim() == "") {
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index ba017af5f..6a7a69e36 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -9,28 +9,21 @@
   <% end %>
 
   <% if is_my_work%>
-      <td class="hworkList30 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
+      <td class="hworkList40 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
       <td class="hworkPortrait pr10 float-none">
         <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40", style: "display:block;") %>
       </td>
         <% if @homework.homework_type != 3 %>
-          <td class="hworkName pr10 w250 float-none student_work_<%= student_work.id%>">
-            <div>
-              <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
-            </div>
-          </td>
-          <td class="hworkStName float-none w80 student_work_<%= student_work.id%>" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+          <td class="hworkStName float-none <%= @homework.homework_type == 2 ? 'w180' : 'w190' %> student_work_<%= student_work.id%>" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             <%= student_work.user.show_name%>
           </td>
-          <td class="hworkStID float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-            <span class="hidden fl" style="width:80px;"><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%></span>
+          <td class="hworkStID <%= @homework.homework_type == 2 ? 'w180' : 'w190' %> float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            <span class="hidden"><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%></span>
           </td>
         <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-          <td class="hworkName pr10 w250 float-none student_work_<%= student_work.id%>">
+          <td class="hworkName pr10 w220 float-none student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');">
             <div>
-              <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+              <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word"%>
             </div>
           </td>
             <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
@@ -43,53 +36,53 @@
               </td>
             <% end %>
       <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-          <td class="hworkName pr10 w410 float-none student_work_<%= student_work.id%>">
+          <td class="hworkName pr10 w380 float-none student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');">
             <div>
-              <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+              <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word"%>
             </div>
           </td>
         <% end %>
   <% else%>
-      <td class="hworkList30 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
+      <td class="hworkList40 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
       <td class="hworkPortrait float-none pr10">
         <%= image_tag(url_to_avatar(""),width:"40", height: "40", style: "display:block;") %>
       </td>
-      <td class="hworkName float-none pr10 w250 student_work_<%= student_work.id%>">
-        <div>
-          <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
-        </div>
-      </td>
       <% if @homework.homework_type != 3 %>
-          <td class="hworkStName float-none w80" title="姓名" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+          <td class="hworkStName float-none <%= @homework.homework_type == 2 ? 'w180' : 'w190' %>" title="姓名" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             匿名
           </td>
-          <td class="hworkStID float-none" title="学号">
+          <td class="hworkStID <%= @homework.homework_type == 2 ? 'w180' : 'w190' %> float-none" title="学号">
             --
           </td>
       <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-          <td class="hworkPrName mr10 float-none" title="项目名称" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+          <td class="hworkName pr10 w220 float-none student_work_<%= student_work.id%>">
+            <div style="text-align: left">匿名</div>
+          </td>
+           <td class="hworkPrName float-none mr10 student_work_<%= student_work.id%>" title="">
+             匿名
+           </td>
+      <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
+          <td class="hworkPrName mr10 float-none" title="" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer; text-align: left;">
             匿名
           </td>
       <% end %>
   <% end%>
   <td class="hworkList130 pl10 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
-        <span class="c_red">[迟交]</span>
+    <% if student_work.work_status%>
+        <%=get_status student_work.work_status %>
     <% end %>
   </td>
 
   <!-- 成绩 -->
   <% if @homework.homework_type == 2%>
       <!-- 系统评分 -->
-      <td class="hworkList50 <%= score_color student_work.system_score%>">
+      <td class="hworkList70 <%= score_color student_work.system_score%>">
         <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
       </td>
   <% end%>
 
   <% my_score = student_work_score(student_work,User.current) %>
-  <td class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10">
+  <td class="hworkList70 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </td>
   <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index c4df9e715..c111fbe48 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -26,7 +26,7 @@
 
         <li >
           <span class="tit_fb ">编程代码：</span>
-          <div class="showHworkP break_word"><pre id="work-src_<%= work.id%>" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
+          <div class="showHworkP break_word"><pre id="work-src_<%= work.id%>" style="display: none;"><%= work.description ? work.description : "该作品尚未提交相关内容。"%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
             </div>
           </div>
           <div class="cl"></div>
diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb
index fb85f76ea..9ecc35319 100644
--- a/app/views/syllabuses/_syllabus_course_list.html.erb
+++ b/app/views/syllabuses/_syllabus_course_list.html.erb
@@ -12,7 +12,7 @@
           <%= 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 %>
       <% end %>
     </div>
-    <p class="fr grayTxt">创建老师：<%=@syllabus.user.show_name %><span class="mr10 "></span>  创建时间：<%=format_date @syllabus.created_at %></p>
+   <!-- <p class="fr grayTxt">创建老师：<%#=@syllabus.user.show_name %><span class="mr10 "></span>  创建时间：<%#=format_date @syllabus.created_at %></p> -->
     <div class="cl"></div>
   </div>
 
diff --git a/app/views/syllabuses/edit_syllabus_title.js.erb b/app/views/syllabuses/edit_syllabus_title.js.erb
new file mode 100644
index 000000000..70f1be362
--- /dev/null
+++ b/app/views/syllabuses/edit_syllabus_title.js.erb
@@ -0,0 +1,3 @@
+$("#syllabus_title_show").html("<%= escape_javascript render :partial => 'layouts/syllabus_title', :locals => {:syllabus => @syllabus} %>");
+$("#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 e3e6436b4..a47f3f81e 100644
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@@ -9,16 +9,12 @@
 <div class="RightBanner" >
 <p >课程信息</p>
 </div>
-<% if @syllabus.des_status == 1 && @syllabus.courses.empty? %>
+<% 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>
-      <% elsif User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
-          <p >本课程下还未创建班级，请
-            <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>
-          </p>
       <% else %>
           <p >本课程下还未创建班级，敬请期待。
           </p>
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index 4ced798d0..266a0b32b 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -1,9 +1,9 @@
 <div class="orig_user fl">
-<%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
+<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
 </div>
 <div class="orig_right fl">
-  <%= link_to comment.user.show_name, user_path(comment.user_id), :class => "content-username" %>
+  <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.created_on) %></span>
-  <div class="orig_content "><%= comment.notes.html_safe %></div>
+  <div class="orig_content "><%= comment.content_detail.html_safe %></div>
 </div>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index 5cb2c27a7..bdff80d33 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -46,12 +46,8 @@
                       发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
                   </span>
                   <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
-                  <% count=0 %>
-                  <% if activity.parent %>
-                      <% count=activity.parent.children.count%>
-                  <% else %>
-                      <% count=activity.children.count%>
-                  <% end %>
+                  <% all_comments = []%>
+                  <% count=get_all_children(all_comments, activity).count %>
                   <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
                 </div>
                 <div class="cl"></div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index cf8e782e6..783193e46 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -69,7 +69,7 @@
           <%= user_for_homework_common activity,is_teacher %>
         </div>
         <% work = cur_user_works_for_homework activity %>
-        <% if activity.end_time < Date.today && !is_teacher && !work.nil? %>
+        <% if activity.end_time < Date.today && !is_teacher && !work.nil? && work.user == User.current %>
             <div class="homepagePostSubmit">
                 <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
             </div>
@@ -134,8 +134,8 @@
         <% end %>
       </div>
       <div class="cl"></div>
-      <% if activity.student_works.count != 0 %>
-        <% sw = activity.student_works.reorder("created_at desc").first %>
+      <% if activity.student_works.has_committed.count != 0 %>
+        <% sw = activity.student_works.has_committed.reorder("created_at desc").first %>
         <div class="mt10 homepagePostDeadline mb10">
           #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
         </div>
@@ -156,9 +156,9 @@
         <div>
           <% if activity.homework_type != 2 %>
             <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-            <% student_works = activity.student_works.select("student_works.*,student_works.work_score as score").where("student_works.id in #{ids}").order("score desc") %>
+            <% student_works = activity.student_works.has_committed.select("student_works.*,student_works.work_score as score").where("student_works.id in #{ids}").order("score desc") %>
           <% else %>
-            <% student_works = activity.student_works.select("student_works.*,student_works.work_score as score").order("score desc") %>
+            <% student_works = activity.student_works.has_committed.select("student_works.*,student_works.work_score as score").order("score desc") %>
           <% end %>
           <% student_works.includes(:user).each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
@@ -195,8 +195,13 @@
             <% sort_projects = project_sort_update projects %>
             <div class="mt10 relatePWrap" id="relatePWrap_<%=user_activity_id %>">
               <div class="mr5 fontGrey2">
-                <% first_pro = project_sort_first(projects).first %>
-                #&nbsp;<%=time_from_now first_pro.updated_at %><%= link_to User.find(first_pro.user_id).show_name, user_activities_path(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
+                <%# first_pro = sort_projects.first %>
+                <% first_pro = Project.find sort_projects.first.project_id %>
+                <% commit_time = first_pro.project_score.commit_time %>
+                <% one_time = first_pro.updated_on %>
+                <% one_forge_time=ForgeActivity.where("project_id=?",first_pro.id).last.updated_at if ForgeActivity.where("project_id=?",first_pro.id).last %>
+                <% one_time= one_time > one_forge_time ? one_time : one_forge_time %>
+                #&nbsp;<%=time_from_now !commit_time.nil? && format_time(commit_time) > format_time(one_time) ? commit_time : one_time %><%= link_to User.find(first_pro.user_id).show_name, user_activities_path(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
               </div>
             <div class="cl"></div>
             <% sort_projects.each_with_index do |pro, i| %>
@@ -219,7 +224,8 @@
                 <% end %>
                 <% com_time = project.project_score.commit_time %>
                 <% time=project.updated_on %>
-                <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+                <% forge_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+                <% time= time > forge_time ? time : forge_time %>
                 <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
                 <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                 <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index d4db3df1f..70a7e6c7d 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -78,20 +78,18 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count=0 %>
-  <% if activity.parent %>
-      <% count=activity.parent.children.count%>
-  <% else %>
-      <% count=activity.children.count%>
-  <% end %>
+  <% 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/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    <%= 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} %>
 
-    <% activity= activity.parent ? activity.parent : activity%>
-    <% comments = activity.children.reorder("created_on desc").limit(3) %>
-    <%  if count > 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/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb
index 01ebb5cf9..c7d1157f9 100644
--- a/app/views/users/_join_course_course_message.html.erb
+++ b/app/views/users/_join_course_course_message.html.erb
@@ -18,7 +18,7 @@
   <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
   <p>申请课程：<%= Course.find(ma.course_id).name%></p>
   <div class="fl">课程描述：</div>
-  <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+  <div class="ml60"><%= Course.find(ma.course_id).description %></div>
   <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
 </div>
 <li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
diff --git a/app/views/users/_message_contents.html.erb b/app/views/users/_message_contents.html.erb
new file mode 100644
index 000000000..eab125006
--- /dev/null
+++ b/app/views/users/_message_contents.html.erb
@@ -0,0 +1,23 @@
+<% 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>
\ No newline at end of file
diff --git a/app/views/users/_message_replies.html.erb b/app/views/users/_message_replies.html.erb
new file mode 100644
index 000000000..c6f9d91b0
--- /dev/null
+++ b/app/views/users/_message_replies.html.erb
@@ -0,0 +1,61 @@
+<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, :is_course => is_course, :is_board => is_board},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :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) %>
+                      <%= 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),
+                                  :method => :post,
+                                  :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/_message_reply_banner.html.erb b/app/views/users/_message_reply_banner.html.erb
new file mode 100644
index 000000000..0c8cda379
--- /dev/null
+++ b/app/views/users/_message_reply_banner.html.erb
@@ -0,0 +1,18 @@
+<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/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index fe7bc03f2..3ba0244d9 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -46,12 +46,8 @@
                       发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
                   </span>
                   <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
-                  <% count=0 %>
-                  <% if activity.parent %>
-                      <% count=activity.parent.children.count%>
-                  <% else %>
-                      <% count=activity.children.count%>
-                  <% end %>
+                  <% all_comments = []%>
+                  <% count=get_all_children(all_comments, activity).count %>
                   <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
                 </div>
                 <div class="cl"></div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 1abc36a31..d1bb99296 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -77,20 +77,18 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count = 0 %>
-  <% if activity.parent %>
-      <% count=activity.parent.children.count%>
-  <% else %>
-      <% count=activity.children.count%>
-  <% end %>
+  <% 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/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    <%= 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} %>
 
-    <% activity= activity.parent_id.nil? ? activity : activity.parent %>
-    <% comments = activity.children.reorder("created_on desc").limit(3) %>
+    <% 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/all_replies', :locals => {:comments => comments}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 621b56fbd..8a2909ad4 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -16,7 +16,7 @@
                   <p nhname='contentmsg_<%= reply.id%>'></p>
               <% end%>
           <% elsif @type == 'JournalsForMessage' %>
-              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'create_reply', :id => reply.id}, :method => "post", :remote => true) do |f|%>
+              <%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => reply.id}, :method => "post", :remote => true) do |f|%>
                   <%= hidden_field_tag 'reference_id', params[:reference_id], :value => reply.id %>
                   <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => reply.user.id %>
                   <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => reply.id %>
@@ -28,6 +28,22 @@
                   <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>
               <% end%>
+          <% elsif @type == 'Message' %>
+              <%= form_for('new_form',:url => {:controller => 'messages', :action => 'reply', :id => reply.id, :board_id => reply.board.id}, :method => "post", :remote => true) do |f|%>
+                  <%= 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 %>
+                  <!--<input type="hidden" name="quote[quote]" id="quote_quote">
+                                    <input type="hidden" name="reply[subject]" id="reply_subject">-->
+                  <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%>'></p>
+              <% end%>
           <% end %>
         </div>
         <div class="cl"></div>
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 68c059a1d..47a84481b 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -8,7 +8,7 @@
           <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
       <% end %>
       <select class="resourcesSendType" onclick="chooseSendType2('<%= send_id %>', '<%= send_ids%>','<%= User.current.id %>','file', '<%= @type %>');">
-        <option value="1">课程</option>
+        <option value="1">班级</option>
         <option value="2">项目</option>
         <option value="3">组织</option>
       </select>
@@ -20,7 +20,7 @@
     <%= form_tag  search_user_course_user_path(user),:method => 'get', :remote=>true, :id=> 'search_user_course_form', :class=> 'resourcesSearchBox' do %>
       <%= hidden_field_tag(:send_id, send_id) %>
       <%= hidden_field_tag(:send_ids, send_ids) %>
-      <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
+      <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入班级ID或者名称搜索" class="searchResourcePopup" />
         <script>
             observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>','file')
         </script>
diff --git a/app/views/users/_send_homework_to_course.html.erb b/app/views/users/_send_homework_to_course.html.erb
index 67fd36c3c..fc4007d03 100644
--- a/app/views/users/_send_homework_to_course.html.erb
+++ b/app/views/users/_send_homework_to_course.html.erb
@@ -5,8 +5,8 @@
   </div>
   <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
   <div class="fl">
-    <!--<input type="text" name="search" placeholder="输入课程ID或者名称搜索" class="subjectSearch fr" />-->
-    <input type="text" id="search_course_input" value="<%= @search %>"  name="search" placeholder="输入课程ID或者名称搜索" class="mt10 mb10 course-search" />
+    <!--<input type="text" name="search" placeholder="输入班级ID或者名称搜索" class="subjectSearch fr" />-->
+    <input type="text" id="search_course_input" value="<%= @search %>"  name="search" placeholder="输入班级ID或者名称搜索" class="mt10 mb10 course-search" />
   </div>
   <div id="send_homework_to_course_form">
     <%= render :partial => "users/send_homework_to_course_form", :locals => {:user => user, :courses => courses, :send_id => send_id} %>
diff --git a/app/views/users/_share_message_to_course.html.erb b/app/views/users/_share_message_to_course.html.erb
index 66d44739c..d86c51f0d 100644
--- a/app/views/users/_share_message_to_course.html.erb
+++ b/app/views/users/_share_message_to_course.html.erb
@@ -18,7 +18,7 @@
                   :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
         <%= hidden_field_tag(:send_id, send_id) %>
         <%= hidden_field_tag(:send_ids, send_ids) %>
-        <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
+        <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入班级ID或者名称搜索" class="searchResourcePopup" />
         <script>
             observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>','message')
         </script>
diff --git a/app/views/users/_share_news_to_course.html.erb b/app/views/users/_share_news_to_course.html.erb
index a1a0d6e39..e03a296b2 100644
--- a/app/views/users/_share_news_to_course.html.erb
+++ b/app/views/users/_share_news_to_course.html.erb
@@ -18,7 +18,7 @@
                   :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
         <%= hidden_field_tag(:send_id, send_id) %>
         <%= hidden_field_tag(:send_ids, send_ids) %>
-        <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
+        <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入班级ID或者名称搜索" class="searchResourcePopup" />
         <script>
             observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>','news')
         </script>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index e7cd740f7..4c8e17d5d 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -76,7 +76,7 @@
           <%= user_for_homework_common homework_common,is_teacher %>
         </div>
         <% work = cur_user_works_for_homework homework_common %>
-        <% if !is_teacher && !work.nil? && homework_common.end_time < Date.today %>
+        <% if !is_teacher && !work.nil? && homework_common.end_time < Date.today && work.user == User.current %>
             <div class="homepagePostSubmit">
               <%=link_to "追加附件", student_work_index_url_in_org(homework_common.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
             </div>
@@ -145,8 +145,8 @@
         <% end %>
       </div>
       <div class="cl"></div>
-      <% if homework_common.student_works.count != 0 %>
-          <% sw = homework_common.student_works.reorder("created_at desc").first %>
+      <% if homework_common.student_works.has_committed.count != 0 %>
+          <% sw = homework_common.student_works.has_committed.reorder("created_at desc").first %>
           <div class="mt10 homepagePostDeadline mb10">
             #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
           </div>
@@ -167,9 +167,9 @@
         <div>
           <% if homework_common.homework_type != 2 %>
               <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = homework_common.student_works.select("student_works.*,student_works.work_score as score").where("student_works.id in #{ids}").order("score desc") %>
+              <% student_works = homework_common.student_works.has_committed.select("student_works.*,student_works.work_score as score").where("student_works.id in #{ids}").order("score desc") %>
           <% else %>
-              <% student_works = homework_common.student_works.select("student_works.*,student_works.work_score as score").order("score desc") %>
+              <% student_works = homework_common.student_works.has_committed.select("student_works.*,student_works.work_score as score").order("score desc") %>
           <% end %>
           <% student_works.includes(:user).each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
@@ -206,8 +206,12 @@
             <% sort_projects = project_sort_update projects %>
             <div class="mt10 relatePWrap" id="relatePWrap_<%=homework_common.id %>">
               <div class="mr5 fontGrey2">
-                <% first_pro = project_sort_first(projects).first %>
-                #&nbsp;<%=time_from_now first_pro.updated_at %><%= link_to User.find(first_pro.user_id).show_name, user_activities_path(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
+                <% first_pro = Project.find sort_projects.first.project_id %>
+                <% commit_time = first_pro.project_score.commit_time %>
+                <% one_time = first_pro.updated_on %>
+                <% one_forge_time=ForgeActivity.where("project_id=?",first_pro.id).last.updated_at if ForgeActivity.where("project_id=?",first_pro.id).last %>
+                <% one_time= one_time > one_forge_time ? one_time : one_forge_time %>
+                #&nbsp;<%=time_from_now !commit_time.nil? && format_time(commit_time) > format_time(one_time) ? commit_time : one_time %><%= link_to User.find(first_pro.user_id).show_name, user_activities_path(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
               </div>
               <div class="cl"></div>
               <% sort_projects.each_with_index do |pro, i| %>
@@ -230,7 +234,8 @@
                     <% end %>
                     <% com_time = project.project_score.commit_time %>
                     <% time=project.updated_on %>
-                    <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+                    <% forge_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+                    <% time= time > forge_time ? time : forge_time %>
                     <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
                     <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
                     <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index fc66711d3..e02fe7399 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -1,5 +1,5 @@
 <% if ma.class == CourseMessage %>
-    <% if ma.course_message_type == "News" %>
+    <% if ma.course_message_type == "News" && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
@@ -19,7 +19,7 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "Comment" %>
+    <% if ma.course_message_type == "Comment" && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
@@ -39,7 +39,7 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil?%>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
@@ -98,7 +98,7 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师',
@@ -133,7 +133,7 @@
         </ul>
     <% end %>
     <!--作品开启匿评 待整合：时间紧-->
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
@@ -168,7 +168,7 @@
         </ul>
     <% end %>
     <!--作品关闭匿评-->
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
@@ -199,7 +199,7 @@
         </ul>
     <% end %>
 
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
@@ -235,18 +235,18 @@
         </ul>
     <% end %>
     <!--资源申请-->
-    <% if ma.course_message_type == "ApplyResource" && ma.status == 0 %>
+    <% if ma.course_message_type == "ApplyResource" && ma.status == 0 && ma.course_message %>
         <ul class="homepageNewsList fl" id="apply_resource_message_<%=ma.id %>">
           <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
         </ul>
     <% end %>
     <!--资源申请回复-->
-    <% if ma.course_message_type == "ApplyResource" && ma.status == 1 %>
+    <% if ma.course_message_type == "ApplyResource" && ma.status == 1 && ma.course_message %>
         <ul class="homepageNewsList fl" id="apply_resource_message_<%=ma.id %>">
           <%= render :partial => 'apply_resource_course_message_reply', :locals => {:ma => ma} %>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag(url_to_avatar(User.find(ma.apply_user_id)), width: "30px", height: "30px", class: "mt3") %></div></a></li>
           <li class="homepageNewsPubType fl">
@@ -271,7 +271,7 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "Poll" %>
+    <% if ma.course_message_type == "Poll" && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
@@ -287,7 +287,7 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "Message" %>
+    <% if ma.course_message_type == "Message" && !ma.nil? && !ma.course_message.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
@@ -295,7 +295,7 @@
             <%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %></span></li>
           <% if ma.course_message.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                <%= link_to ma.course_message.subject, board_message_path(ma.course_message.board_id, ma.course_message.id),
                             :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -309,7 +309,7 @@
               </div>
           <% else %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                <%= link_to ma.course_message.content.html_safe, board_message_path(ma.course_message.board_id, ma.course_message.parent_id),
                             :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -376,7 +376,7 @@
             <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
             </ul>
     <% end %>
-    <% if ma.course_message_type == "JournalsForMessage" %>
+    <% if ma.course_message_type == "JournalsForMessage" && ma.course_message %>
         <% if ma.course_message.jour_type == 'Course' %>
             <% if params[:type] != 'homework' %>
                 <ul class="homepageNewsList fl">
@@ -459,7 +459,7 @@
         <% end %>
     <% end %>
     <!-- 作业迟交，不能参与匿评提醒消息 -->
-    <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
+    <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
@@ -493,7 +493,7 @@
     <% end %>
 
 
-    <% if ma.course_message_type == "StudentWork" && ma.status == 1 %>
+    <% if ma.course_message_type == "StudentWork" && ma.status == 1 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
@@ -514,7 +514,7 @@
         </ul>
     <% end %>
     <!-- 学生追加作品附件 -->
-    <% if ma.course_message_type == "StudentWork" && ma.status == 2 %>
+    <% if ma.course_message_type == "StudentWork" && ma.status == 2 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
@@ -534,7 +534,7 @@
         </ul>
     <% end %>
     <!-- 创建课程消息 -->
-    <% if ma.course_message_type == "Course" %>
+    <% if ma.course_message_type == "Course" && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
@@ -569,7 +569,9 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <% if ma.course_message_type == "JoinCourseRequest" %>
+
+    <!--# ma.course_message_id 是用户id-->
+    <% if ma.course_message_type == "JoinCourseRequest" && !ma.nil? %>
         <ul class="homepageNewsList fl" id="course_message_join_<%=ma.id %>">
           <%= render :partial => 'join_course_course_message', :locals => {:ma => ma} %>
         </ul>
@@ -710,7 +712,7 @@
     <% end %>
 
     <!--老师发布测验 发给学生看-->
-    <% if ma.course_message_type == "Exercise" && ma.status == 2 %>
+    <% if ma.course_message_type == "Exercise" && ma.status == 2 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
@@ -747,7 +749,7 @@
     <% end %>
 
 
-    <% if ma.course_message_type == "Exercise" && ma.status == 3 %>
+    <% if ma.course_message_type == "Exercise" && ma.status == 3 && ma.course_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a></li>
           <li class="homepageNewsPubType fl">
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 9da768d0e..7a5fa17c9 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -156,9 +156,7 @@
           <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
-                                                                      :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
-                                                                      :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+            <%= link_to ma.forge_message.subject, board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id), :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/all_journals.js.erb b/app/views/users/all_journals.js.erb
index 6d227e93b..d03e13742 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -2,6 +2,8 @@
 $('#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}) %>');
 <% 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}) %>');
+<% 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}) %>');
 <% 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/show_all_replies.js.erb b/app/views/users/show_all_replies.js.erb
index 5f5ea6c3f..ae8803653 100644
--- a/app/views/users/show_all_replies.js.erb
+++ b/app/views/users/show_all_replies.js.erb
@@ -1,6 +1,8 @@
 <% 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_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})%>");
     <% end %>
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 1e3957ea9..240fec434 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -27,30 +27,32 @@
 </div>
 
 <script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>
-<!--<script src="/javascripts/wechat/build/angular.all.min.js"></script>-->
-<script src="/javascripts/wechat/build/app.min.js"></script>
-<!--<script src="/javascripts/wechat/app.js"></script>-->
-<!--<script src="/javascripts/wechat/others/factory.js"></script>-->
-<!--<script src="/javascripts/wechat/others/filter.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/alert.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/form_validate.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/input_auto.js"></script>-->
-<!--<script src="/javascripts/wechat/directives/loading_spinner.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/reg.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/invite_code.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/login.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/activity.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/new_class.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/blog.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/course_notice.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/discussion.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/homework.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/issue.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/journals.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/class.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/class_list.js"></script>-->
-<!--<script src="/javascripts/wechat/controllers/myresource.js"></script>-->
-<!--<script src="/javascripts/wechat/others/routes.js"></script>-->
+<!-- <script src="/javascripts/wechat/build/angular.all.min.js"></script> -->
+<script src="/javascripts/wechat/build/app.min.js?version=20160709-0920"></script>
+<!-- <script src="/javascripts/wechat/app.js"></script> -->
+<!-- <script src="/javascripts/wechat/others/factory.js"></script> -->
+<!-- <script src="/javascripts/wechat/others/filter.js"></script> -->
+<!-- <script src="/javascripts/wechat/directives/alert.js"></script> -->
+<!-- <script src="/javascripts/wechat/directives/form_validate.js"></script> -->
+<!-- <script src="/javascripts/wechat/directives/input_auto.js"></script> -->
+<!-- <script src="/javascripts/wechat/directives/loading_spinner.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/reg.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/invite_code.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/login.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/activity.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/new_class.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/edit_class.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/blog.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/course_notice.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/discussion.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/homework.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/issue.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/journals.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/class.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/class_list.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/myresource.js"></script> -->
+<!-- <script src="/javascripts/wechat/controllers/send_class_list.js"></script> -->
+<!-- <script src="/javascripts/wechat/others/routes.js"></script> -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb
index 4f434757f..3316cbc8a 100644
--- a/app/views/welcome/_search_all_results.html.erb
+++ b/app/views/welcome/_search_all_results.html.erb
@@ -19,7 +19,7 @@
                   <li class="fontGrey3 mb5"><%= User.find(item.id).user_extensions && User.find(item.id).user_extensions.brief_introduction.present? ? User.find(item.id).user_extensions.brief_introduction : '这位童鞋很懒，什么也没有留下～'%></li>
                   <li class="f12 fontGrey2">
                     <span class="mr30">加入时间：<%= format_date( User.find(item.id).created_on)%></span><span class="mr30">
-                 最后登陆时间：<%= format_date( User.find(item.id).last_login_on)%></span><span class="mr30">
+                 最后登录时间：<%= format_date( User.find(item.id).last_login_on)%></span><span class="mr30">
                 <%= User.find(item.id).user_extensions.occupation.present? ? '单位：'+User.find(item.id).user_extensions.occupation : ''%></span></li>
                 </ul>
               </li>
diff --git a/app/views/welcome/_search_user_results.html.erb b/app/views/welcome/_search_user_results.html.erb
index d1c8c2393..06a40d021 100644
--- a/app/views/welcome/_search_user_results.html.erb
+++ b/app/views/welcome/_search_user_results.html.erb
@@ -13,7 +13,7 @@
           </li>
           <li class="fontGrey3 mb5"><%= User.find(user.id).user_extensions && User.find(user.id).user_extensions.brief_introduction.present? ? User.find(user.id).user_extensions.brief_introduction : '这位童鞋很懒，什么也没有留下～'%></li>
           <li class="f12 fontGrey2"><span class="mr30">加入时间：<%= format_date( User.find(user.id).created_on)%></span><span class="mr30">
-            最后登陆时间：<%= format_date( User.find(user.id).last_login_on)%></span><span class="mr30">
+            最后登录时间：<%= format_date( User.find(user.id).last_login_on)%></span><span class="mr30">
             <%= User.find(user.id).user_extensions.occupation.present? ? '单位：'+User.find(user.id).user_extensions.occupation : ''%></span></li>
         </ul>
       </li>
diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml
index 1aa1ea666..29d6b236c 100644
--- a/config/locales/courses/zh.yml
+++ b/config/locales/courses/zh.yml
@@ -12,7 +12,7 @@ zh:
   #
   label_course_join_student: 加入班级
   label_course_exit_student: 退出班级
-  label_course_new: 新建课程
+  label_course_new: 新建班级
   label_course_name: 课程名称
 
   label_homework: 作业
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 6a040782d..9c19fcbbb 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -482,9 +482,10 @@ zh:
   label_show_contest: 显示竞赛
   #by young
   label_requirement: 需求
-  label_new_course: 课程列表
-  label_course_all: 课程列表
-  label_excellent_courses_list: 精品课程列表
+  label_new_course: 班级列表
+  label_course_all: 班级列表
+  label_syllabus_all: 课程列表
+  label_excellent_courses_list: 精品班级列表
   label_course_resource_list: 班级资源列表
   label_project_resource_list: 項目资源列表
   label_teacher_all: 所有教师
@@ -1139,7 +1140,7 @@ zh:
   text_account_destroy_confirmation: |-
     确定继续处理？
     您的账号一旦删除，将无法再次激活使用。
-  error_session_expired: 您的会话已过期。请重新登陆。
+  error_session_expired: 您的会话已过期。请重新登录。
   text_session_expiration_settings: "警告： 更改这些设置将会使包括你在内的当前会话失效。"
   setting_session_lifetime: 会话最大有效时间
   setting_session_timeout: 会话闲置超时
@@ -1367,7 +1368,7 @@ zh:
   label_bid_reason_homework: 请输入作业提交说明！
   label_create_new_projects: 创建项目
   label_call_for_bids: 发布需求
-  label_create_course: 创建课程
+  label_create_course: 创建班级
 
   label_milestone: 里程碑
   label_features: 特性
@@ -1488,7 +1489,7 @@ zh:
 
 
   label_user_project: 项目
-  label_user_course: 课程
+  label_user_course: 班级
   label_user_homework: 作业
 
   label_bid_if_agreement: 如果喜欢我，请点击我
@@ -1542,7 +1543,7 @@ zh:
   label_teacher_work_unit: 教师单位
   label_course_time: 课程年度
   label_i_new_activity: 有了新活动在
-  label_choose_course: 选择课程
+  label_choose_course: 选择班级
   button_submit_homework: 提交作业
   button_submit_bid: 参与竞标
   label_requirement_from: 需求来源
@@ -1596,9 +1597,9 @@ zh:
 
   #end
 
-  label_joined_course: 参加的课程
-  label_created_course: 创建的课程
-  label_course: 课程
+  label_joined_course: 参加的班级
+  label_created_course: 创建的班级
+  label_course: 班级
 
 
   label_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。）
diff --git a/config/menu.yml b/config/menu.yml
index 213130240..1817ab44d 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   name: "我的课程"
   sub_button:
diff --git a/config/menu.yml.production b/config/menu.yml.production
new file mode 100644
index 000000000..1128f9961
--- /dev/null
+++ b/config/menu.yml.production
@@ -0,0 +1,32 @@
+button:
+ -
+  type: "view"
+  name: "我的动态"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=activities#wechat_redirect"
+ -
+  name: "我的课程"
+  sub_button:
+  -
+    type: "view"
+    name: "课程"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
+  -
+    type: "view"
+    name: "资源"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=myresource#wechat_redirect"
+
+ -
+  name: "更多"
+  sub_button:
+  -
+    type: "click"
+    name: "加入班级"
+    key:  "JOIN_CLASS"
+  -
+    type: "click"
+    name: "反馈"
+    key:  "FEEDBACK"
+  -
+    type: "view"
+    name: "历史推文"
+    url:  "http://mp.weixin.qq.com/mp/getmasssendmsg?__biz=MzIwOTM2NDkxMA==#wechat_webview_type=1&wechat_redirect"
diff --git a/config/menu.yml.test b/config/menu.yml.test
new file mode 100644
index 000000000..a163bac61
--- /dev/null
+++ b/config/menu.yml.test
@@ -0,0 +1,35 @@
+button:
+ -
+  type: "view"
+  name: "我的动态"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_b
+ase&state=activities#wechat_redirect"
+ -
+  name: "我的课程"
+  sub_button:
+  -
+    type: "view"
+    name: "课程"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi
+_base&state=class_list#wechat_redirect"
+  -
+    type: "view"
+    name: "资源"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi
+_base&state=myresource#wechat_redirect"
+
+ -
+  name: "更多"
+  sub_button:
+  -
+    type: "click"
+    name: "加入班级"
+    key:  "JOIN_CLASS"
+  -
+    type: "click"
+    name: "反馈"
+    key:  "FEEDBACK"
+  -
+    type: "view"
+    name: "历史推文"
+    url:  "http://mp.weixin.qq.com/mp/getmasssendmsg?__biz=MzIwOTM2NDkxMA==#wechat_webview_type=1&wechat_redirect"
diff --git a/config/routes.rb b/config/routes.rb
index bc9abeb35..a570fef55 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -797,6 +797,7 @@ RedmineApp::Application.routes.draw do
         match 'update_jenkins_job'
         match 'edit'
         match 'create'
+        get 'error_list'
       end
     end
     # resources :files, :only => [:index, :new, :create] do
@@ -1034,7 +1035,10 @@ RedmineApp::Application.routes.draw do
 
   match 'admin', :to => 'admin#index', :via => :get
   match 'admin/projects',  :via => :get
-  get 'admin/courses'
+  get 'admin/courses', as: :all_courses
+  get 'admin/syllabuses', as: :all_syllabuses
+  get 'admin/non_syllabus_courses', as: :non_syllabus_courses
+  post 'admin/update_course_name'
   get 'admin/excellent_courses', as: :excellent_courses
   get 'admin/excellent_all_courses', as: :excellent_all_courses
   match 'admin/set_excellent_course/:id', :to => 'admin#set_excellent_course'
@@ -1067,6 +1071,8 @@ RedmineApp::Application.routes.draw do
   get 'admin/homework'
   get 'admin/apply_for_homework'
   get 'admin/code_work_tests'
+  post 'admin/select_course_syllabus'
+  post 'admin/create_syllabus'
 
   resources :auth_sources do
     member do
@@ -1085,6 +1091,7 @@ RedmineApp::Application.routes.draw do
     member do
       match 'syllabus_courselist', :to => 'syllabuses#syllabus_courselist', :via => :get, :as => 'syllabus_courselist'
       get 'edit_syllabus_eng_name'
+      get 'edit_syllabus_title'
       post 'update_base_info'
       get 'delete_syllabus'
       get 'delete_des'
diff --git a/config/wechat.yml b/config/wechat.yml
index 9bc33029e..d243ca44c 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -2,20 +2,24 @@ default: &default
 #  corpid: "corpid"
 #  corpsecret: "corpsecret"
 #  agentid:  1
-# Or if using public account, only need above two line
-
-  # guange test
+#
+#-  # guange test
   #appid: "wxf694495398c7d470"
   #secret: "743e038392f1d89540e95f8f7645849a"
 
+  #production
   appid: "wx8e1ab05163a28e37"
   secret: "beb4d3bc4b32b3557811680835357841"
 
+  #test
+  #appid: "wxc09454f171153c2d"
+  #secret: "dff5b606e34dcafe24163ec82c2715f8"
+
   token:    "123456"
-  access_token: ".access_token"
+  access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
   encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
-  jsapi_ticket: "tmp/wechat_jsapi_ticket"
+  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
   #template
   binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
diff --git a/config/wechat.yml.test b/config/wechat.yml.test
new file mode 100644
index 000000000..9bc33029e
--- /dev/null
+++ b/config/wechat.yml.test
@@ -0,0 +1,33 @@
+default: &default
+#  corpid: "corpid"
+#  corpsecret: "corpsecret"
+#  agentid:  1
+# Or if using public account, only need above two line
+
+  # guange test
+  #appid: "wxf694495398c7d470"
+  #secret: "743e038392f1d89540e95f8f7645849a"
+
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
+
+  token:    "123456"
+  access_token: ".access_token"
+  encrypt_mode: false # if true must fill encoding_aes_key
+  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
+  jsapi_ticket: "tmp/wechat_jsapi_ticket"
+
+  #template
+  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
+  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
+  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
+  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
+
+production:
+  <<: *default
+
+development:
+  <<: *default
+
+test:
+  <<: *default
diff --git a/db/migrate/20160707031248_create_sonar_errors.rb b/db/migrate/20160707031248_create_sonar_errors.rb
new file mode 100644
index 000000000..c55caccce
--- /dev/null
+++ b/db/migrate/20160707031248_create_sonar_errors.rb
@@ -0,0 +1,11 @@
+class CreateSonarErrors < ActiveRecord::Migration
+  def change
+    create_table :sonar_errors do |t|
+      t.integer :project_id
+      t.string :jenkins_job_name
+      t.text :output
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20160708005533_add_status_to_student_work.rb b/db/migrate/20160708005533_add_status_to_student_work.rb
new file mode 100644
index 000000000..26fe99cea
--- /dev/null
+++ b/db/migrate/20160708005533_add_status_to_student_work.rb
@@ -0,0 +1,24 @@
+class AddStatusToStudentWork < ActiveRecord::Migration
+  def change
+    add_column :student_works, :work_status, :integer, :default => 0
+
+    count = HomeworkCommon.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      HomeworkCommon.page(i).per(30).each do |hc|
+        student_works = hc.student_works
+        end_time = hc.end_time
+        unless student_works.empty?
+          student_works.each do |st|
+            if Time.parse(end_time.to_s).strftime("%Y-%m-%d") < Time.parse(st.created_at.to_s).strftime("%Y-%m-%d")
+              st.update_column('work_status', 2)
+            else
+              st.update_column('work_status', 1)
+            end
+          end
+        end
+        end
+      end
+    end
+  end
+end
diff --git a/db/migrate/20160708091258_renew_qrcode.rb b/db/migrate/20160708091258_renew_qrcode.rb
new file mode 100644
index 000000000..59f92b315
--- /dev/null
+++ b/db/migrate/20160708091258_renew_qrcode.rb
@@ -0,0 +1,8 @@
+class RenewQrcode < ActiveRecord::Migration
+  def up
+    Course.update_all(:qrcode => '')
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160709015740_add_index_openid_to_wechat_logs.rb b/db/migrate/20160709015740_add_index_openid_to_wechat_logs.rb
new file mode 100644
index 000000000..845a47b72
--- /dev/null
+++ b/db/migrate/20160709015740_add_index_openid_to_wechat_logs.rb
@@ -0,0 +1,5 @@
+class AddIndexOpenidToWechatLogs < ActiveRecord::Migration
+  def change
+    add_index(:wechat_logs, :openid)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3258f89c1..32d29d31a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160627090316) do
+ActiveRecord::Schema.define(:version => 20160709015740) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -57,6 +57,18 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     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"
@@ -550,9 +562,9 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     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"
+    t.integer  "syllabus_id"
   end
 
   add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
@@ -1633,10 +1645,11 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
   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.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|
@@ -1725,6 +1738,14 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     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"
@@ -1782,6 +1803,7 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     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"
@@ -1849,8 +1871,18 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     t.string   "title"
     t.text     "description"
     t.integer  "user_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+    t.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"
@@ -2154,6 +2186,8 @@ ActiveRecord::Schema.define(:version => 20160627090316) do
     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
diff --git a/lib/gitlab-cli/lib/gitlab/client/repositories.rb b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
index 34915967c..e998ab56b 100644
--- a/lib/gitlab-cli/lib/gitlab/client/repositories.rb
+++ b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
@@ -75,6 +75,17 @@ class Gitlab::Client
     end
     alias_method :repo_commits, :commits_total_count
 
+    # Gets total project commits.
+    #
+    # @example
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :rev The branch or tag name of a project repository.
+    # @return [Hash<Gitlab::ObjectifiedHash>]
+    def user_static(project, options={})
+      get("/projects/#{project}/repository/user_static", :query => options)
+    end
+
     # Gets a specific commit identified by the commit hash or name of a branch or tag.
     #
     # @example
diff --git a/lib/redmine.rb b/lib/redmine.rb
index c0aa658ae..cfd8b6824 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -367,7 +367,7 @@ end
 Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :organization, {:controller => 'admin', :action => 'organization'}, :caption => :label_organization_list
   menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
-  menu.push :courses, {:controller => 'admin', :action => 'courses'}, :caption => :label_course_all
+  menu.push :syllabuses, {:controller => 'admin', :action => 'syllabuses'}, :caption => :label_course_all
   menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural
   menu.push :messages, {:controller => 'admin', :action => 'messages'}, :caption => :label_system_message
   menu.push :schools, {:controller => 'admin', :action => 'schools'}, :caption => :label_school_plural
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index 585d91737..a8356ea5a 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -12,7 +12,7 @@ namespace :homework_evaluation do
     homework_detail_manuals.each do |homework_detail_manual|
       homework_common = homework_detail_manual.homework_common
       if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
-        student_works = homework_common.student_works
+        student_works = homework_common.student_works.has_committed
         if student_works && student_works.size >= 2
           if homework_common.homework_type == 3
             student_work_projects = homework_common.student_work_projects.where("student_work_id is not null")
@@ -76,8 +76,8 @@ namespace :homework_evaluation do
       homework_common = homework_detail_manual.homework_common
       if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 2 #开启匿评状态才可关闭匿评
         #计算缺评扣分
-        work_ids = "(" + homework_common.student_works.map(&:id).join(",") + ")"
-        homework_common.student_works.each do |student_work|
+        work_ids = "(" + homework_common.student_works.has_committed.map(&:id).join(",") + ")"
+        homework_common.student_works.has_committed.each do |student_work|
           absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
           student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
           student_work.save
diff --git a/lib/tasks/update_homework.rake b/lib/tasks/update_homework.rake
index 229337dc5..d97004c8c 100644
--- a/lib/tasks/update_homework.rake
+++ b/lib/tasks/update_homework.rake
@@ -2,7 +2,11 @@
 
 namespace :update_homework do
   desc "update homework project time"
-  def update_homework_time homeworks
+  task :update_homework => :environment do
+    year = Time.now.year
+    courses = Course.where("time > ? and is_delete = 0", (year.to_i - 2))
+    course_ids = courses.nil? ? '(-1)' : '(' + courses.map{|c| c.id}.join(',') + ')'
+    homeworks = HomeworkCommon.where("course_id in #{course_ids} and homework_type = 3")
     unless homeworks.nil?
       homeworks.each do |h|
         if h.homework_type == 3
@@ -11,10 +15,13 @@ namespace :update_homework do
           unless student_works.nil?
             student_works.each do |s|
               project = Project.find s.project_id
-              unless project.nil? && project.gpid.nil?
+              unless project.nil? && project.gpid.blank?
                 project_time=project.updated_on
                 project_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last
+                puts "the time is =========================> #{time}"
+                puts "the project_time is =========================> #{project_time}"
                 if time.strftime('%Y-%m-%d %H:%M:%S') < project_time.strftime('%Y-%m-%d %H:%M:%S')
+                #if format_time(time) < format_time(project_time)
                   time = project_time
                 end
                 begin
@@ -24,42 +31,42 @@ namespace :update_homework do
                   changesets = g.commits(project.gpid, :ref_name => default_branch)
                   changesets_latest_coimmit = changesets[0]
                   unless changesets[0].blank?
-                    if time.strftime('%Y-%m-%d %H:%M:%S') <changesets_latest_coimmit.created_at.strftime('%Y-%m-%d %H:%M:%S')
-                      time = changesets_latest_coimmit.created_at
+                    puts "the time is =========================> #{time}"
+                    puts "the changesets_latest_coimmit is =========================> #{changesets_latest_coimmit.created_at}"
+                    puts "the distance time is =========================> #{changesets_latest_coimmit.created_at.to_time > Time.now}"
+                    if time.strftime('%Y-%m-%d %H:%M:%S') < changesets_latest_coimmit.created_at.to_time.strftime('%Y-%m-%d %H:%M:%S')
+                    #if format_time(time) < format_time(changesets_latest_coimmit.created_at)
+                      time = changesets_latest_coimmit.created_at.to_time
                     end
                   end
-                rescue
+                rescue Exception => e
+                  puts e
                 end
               end
             end
           end
           s_time = time
+          puts "latest time is =========================> #{time}"
           if time.strftime('%Y-%m-%d %H:%M:%S') > h.updated_at.strftime('%Y-%m-%d %H:%M:%S')
             h.update_column('updated_at', s_time)
             course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first
             if course_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > course_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
               course_activity.update_column('updated_at', s_time)
+              puts "user_activity time is =========================> #{course_activity}"
             end
             user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first
             if user_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > user_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
               user_activity.update_column('updated_at', s_time)
+              puts "user_activity time is =========================> #{user_activity}"
             end
             org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first
             if org_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > org_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
               org_activity.update_column('updated_at', s_time)
+              puts "org_activity time is =========================> #{org_activity}"
             end
           end
         end
       end
     end
   end
-  task :update_homework => :environment do
-    year = Time.now.year
-    courses = Course.where("time > ? and is_delete = 0", (year.to_i - 2))
-    course_ids = courses.nil? ? '(-1)' : '(' + courses.map{|c| c.id}.join(',') + ')'
-    homeworks = HomeworkCommon.where("course_id in #{course_ids} and homework_type = 3")
-    unless homeworks.nil?
-      update_homework_time homeworks
-    end
-  end
 end
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index f042daba7..60075ad2e 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -2,43 +2,56 @@
 
   <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
     <div loading-spinner></div>
+
+
+  <div class="class-detail-name">我的动态</div>
+
+  <!--<div class="tab-wrap">-->
+    <!--<a id="class_tab_1" href="javascript:void(0);" class="weixin-tab class-tab-active" ng-click="HoverLi(1)">所有动态<span id="tab_arrow_1" class="tab-active-arrow"></span></a>-->
+    <!--<a id="class_tab_2" href="javascript:void(0);" class="weixin-tab" ng-click="HoverLi(2)">课程动态<span  id="tab_arrow_2" class="tab-active-arrow undis"></span></a>-->
+    <!--<a id="class_tab_3" href="javascript:void(0);" class="weixin-tab" ng-click="HoverLi(3)">项目动态<span id="tab_arrow_3" class="tab-active-arrow undis"></span></a>-->
+  <!--</div>-->
+  <div class="tab-wrap">
+      <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
+  </div>
+
+  <div ng-class="{'undis': currentTab!=1}">
     <div ng-repeat="act in activities">
-      <div ng-if="act.container_type=='Course'">
+
+      <div ng-if="act.container_type=='Course' ">
         <div ng-if="act.act_type=='HomeworkCommon'">
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('homework',act.act_id, act.id)" id="act_{{act.id}}">
-                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                  <div class="post-title hidden mb5">
-                    <a herf="javascript:void(0);">
-                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
-                    </a></div>
-                  <div class="post-title hidden">
-                    <a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                <div dataID = "{{act.act_id}}" ng-click="goDetail('homework',act.act_id, act.id)" id="act_{{act.id}}">
+                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                  <div class="post-dynamic-author hidden fl">
+                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                  </div>
+                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
                   <div class="cl"></div>
-                  <div class="post-title mt5 mb5 hidden"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
-                  <div class="post-content c-grey3">
+                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【作业】{{act.subject|safeHtml}}</div>
+                  <div class="post-content c-grey3 mt10 mb10">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                     <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
                     <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
                   </div>
-                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <div class="post-op-banner">
-                  <span ng-if="act.homework_common_detail.homework_type == 1" class="c-grey f12 fl mr15">普通作业</span>
-                  <span ng-if="act.homework_common_detail.homework_type == 2" class="c-grey f12 fl mr15">编程作业</span>
-                  <span ng-if="act.homework_common_detail.homework_type == 3" class="c-grey f12 fl mr15">分组作业</span>
-                  <span class="c-grey f12 fl">{{act.latest_update}}</span>
-                  <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
-                  <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="cl"></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                <div class="fr f13">
+                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                  <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 </div>
+                <div class="cl"></div>
               </div>
             </div>
           </div>
@@ -48,28 +61,33 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('course_notice',act.act_id, act.id)" id="act_{{act.id}}">
-                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f13 c-grey2">{{act.course_project_name}}</a></div>
+                <div dataID = "{{act.act_id}}" ng-click="goDetail('course_notice',act.act_id, act.id)" id="act_{{act.id}}">
+                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                  <div class="post-dynamic-author hidden fl">
+                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                  </div>
+                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
                   <div class="cl"></div>
-                  <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
-                  <div class="post-content c-grey3">
+                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【通知】{{act.subject|safeHtml}}</div>
+                  <div class="post-content c-grey3 mt10 mb10">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   </div>
-                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <div class="post-op-banner">
-                  <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
-                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
-                  <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
-                  <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="cl"></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                <div class="fr f13">
+                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
                 </div>
+                <div class="fr mr25 f13">
+                  <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                </div>
+                <div class="cl"></div>
               </div>
             </div>
           </div>
@@ -79,28 +97,34 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('course_discussion',act.act_id, act.id)" id="act_{{act.id}}">
-                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                  <div class="post-title hidden mb5"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                <div dataID = "{{act.act_id}}" ng-click="goDetail('course_discussion',act.act_id, act.id)" id="act_{{act.id}}">
+                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                  <div class="post-dynamic-author hidden fl">
+                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                  </div>
+                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
                   <div class="cl"></div>
-                  <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
-                  <div class="post-content c-grey3">
+                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【帖子】{{act.subject|safeHtml}}</div>
+                  <div class="post-content c-grey3 mt10 mb10">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   </div>
                   <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <div class="post-op-banner">
-                  <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
-                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
-                  <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
-                  <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="cl"></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                <div class="fr f13">
+                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
                 </div>
+                <div class="fr mr25 f13">
+                  <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                </div>
+                <div class="cl"></div>
               </div>
             </div>
           </div>
@@ -111,8 +135,8 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 课程</span></div>
+                <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 班级</span></div>
                 <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                 <div class="cl"></div>
               </div>
@@ -121,35 +145,40 @@
         </div>
       </div>
 
-      <div ng-if="act.container_type=='Project'">
+      <div ng-if="act.container_type=='Project' ">
         <div ng-if="act.act_type=='Issue'">
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
-                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                <div dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
+                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                  <div class="post-dynamic-author hidden fl">
+                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                  </div>
+                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
                   <div class="cl"></div>
-                  <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
-                  <div class="post-content c-grey3">
+                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【帖子】{{act.subject|safeHtml}}</div>
+                  <div class="post-content c-grey3 mt10 mb10">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                     <span class="mr15 f13 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f13 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />
                     <span class="mr15 f13 c-grey2">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15 f13 c-grey2">完成度：{{act.issue_detail.done_ratio}}%</span>
                   </div>
-                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <div class="post-op-banner">
-                  <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
-                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
-                  <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
-                  <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="cl"></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                <div class="fr f13">
+                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                  <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 </div>
+                <div class="cl"></div>
               </div>
             </div>
           </div>
@@ -160,28 +189,33 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('project_discussion',act.act_id, act.id)" id="act_{{act.id}}">
-                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                <div dataID = "{{act.act_id}}" ng-click="goDetail('project_discussion',act.act_id, act.id)" id="act_{{act.id}}">
+                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                  <div class="post-dynamic-author hidden fl">
+                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                  </div>
+                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
                   <div class="cl"></div>
-                  <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
-                  <div class="post-content c-grey3">
+                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【帖子】{{act.subject|safeHtml}}</div>
+                  <div class="post-content c-grey3 mt10 mb10">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   </div>
-                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <div class="post-op-banner">
-                  <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
-                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
-                  <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
-                  <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="cl"></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                <div class="fr f13">
+                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                  <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
                 </div>
+                <div class="cl"></div>
               </div>
             </div>
           </div>
@@ -191,7 +225,7 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
                 <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                 <div class="cl"></div>
@@ -201,73 +235,318 @@
         </div>
       </div>
 
-      <div ng-if="act.container_type=='Principal'">
+      <div ng-if="act.container_type=='Principal' ">
         <div ng-if="act.act_type=='JournalsForMessage'">
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('journal_for_message',act.act_id, act.id)" id="act_{{act.id}}">
-                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                  <div class="post-title mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                  <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
-                  <div class="cl"></div>
+                <div dataID = "{{act.act_id}}" ng-click="goDetail('journal_for_message',act.act_id, act.id)" id="act_{{act.id}}">
+                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                  <div class="post-dynamic-author hidden fl">
+                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                  </div>
+                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
                   <div class="cl"></div>
-                  <div class="post-content c-grey3 mt5 mb5">
+                  <div class="post-content c-grey3 mt10 mb10">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   </div>
                   <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <div class="post-op-banner">
-                  <span  class="c-grey f12 fl">{{act.latest_update}}</span>
-                  <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
-                  <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                  <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                  <div class="cl"></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">留言</span></div>
+                <div class="fr f13">
+                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
                 </div>
+                <div class="fr mr25 f13">
+                  <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                  <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                </div>
+                <div class="cl"></div>
               </div>
             </div>
           </div>
         </div>
       </div>
 
-      <div ng-if="act.act_type=='BlogComment'">
+      <div ng-if="act.act_type=='BlogComment' ">
         <div class="post-container">
           <div class="post-wrapper">
             <div class="post-main">
-              <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('blog_comment',act.act_id, act.id)" id="act_{{act.id}}">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><span class="f12 c-grey">博客</span></div>
+              <div dataID = "{{act.act_id}}" ng-click="goDetail('blog_comment',act.act_id, act.id)" id="act_{{act.id}}">
+                <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                  <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                  <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                  <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                  <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
+                <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
                 <div class="cl"></div>
-                <div class="post-title hidden mt5 mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
-                <div class="post-content c-grey3">
+                <div class="post-dynamic-title c-grey3 hidden mt12 fb">【博客】{{act.subject|safeHtml}}</div>
+                <div class="post-content c-grey3 mt10 mb10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
                 <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                 <div class="cl"></div>
               </div>
-              <div class="post-op-banner">
-                <span  class="c-grey f12 fl">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">回复</span></a>
-                <a ng-if="act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" class="mr5 mt3" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">赞</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" class="mr5 mt3" /><span class="num-block">{{act.praise_count}}</span></div>
-                <div class="cl"></div>
+              <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">博客</span></div>
+              <div class="fr f13">
+                <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
               </div>
+              <div class="fr mr25 f13">
+                <a ng-if="!act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-click="goDetail('blog_comment',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+              </div>
+              <div class="cl"></div>
             </div>
           </div>
         </div>
       </div>
 
     </div>
+    <div ng-if="has_more">
+        <div id="more_activities" class="more-events mt10" ng-click="loadActData(1,page+1);">更多</div>
+    </div>
+  </div>
+
+  <div ng-class="{'undis': currentTab!=2}">
+      <div ng-repeat="act in course_activities">
+          <div ng-if="act.container_type=='Course' ">
+              <div ng-if="act.act_type=='HomeworkCommon'">
+                  <div class="post-container">
+                      <div class="post-wrapper">
+                          <div class="post-main">
+                              <div dataID = "{{act.act_id}}" ng-click="goDetail('homework',act.act_id, act.id)" id="act_{{act.id}}">
+                                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                                  <div class="post-dynamic-author hidden fl">
+                                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                      <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                      <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                                  </div>
+                                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
+                                  <div class="cl"></div>
+                                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【作业】{{act.subject|safeHtml}}</div>
+                                  <div class="post-content c-grey3 mt10 mb10">
+                                      <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                                      <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
+                                      <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
+                                  </div>
+                                  <div class="cl"></div>
+                              </div>
+                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                              <div class="fr f13">
+                                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                              </div>
+                              <div class="fr mr25 f13">
+                                  <a ng-if="!act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                                  <a ng-if="act.reply_count" ng-click="goDetail('homework',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                              </div>
+                              <div class="cl"></div>
+                          </div>
+                      </div>
+                  </div>
+              </div>
+
+              <div ng-if="act.act_type=='News'">
+                  <div class="post-container">
+                      <div class="post-wrapper">
+                          <div class="post-main">
+                              <div dataID = "{{act.act_id}}" ng-click="goDetail('course_notice',act.act_id, act.id)" id="act_{{act.id}}">
+                                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                                  <div class="post-dynamic-author hidden fl">
+                                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                      <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                      <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                                  </div>
+                                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
+                                  <div class="cl"></div>
+                                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【通知】{{act.subject|safeHtml}}</div>
+                                  <div class="post-content c-grey3 mt10 mb10">
+                                      <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                                  </div>
+                                  <div class="cl"></div>
+                              </div>
+                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                              <div class="fr f13">
+                                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                              </div>
+                              <div class="fr mr25 f13">
+                                  <a ng-if="!act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                                  <a ng-if="act.reply_count" ng-click="goDetail('course_notice',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                              </div>
+                              <div class="cl"></div>
+                          </div>
+                      </div>
+                  </div>
+              </div>
+
+              <div ng-if="act.act_type=='Message'">
+                  <div class="post-container">
+                      <div class="post-wrapper">
+                          <div class="post-main">
+                              <div dataID = "{{act.act_id}}" ng-click="goDetail('course_discussion',act.act_id, act.id)" id="act_{{act.id}}">
+                                  <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                                  <div class="post-dynamic-author hidden fl">
+                                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                      <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                      <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                                  </div>
+                                  <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
+                                  <div class="cl"></div>
+                                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【帖子】{{act.subject|safeHtml}}</div>
+                                  <div class="post-content c-grey3 mt10 mb10">
+                                      <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                                  </div>
+                                  <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                                  <div class="cl"></div>
+                              </div>
+                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                              <div class="fr f13">
+                                  <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                                  <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                                  <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                              </div>
+                              <div class="fr mr25 f13">
+                                  <a ng-if="!act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                                  <a ng-if="act.reply_count" ng-click="goDetail('course_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                              </div>
+                              <div class="cl"></div>
+                          </div>
+                      </div>
+                  </div>
+              </div>
+
+
+              <div ng-if="act.act_type=='Course'">
+                  <div class="post-container">
+                      <div class="post-wrapper">
+                          <div class="post-main">
+                              <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                              <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 课程</span></div>
+                              <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
+                              <div class="cl"></div>
+                          </div>
+                      </div>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <div ng-if="course_has_more">
+          <div id="more_course_activities" class="more-events mt10" ng-click="loadActData(2,course_page+1);">更多</div>
+      </div>
+  </div>
+
+  <div ng-class="{'undis': currentTab!=3}">
+      <div ng-repeat="act in project_activities">
+        <div ng-if="act.container_type=='Project' ">
+          <div ng-if="act.act_type=='Issue'">
+              <div class="post-container">
+                  <div class="post-wrapper">
+                      <div class="post-main">
+                          <div dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
+                              <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                              <div class="post-dynamic-author hidden fl">
+                                  <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                                  <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                  <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                  <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                              </div>
+                              <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
+                              <div class="cl"></div>
+                              <div class="post-dynamic-title c-grey3 hidden mt12 fb">【帖子】{{act.subject|safeHtml}}</div>
+                              <div class="post-content c-grey3 mt10 mb10">
+                                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                                  <span class="mr15 f13 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f13 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />
+                                  <span class="mr15 f13 c-grey2">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15 f13 c-grey2">完成度：{{act.issue_detail.done_ratio}}%</span>
+                              </div>
+                              <div class="cl"></div>
+                          </div>
+                          <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                          <div class="fr f13">
+                              <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                              <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                              <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                          </div>
+                          <div class="fr mr25 f13">
+                              <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                              <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                          </div>
+                          <div class="cl"></div>
+                      </div>
+                  </div>
+              </div>
+          </div>
 
-  <div ng-if="has_more">
-    <div id="more_activities" class="more-events mt10" ng-click="loadActData(page+1);">更多</div>
+
+          <div ng-if="act.act_type=='Message'">
+              <div class="post-container">
+                  <div class="post-wrapper">
+                      <div class="post-main">
+                          <div dataID = "{{act.act_id}}" ng-click="goDetail('project_discussion',act.act_id, act.id)" id="act_{{act.id}}">
+                              <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                              <div class="post-dynamic-author hidden fl">
+                                  <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                                  <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                  <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                  <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                              </div>
+                              <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
+                              <div class="cl"></div>
+                              <div class="post-dynamic-title c-grey3 hidden mt12 fb">【帖子】{{act.subject|safeHtml}}</div>
+                              <div class="post-content c-grey3 mt10 mb10">
+                                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                              </div>
+                              <div class="cl"></div>
+                          </div>
+                          <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                          <div class="fr f13">
+                              <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                              <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                              <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                          </div>
+                          <div class="fr mr25 f13">
+                              <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                              <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                          </div>
+                          <div class="cl"></div>
+                      </div>
+                  </div>
+              </div>
+          </div>
+
+          <div ng-if="act.act_type=='Project'">
+              <div class="post-container">
+                  <div class="post-wrapper">
+                      <div class="post-main">
+                          <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                          <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
+                          <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
+                          <div class="cl"></div>
+                      </div>
+                  </div>
+              </div>
+          </div>
+        </div>
+      </div>
+      <div ng-if="project_has_more">
+          <div id="more_project_activities" class="more-events mt10" ng-click="loadActData(3,project_page+1);">更多</div>
+      </div>
   </div>
+
   <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible"></my-alert>
 
 </div>
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 762bd090e..c77842e4b 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -3,47 +3,64 @@
 <div loading-spinner></div>
 <div ng-if="blog.act_type == 'BlogComment'">
     <div class="post-container">
-        <div class="post-wrapper">
+        <div class="post-wrapper" style="margin-top:0;">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span><img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
-                <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
+
+                <div class="post-avatar fl mr10"><img ng-src="{{blog.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                    {{blog.user.realname}}
+                    <img ng-if="blog.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="blog.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
                 <div class="cl"></div>
+                <div class="post-dynamic-title c-grey3 mt12 fb">{{blog.title}}<img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
+                <div class="c-grey4 f13 mt10"><span class="mr10">博客</span><span>{{blog.created_at}}</span></div>
+
                 <div class="f13 c-grey3 mt10 text-control" ng-bind-html="blog.content|safeHtml"></div>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
+                <div class="fr f13">
+                    <div ng-if="!blog.praise_count" ng-click="addPraise(blog);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                    <div ng-if="blog.praise_count && !blog.has_praise" ng-click="addPraise(blog);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{blog.praise_count}}</span></div>
+                    <div ng-if="blog.has_praise" ng-click="decreasePraise(blog);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{blog.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                    <a ng-if="!blog.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                    <a ng-if="blog.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{blog.comment_count}}</span></a>
+                </div>
                 <div class="cl"></div>
             </div>
-            <div class="post-interactive border-bottom">
-                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{blog.comment_count}})</span></div>
-                <div class="post-interactive-column c-grey" ng-if="blog.has_praise" ng-click="decreasePraise(blog);">已赞 ({{blog.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="!blog.has_praise" ng-click="addPraise(blog);">赞 ({{blog.praise_count}})</div>
-            </div>
             <div id="all_blog_reply">
-                <div class="post-reply-wrap border-bottom" ng-repeat="journal in blog.blog_comment_children">
+
+                <div ng-if="blog.blog_comment_children == ''" style="border-top:1px solid #ccc;"></div>
+                <div class="post-reply-wrap" ng-repeat="journal in blog.blog_comment_children">
                     <div class="post-reply-row">
-                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                        <div class="ml55">
-                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
-                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                            <div class="post-reply-trigger fr undis">回复</div>
+                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                        <div class="post-dynamic-author hidden fl">
+                            {{journal.user.realname}}
+                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                         </div>
+                        <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                        <div class="cl"></div>
+                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>
                         <div class="cl"></div>
                     </div>
                 </div>
+
             </div>
-            <div ng-if="!blog.locked" class="post-input-wrap">
+
+            <div ng-if="!blog.locked" id="post_input_1" class="post-input-wrap2">
                 <div class="post-reply-row">
-                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
                         <textarea class="copy-input"></textarea>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                        <div class="cl"></div>
                     </div>
-                    <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
-                    <div class="cl"></div>
                 </div>
             </div>
+
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html
index dc575dc64..6f8354259 100644
--- a/public/assets/wechat/class.html
+++ b/public/assets/wechat/class.html
@@ -1,18 +1,21 @@
 <div class="post-container">
     <div loading-spinner></div>
     <div class="class-detail-name">{{course.name}}<span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
-    <div class="slice3 fl"></div>
+    <div class="tab-wrap">
+        <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
+    </div>
+    <!--<div class="slice3 fl"></div>-->
 
 
-    <div ng-repeat="menu in menus">
-        <div id="class_tab_1" ng-class="[{'class-detail-tab': isTeacher},{'class-detail-tab3': !isTeacher},{'class-tab-active':currentTab==$index+1}]" ng-click="tab($index+1);"><a herf="javascript:void(0);">{{menu}}</a></div>
-        <div ng-if="!$last" class="slice2 fl">
-            <div class="slice-line2"></div>
-        </div>
-    </div>
+    <!--<div ng-repeat="menu in menus">-->
+        <!--<div id="class_tab_1" ng-class="[{'class-detail-tab': isTeacher},{'class-detail-tab3': !isTeacher},{'class-tab-active':currentTab==$index+1}]" ng-click="tab($index+1);"><a herf="javascript:void(0);">{{menu}}</a></div>-->
+        <!--<div ng-if="!$last" class="slice2 fl">-->
+            <!--<div class="slice-line2"></div>-->
+        <!--</div>-->
+    <!--</div>-->
 
-    <div class="slice3 fl"></div>
-    <div class="cl"></div>
+    <!--<div class="slice3 fl"></div>-->
+    <!--<div class="cl"></div>-->
     <div class="class-search-wrap">
         <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
             <input class="class-detail-search" ng-model="searchText" placeholder="输入关键词进行搜索" />
@@ -20,8 +23,8 @@
     </div>
 
     <div ng-class="{'undis': !showResources}">
-            <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.filename}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
-        <p ng-show="resources.length<=0" class="class-test-tip">暂无课件,<br />
+            <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.filename}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2" ng-click="sendFile(r)">发送</a></div>
+        <p ng-show="resources_tag == true && resources.length<=0" class="class-test-tip">暂无课件,<br />
             请登录Trustie网站,在PC浏览器中上传课件。</p>
     </div>
     <div ng-class="{'undis': !showClassMate}">
@@ -37,15 +40,15 @@
     </div>
 
     <div ng-class="{'undis': !showHomework}">
-        <div ng-repeat="r in homeworks|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.homework_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
-        <p ng-show="homeworks.length<=0" class="class-test-tip">暂无作业,<br />
+        <div ng-repeat="r in homeworks|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.homework_name}}</span></div>
+        <p ng-show="homeworks_tag == true && homeworks.length<=0" class="class-test-tip">暂无作业,<br />
             请登录Trustie网站,在PC浏览器中上传作业。</p>
 
     </div>
 
     <div ng-class="{'undis': !showTestcase}">
-        <div ng-repeat="r in exercises|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.exercise_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
-        <p ng-show="exercises.length<=0" class="class-test-tip">暂无小测验,<br />
+        <div ng-repeat="r in exercises|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.exercise_name}}</span></div>
+        <p ng-show="exercises_tag == true && exercises.length<=0" class="class-test-tip">暂无小测验,<br />
             请登录Trustie网站,在PC浏览器中上传小测验。</p>
     </div>
 
diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
index 8ec8bcaa5..b215db763 100644
--- a/public/assets/wechat/class_list.html
+++ b/public/assets/wechat/class_list.html
@@ -1,21 +1,25 @@
 <div class="post-container" style="padding-bottom: 50px;">
     <div loading-spinner></div>
     <div class="blue-title">课程列表</div>
-    <div class="course-list-row f13 c-grey3 mt10"><img src="/images/wechat/plus.png" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" width="15" class="fl ml10 mt11 retract-btn undis" /><span class="fl ml10">未命名课程</span><img src="/images/wechat/setting.png" width="15" class="fr mr10 mt10" /></div>
-    <ul class="class-list f13 c-grey3">
-        <li ng-click="goClass(course.id)" ng-repeat="course in courses" ng-class="{'border-bottom-none': $last}">
-            <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
-            <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
-            <span class="fr c-grey4">&gt;</span>
-            <span class="students-amount f12 fr mt10">{{course.course_student_num}}人</span>
-        </li>
-    </ul>
+
+    <div ng-repeat="syllabus in syllabuses">
+        <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 mt10"><img src="/images/wechat/plus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
+        <ul ng-show="!syllabus.show_plus" class="class-list f13 c-grey3">
+            <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
+                <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
+                <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
+                <span class="fr c-grey4">&gt;</span>
+                <span class="students-amount f12 fr mt10">{{course.member_count}}人</span>
+            </li>
+        </ul>
+    </div>
 
 
     <div class="bottom-tab-wrap mt10">
         <a ng-click="newClass()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">新建课程</a>
-        <a href="javascript:void(0);" class="weixin-tab link-blue2 border-top">加入班级</a>
+        <a ng-click="joinClass()" class="weixin-tab link-blue2 border-top">加入班级</a>
         <a ng-click="goResource()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">我的资源</a>
     </div>
 
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 4b578366d..5bfb462a3 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -4,53 +4,59 @@
     <div ng-if="discussion.act_type == 'Message'">
         <div class="post-container">
             <div loading-spinner></div>
-            <div class="post-wrapper">
+            <div class="post-wrapper" style="margin-top:0;">
                 <div class="post-main">
-                    <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
-                    <table class="post-detail-info"><tr>
-                        <td class="text-nowrap v-top">发布者：</td>
-                        <td>{{discussion.user.realname}}</td>
-                        </tr>
-                        <tr>
-                        <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                        <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;班级问答区</td>
-                    </tr></table>
-                    <div class="f13 c-grey3 mt10 text-control  post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
+                    <div class="post-avatar fl mr10"><img ng-src="{{discussion.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                    <div class="post-dynamic-author hidden fl">
+                        {{discussion.user.realname}}
+                        <img ng-if="discussion.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                        <img ng-if="discussion.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                    </div>
                     <div class="cl"></div>
-                    <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
+                    <div class="post-dynamic-title c-grey3 mt12 fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
+                    <div class="c-grey4 f13 mt10"><span class="mr10">{{discussion.course_project_name}} - 课程问答区</span><span>{{discussion.created_on}}</span></div>
+                    <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
+                    <div class="cl"></div>
+                    <div class="fr f13">
+                        <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                        <div ng-if="discussion.praise_count && !discussion.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
+                        <div ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
+                    </div>
+                    <div class="fr mr25 f13">
+                        <a ng-if="!discussion.replies_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                        <a ng-if="discussion.replies_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{discussion.replies_count}}</span></a>
+                    </div>
                     <div class="cl"></div>
-                </div>
-                <div class="post-interactive border-bottom">
-                    <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{discussion.replies_count}})</span></div>
-                    <div class="post-interactive-column c-grey" ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);">已赞 ({{discussion.praise_count}})</div>
-                    <div class="post-interactive-column c-grey" ng-if="!discussion.has_praise" ng-click="addPraise(discussion);">赞 ({{discussion.praise_count}})</div>
                 </div>
                 <div id="all_course_message_reply">
-                <div class="post-reply-wrap border-bottom" ng-repeat="journal in discussion.message_children">
-                    <div class="post-reply-row">
-                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                        <div class="ml55">
-                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
-                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                            <div class="post-reply-trigger fr undis">回复</div>
+                    <div ng-if="discussion.message_children == ''" style="border-top:1px solid #ccc;"></div>
+                    <div class="post-reply-wrap" ng-repeat="journal in discussion.message_children">
+                        <div class="post-reply-row">
+                            <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                            <div class="post-dynamic-author hidden fl">
+                                {{journal.user.realname}}
+                                <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                            </div>
+                            <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                            <div class="cl"></div>
+                            <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>
+                            <div class="cl"></div>
                         </div>
-                        <div class="cl"></div>
                     </div>
                 </div>
-                </div>
-                <div ng-if="!discussion.locked" class="post-input-wrap">
+
+                <div ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap2">
                     <div class="post-reply-row">
-                        <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                         <div class="post-input-container">
                             <textarea class="copy-input"></textarea>
-                            <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                            <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                            <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                            <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                            <div class="cl"></div>
                         </div>
-                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
-                        <div class="cl"></div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index f30105d40..d48dbd136 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -3,53 +3,59 @@
 <div loading-spinner></div>
 <div ng-if="news.act_type == 'News'">
     <div class="post-container">
-        <div class="post-wrapper">
+        <div class="post-wrapper" style="margin-top:0;">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{news.title}}</span></div>
-                <table class="post-detail-info"><tr>
-                    <td class="text-nowrap v-top">发布者：</td>
-                    <td>{{news.author.realname}}</td>
-                </tr>
-                    <tr>
-                        <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                        <td>{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;班级通知</td>
-                    </tr></table>
+                <div class="post-avatar fl mr10"><img ng-src="{{news.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                    {{news.author.realname}}
+                    <img ng-if="news.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="news.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
+                <div class="cl"></div>
+                <div class="post-dynamic-title c-grey3 mt12 fb">{{news.title}}</div>
+                <div class="c-grey4 f13 mt10"><span class="mr10">{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
                 <div class="f13 c-grey3 mt10 text-control  post-all-content" ng-bind-html="news.description|safeHtml"></div>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{news.created_on}}</span>
+                <div class="fr f13">
+                    <div ng-if="!news.praise_count" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                    <div ng-if="news.praise_count && !news.has_praise" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{news.praise_count}}</span></div>
+                    <div ng-if="news.has_praise" ng-click="decreasePraise(news);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{news.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                    <a ng-if="!news.comments_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                    <a ng-if="news.comments_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{news.comments_count}}</span></a>
+                </div>
                 <div class="cl"></div>
             </div>
-            <div class="post-interactive border-bottom">
-                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{news.comments_count}})</span></div>
-                <div class="post-interactive-column c-grey" ng-if="news.has_praise" ng-click="decreasePraise(news);">已赞 ({{news.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="!news.has_praise" ng-click="addPraise(news);">赞 ({{news.praise_count}})</div>
-            </div>
             <div id="all_news_reply">
-            <div class="post-reply-wrap border-bottom" ng-repeat="comments in news.comments">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{comments.author.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{comments.author.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="comments.comments|safeHtml"></div>
-                        <div class="post-reply-date fl">{{comments.created_on}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+                <div ng-if="news.comments == ''" style="border-top:1px solid #ccc;"></div>
+                <div class="post-reply-wrap" ng-repeat="comments in news.comments">
+                    <div class="post-reply-row">
+                        <div class="post-avatar fl mr10"><img ng-src="{{comments.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                        <div class="post-dynamic-author hidden fl">
+                            {{comments.author.realname}}
+                            <img ng-if="comments.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                            <img ng-if="comments.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                        </div>
+                        <div class="post-dynamic-time fr f13">{{comments.created_on}}</div>
+                        <div class="cl"></div>
+                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="comments.comments|safeHtml"></div>
+                        <div class="cl"></div>
                     </div>
-                    <div class="cl"></div>
                 </div>
             </div>
-            </div>
-            <div class="post-input-wrap">
+
+            <div id="post_input_1" class="post-input-wrap2">
                 <div class="post-reply-row">
-                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
                         <textarea class="copy-input"></textarea>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                        <div class="cl"></div>
                     </div>
-                    <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
-                    <div class="cl"></div>
                 </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/public/assets/wechat/edit_class.html b/public/assets/wechat/edit_class.html
new file mode 100644
index 000000000..c61ca8ce9
--- /dev/null
+++ b/public/assets/wechat/edit_class.html
@@ -0,0 +1,15 @@
+<div class="post-container">
+    <div loading-spinner></div>
+
+    <div class="blue-title">管理课程</div>
+    <form novalidate name="classForm">
+        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input class="new-class-input ml25 c-black" ng-model="syllabus.tmptitle" required placeholder="请输入课程名" /></div>
+
+        <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses" ng-show="course.can_setting"><span class="fl ml15 c-grey3">班级</span><input required class="new-class-input ml25 c-black" ng-model="course.tmpname" placeholder="请输入班级名" /><a ng-click="deleteClass($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
+        <div class="tac"><a ng-click="addClass()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div>
+        <a ng-click="newClass(classForm, syllabus)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
+    </form>
+
+    <my-alert message="alertService_1.message" title="alertService_1.title" visible="alertService_1.visible" cb="alertService_1.cb"></my-alert>
+    <my-alert2 message="alertService_2.message" title="alertService_2.title" visible="alertService_2.visible" cb="alertService_2.cb"></my-alert2>
+</div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 387b69867..b156a0e32 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -3,67 +3,66 @@
 <div loading-spinner></div>
 <div ng-if="homework.act_type == 'HomeworkCommon'">
     <div class="post-container">
-        <div class="post-wrapper">
+        <div class="post-wrapper" style="margin-top:0;">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{homework.name}}</span></div>
-                <table class="post-detail-info"><tr>
-                    <td class="text-nowrap v-top">发布者：</td>
-                    <td>
-                        <span ng-if="homework.author.realname != ' '">{{homework.author.realname}}</span>
-                        <span ng-if="homework.author.realname == ' '">{{homework.author.nickname}}</span></td>
-                </tr>
-                    <tr>
-                        <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                        <td>{{homework.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程作业</td>
-                    </tr>
-                    <tr>
-                        <td class="text-nowrap v-top">类&nbsp;&nbsp;&nbsp;别：</td>
-                        <td><span ng-if="homework.homework_type == 1">普通作业</span>
-                            <span ng-if="homework.homework_type == 2">编程作业</span>
-                            <span ng-if="homework.homework_type == 3">分组作业</span>
-                        </td>
-                    </tr>
-                </table>
+                <div class="post-avatar fl mr10"><img ng-src="{{homework.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                    {{homework.author.realname}}
+                    <img ng-if="homework.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="homework.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
+                <div class="cl"></div>
+                <div class="post-dynamic-title c-grey3 mt12 fb">{{homework.name}}</div>
+                <div class="c-grey4 f13 mt10"><span class="mr10">{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
                 <div class="f13 c-grey3 mt10 mb10 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
-                <span class="c-grey f13">迟交扣分：{{homework.late_penalty}}分</span><br/>
-                <span ng-if="!homework.anonymous_comment" class="c-grey f13">缺评扣分：{{homework.absence_penalty}}分/作品<br /></span>
-                <span ng-if="!homework.anonymous_comment" class="c-grey f13">匿评开启时间：{{homework.evaluation_start}}<br /></span>
+                <span class="c-grey f13 mr15">迟交扣分：{{homework.late_penalty}}分</span>
+                <span ng-if="!homework.anonymous_comment" class="c-grey f13">缺评扣分：{{homework.absence_penalty}}分/作品</span>
+                <span ng-if="!homework.anonymous_comment" class="c-grey f13 mr15">匿评开启时间：{{homework.evaluation_start}}</span>
                 <span ng-if="!homework.anonymous_comment" class="c-grey f13">匿评关闭时间：{{homework.evaluation_end}}</span>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{homework.publish_time}}</span>
+                <div class="fr f13">
+                    <div ng-if="!homework.praise_count" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                    <div ng-if="homework.praise_count && !homework.has_praise" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
+                    <div ng-if="homework.has_praise" ng-click="decreasePraise(homework);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                    <a ng-if="!homework.whomework_journal_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                    <a ng-if="homework.whomework_journal_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{homework.whomework_journal_count}}</span></a>
+                </div>
                 <div class="cl"></div>
             </div>
-            <div class="post-interactive border-bottom">
-                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{homework.whomework_journal_count}})</span></div>
-                <div class="post-interactive-column c-grey" ng-if="homework.has_praise" ng-click="decreasePraise(homework);">已赞 ({{homework.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="!homework.has_praise" ng-click="addPraise(homework);">赞 ({{homework.praise_count}})</div>
-            </div>
             <div id="all_homework_reply">
-            <div class="post-reply-wrap border-bottom" ng-repeat="journal in homework.journals_for_messages">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
-                        <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+
+                <div ng-if="homework.journals_for_messages == ''" style="border-top:1px solid #ccc;"></div>
+                <div class="post-reply-wrap" ng-repeat="journal in homework.journals_for_messages">
+                    <div class="post-reply-row">
+                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                        <div class="post-dynamic-author hidden fl">
+                            {{journal.user.realname}}
+                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                        </div>
+                        <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                        <div class="cl"></div>
+                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.notes|safeHtml"></div>
+                        <div class="cl"></div>
                     </div>
-                    <div class="cl"></div>
                 </div>
+
             </div>
-            </div>
-            <div class="post-input-wrap">
+
+            <div id="post_input_1" class="post-input-wrap2">
                 <div class="post-reply-row">
-                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
                         <textarea class="copy-input"></textarea>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput"  ng-model="formData.comment"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                        <div class="cl"></div>
                     </div>
-                    <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
-                    <div class="cl"></div>
                 </div>
             </div>
+
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 4fc085b7e..998cb58a6 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -3,57 +3,66 @@
 <div loading-spinner></div>
 <div ng-if="issue.act_type == 'Issue'">
     <div class="post-container">
-        <div class="post-wrapper">
+        <div class="post-wrapper" style="margin-top:0;">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{issue.subject}}</span></div>
-                <table class="post-detail-info"><tr>
-                    <td class="text-nowrap v-top">发布者：</td>
-                    <td>{{issue.author.realname}}</td>
-                </tr>
-                    <tr>
-                        <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                        <td>{{issue.project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目问题</td>
-                    </tr></table>
+
+                <div class="post-avatar fl mr10"><img ng-src="{{issue.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                    {{issue.author.realname}}
+                    <img ng-if="issue.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="issue.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
+                <div class="cl"></div>
+                <div class="post-dynamic-title c-grey3 mt12 fb">{{issue.subject}}</div>
+                <div class="c-grey4 f13 mt10"><span class="mr10">{{issue.project_name}} - 项目问题</span><span>{{issue.created_on}}</span></div>
+
                 <div class="f13 c-grey3 mt10 mb10 text-control post-all-content" ng-bind-html="issue.description|safeHtml"></div>
-                <span class="c-grey f13">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}<br>
-                优先级：{{issue.issue_priority}}<br />
-                指派给：{{issue.issue_assigned_to}}<br />
-                完成度：{{issue.done_ratio}}%</span>
+                <span class="c-grey f13 mr15">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}</span>
+                <span class="c-grey f13">优先级：{{issue.issue_priority}}</span><br/>
+                <span class="c-grey f13 mr15">指派给：{{issue.issue_assigned_to}}</span>
+                <span class="c-grey f13">完成度：{{issue.done_ratio}}%</span>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{issue.created_on}}</span>
+                <div class="fr f13">
+                    <div ng-if="!issue.praise_count" ng-click="addPraise(issue);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                    <div ng-if="issue.praise_count && !issue.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{issue.praise_count}}</span></div>
+                    <div ng-if="issue.has_praise" ng-click="decreasePraise(issue);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{issue.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                    <a ng-if="!issue.journals_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                    <a ng-if="issue.journals_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{issue.journals_count}}</span></a>
+                </div>
                 <div class="cl"></div>
             </div>
-            <div class="post-interactive border-bottom">
-                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{issue.journals_count}})</span></div>
-                <div class="post-interactive-column c-grey" ng-if="issue.has_praise" ng-click="decreasePraise(issue);">已赞 ({{issue.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="!issue.has_praise" ng-click="addPraise(issue);">赞 ({{issue.praise_count}})</div>
-            </div>
             <div id="all_issue_reply">
-            <div class="post-reply-wrap border-bottom" ng-repeat="journal in issue.issue_journals">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
-                        <div class="post-reply-date fl">{{journal.created_on}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+                <div ng-if="issue.issue_journals == ''" style="border-top:1px solid #ccc;"></div>
+                <div class="post-reply-wrap" ng-repeat="journal in issue.issue_journals">
+                    <div class="post-reply-row">
+                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                        <div class="post-dynamic-author hidden fl">
+                            {{journal.user.realname}}
+                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                        </div>
+                        <div class="post-dynamic-time fr f13">{{journal.created_on}}</div>
+                        <div class="cl"></div>
+                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.notes|safeHtml"></div>
+                        <div class="cl"></div>
                     </div>
-                    <div class="cl"></div>
                 </div>
             </div>
-            </div>
-            <div class="post-input-wrap">
+
+            <div id="post_input_1" class="post-input-wrap2">
                 <div class="post-reply-row">
-                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
-                        <div class="post-input-container">
-                            <textarea class="copy-input"></textarea>
-                            <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
-                        </div>
-                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
-                    <div class="cl"></div>
+                    <div class="post-input-container">
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                        <div class="cl"></div>
+                    </div>
                 </div>
             </div>
+
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 9fd09de2c..0724e98b7 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -2,46 +2,63 @@
 <div loading-spinner></div>
 <div ng-if="message.act_type == 'JournalsForMessage'">
     <div class="post-container">
-        <div class="post-wrapper">
+        <div class="post-wrapper" style="margin-top:0;">
             <div class="post-main">
-                <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
-                <div class="post-title">{{message.created_on}}</div>
+
+                <div class="post-avatar fl mr10"><img ng-src="{{message.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                    {{message.user.realname}}
+                    <img ng-if="message.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="message.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
                 <div class="cl"></div>
+                <div class="c-grey4 f13 mt10"><span class="mr10">留言</span><span>{{message.created_on}}</span></div>
+
                 <div class="f13 c-grey3 mt10 text-control" ng-bind-html="message.notes|safeHtml"></div>
                 <div class="cl"></div>
-            </div>
-            <div class="post-interactive border-bottom">
-                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{message.reply_count}})</span></div>
-                <div class="post-interactive-column c-grey" ng-if="message.has_praise" ng-click="decreasePraise(message);">已赞 ({{message.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="!message.has_praise" ng-click="addPraise(message);">赞 ({{message.praise_count}})</div>
+                <div class="fr f13">
+                    <div ng-if="!message.praise_count" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                    <div ng-if="message.praise_count && !message.has_praise" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{message.praise_count}}</span></div>
+                    <div ng-if="message.has_praise" ng-click="decreasePraise(message);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{message.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                    <a ng-if="!message.reply_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                    <a ng-if="message.reply_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{message.reply_count}}</span></a>
+                </div>
+                <div class="cl"></div>
             </div>
             <div id="all_message_reply">
 
-                <div class="post-reply-wrap border-bottom" ng-repeat="journal in message.child_reply">
+                <div ng-if="message.child_reply == ''" style="border-top:1px solid #ccc;"></div>
+                <div class="post-reply-wrap" ng-repeat="journal in message.child_reply">
                     <div class="post-reply-row">
-                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                        <div class="ml55">
-                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></div>
-                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                            <div class="post-reply-trigger fr undis">回复</div>
+                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                        <div class="post-dynamic-author hidden fl">
+                            {{journal.user.realname}}
+                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                         </div>
+                        <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                        <div class="cl"></div>
+                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.notes|safeHtml"></div>
                         <div class="cl"></div>
                     </div>
                 </div>
+
             </div>
-            <div class="post-input-wrap">
+
+            <div id="post_input_1" class="post-input-wrap2">
                 <div class="post-reply-row">
-                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
                         <textarea class="copy-input"></textarea>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                        <div class="cl"></div>
                     </div>
-                    <button ng-click="addReply(formData)" ng-hide="formData.disabled" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
-                    <div class="cl"></div>
                 </div>
             </div>
+
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/login.html b/public/assets/wechat/login.html
index 309db29de..1283ad281 100644
--- a/public/assets/wechat/login.html
+++ b/public/assets/wechat/login.html
@@ -22,4 +22,4 @@
     </form>
 </div>
 
-<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
\ No newline at end of file
+<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
diff --git a/public/assets/wechat/myresource.html b/public/assets/wechat/myresource.html
index 9d3bf0fda..de21b7136 100644
--- a/public/assets/wechat/myresource.html
+++ b/public/assets/wechat/myresource.html
@@ -1,26 +1,29 @@
 <div class="post-container">
+    <div loading-spinner></div>
     <div class="class-detail-name">我的资源</div>
     <div class="tab-wrap">
         <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
     </div>
     <div class="class-search-wrap">
         <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
-            <input class="class-detail-search" placeholder="输入关键词进行搜索" />
+            <input class="class-detail-search" placeholder="输入关键词进行搜索" ng-model="searchText" />
         </div>
     </div>
+
     <div ng-class="{'undis': currentTab!=1}">
-        <div ng-repeat="r in resources" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.filename}}</span><a herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
-        <p ng-show="resources.length<=0" class="class-test-tip">暂无课件,<br />
+      <div ng-repeat="r in resources|filter:{filename:searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.filename}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2">发送</a></div>
+        <p ng-show="resources && resources.length<=0" class="class-test-tip">暂无课件,<br />
             请登录Trustie网站,在PC浏览器中上传课件。</p>
     </div>
     <div ng-class="{'undis': currentTab!=2}">
-        <div ng-repeat="r in homeworks" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.homework_name}}</span><a herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
-        <p ng-show="homeworks.length<=0" class="class-test-tip">暂无作业,<br />
+      <div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.homework_name}}</span></div>
+        <p ng-show="homeworks && homeworks.length<=0" class="class-test-tip">暂无作业,<br />
             请登录Trustie网站,在PC浏览器中创建作业。</p>
     </div>
     <div ng-class="{'undis': currentTab!=3}">
-        <div ng-repeat="r in exercise" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.exercise_name}}</span><a herf="javascript:void(0);" class="fr mr10 link-blue2">发送</a></div>
-        <p ng-show="exercise.length<=0" class="class-test-tip">暂无测验,<br />
+      <div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10">{{r.exercise_name}}</span></div>
+        <p ng-show="exercise && exercise.length<=0" class="class-test-tip">暂无测验,<br />
             请登录Trustie网站,在PC浏览器中创建测验。</p>
     </div>
+
 </div>
diff --git a/public/assets/wechat/new_class.html b/public/assets/wechat/new_class.html
index 2bb5d2aac..039d19d75 100644
--- a/public/assets/wechat/new_class.html
+++ b/public/assets/wechat/new_class.html
@@ -1,7 +1,14 @@
 <div class="post-container">
+    <div loading-spinner></div>
+
     <div class="blue-title">新建课程</div>
-    <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input class="new-class-input ml25" placeholder="请输入课程名" /></div>
-    <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">班级</span><input class="new-class-input ml25" placeholder="请输入班级名" /></div>
-    <div class="tac"><a herf="javascript:void(0);" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div>
-    <a href="javascript:void(0);" class="finish-btn">完成</a>
+    <form novalidate name="classForm">
+    <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input class="new-class-input ml25" ng-model="syllabus.title" required placeholder="请输入课程名" /></div>
+
+    <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses"><span class="fl ml15 c-grey3">班级</span><input required class="new-class-input ml25" ng-model="course.name" placeholder="请输入班级名" /><a ng-click="deleteClass($index)" ng-show="!$first" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
+    <div class="tac"><a ng-click="addClass()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div>
+    <a ng-click="newClass(classForm, syllabus)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
+    </form>
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
 </div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 8be12c403..1757822ab 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -3,51 +3,58 @@
 <div loading-spinner></div>
 <div ng-if="discussion.act_type == 'Message'">
     <div class="post-container">
-        <div class="post-wrapper">
+        <div class="post-wrapper" style="margin-top:0;">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
-                <table class="post-detail-info"><tr>
-                    <td class="text-nowrap v-top">发布者：</td>
-                    <td>{{discussion.user.realname}}</td>
-                </tr>
-                    <tr>
-                        <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                        <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目讨论区</td>
-                    </tr></table>
+                <div class="post-avatar fl mr10"><img ng-src="{{discussion.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                    {{discussion.user.realname}}
+                    <img ng-if="discussion.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="discussion.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
+                <div class="cl"></div>
+                <div class="post-dynamic-title c-grey3 mt12 fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
+                <div class="c-grey4 f13 mt10"><span class="mr10">{{discussion.course_project_name}} - 项目讨论区</span><span>{{discussion.created_on}}</span></div>
+
                 <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
+                <div class="fr f13">
+                    <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                    <div ng-if="discussion.praise_count && !discussion.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
+                    <div ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                    <a ng-if="!discussion.replies_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                    <a ng-if="discussion.replies_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{discussion.replies_count}}</span></a>
+                </div>
                 <div class="cl"></div>
             </div>
-            <div class="post-interactive border-bottom">
-                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{discussion.replies_count}})</span></div>
-                <div class="post-interactive-column c-grey" ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);">已赞 ({{discussion.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="!discussion.has_praise" ng-click="addPraise(discussion);">赞 ({{discussion.praise_count}})</div>
-            </div>
+
             <div id="all_course_message_reply">
-                <div class="post-reply-wrap border-bottom" ng-repeat="journal in discussion.message_children">
+                <div ng-if="discussion.message_children == ''" style="border-top:1px solid #ccc;"></div>
+                <div class="post-reply-wrap" ng-repeat="journal in discussion.message_children">
                     <div class="post-reply-row">
-                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                        <div class="ml55">
-                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                            <div class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></div>
-                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                            <div class="post-reply-trigger fr undis">回复</div>
+                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                        <div class="post-dynamic-author hidden fl">
+                            {{journal.user.realname}}
+                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                         </div>
+                        <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                        <div class="cl"></div>
+                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>
                         <div class="cl"></div>
                     </div>
                 </div>
             </div>
-            <div ng-if="!discussion.locked" class="post-input-wrap">
+            <div ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap2">
                 <div class="post-reply-row">
-                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
                         <textarea class="copy-input"></textarea>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                        <div class="cl"></div>
                     </div>
-                    <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                    <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr mt10">回复</button>
-                    <div class="cl"></div>
                 </div>
             </div>
         </div>
diff --git a/public/assets/wechat/reg.html b/public/assets/wechat/reg.html
index 9184fd0ed..9e2978e3b 100644
--- a/public/assets/wechat/reg.html
+++ b/public/assets/wechat/reg.html
@@ -1,4 +1,7 @@
 <div class="post-container">
+
+    <div loading-spinner></div>
+
     <form name="regFrm" novalidate>
         <div class="blue-title">注册<span class="f13 blue-title-sub" ng-click="goLogin()">登录</span></div>
         <img src="/images/wechat/male.jpg" width="60" class="img-circle mt15 block-center"/>
@@ -40,4 +43,5 @@
     </form>
 </div>
 
-<my-alert message="errDialog.message" title="errDialog.title" visible="errDialog.visible"></my-alert>
\ No newline at end of file
+<my-alert message="errDialog.message" title="errDialog.title" visible="errDialog.visible"></my-alert>
+<my-alert message="successDialog.message" title="successDialog.title" visible="successDialog.visible" cb="successDialog.cb"></my-alert>
\ No newline at end of file
diff --git a/public/assets/wechat/send_class_list.html b/public/assets/wechat/send_class_list.html
new file mode 100644
index 000000000..6d1860e0c
--- /dev/null
+++ b/public/assets/wechat/send_class_list.html
@@ -0,0 +1,24 @@
+
+<div class="post-container">
+    <div loading-spinner></div>
+
+    <div class="blue-title">发送课程列表</div>
+
+
+    <div ng-show="syllabus.can_setting" ng-repeat="syllabus in syllabuses">
+        <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 mt10"><img src="/images/wechat/plus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span></div>
+        <ul ng-show="!syllabus.show_plus" class="class-list f13 c-grey3">
+            <li ng-show="course.can_setting" ng-click="selectCourse(course)" ng-class="{'border-bottom-none': $last }" ng-repeat="course in syllabus.courses"><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">{{course.name}}</span><span ng-class="['login-box', 'fr', 'mr5', 'mt12', {'checked': course.checked}]"></span></li>
+        </ul>
+    </div>
+
+
+
+    <!--<div class="course-list-row f13 c-grey3 mt10"><img src="/images/wechat/plus.png" width="15" class="fl ml10 mt11 spread-btn undis" /><img src="/images/wechat/minus.png" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">未命名课程</span></div>-->
+    <!--<ul class="class-list f13 c-grey3">-->
+        <!--<li ng-click="selectCourse(course)" ng-class="{'border-bottom-none': $last }" ng-repeat="course in courses"><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">{{course.name}}</span><span ng-class="['login-box', 'fr', 'mr5', 'mt12', {'checked': course.checked}]"></span></li>-->
+    <!--</ul>-->
+
+    <div class="btn2 bg-blue" ng-click="sendToCourses()">发送</div>
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>
diff --git a/public/assets/wechat/templates/alert2.html b/public/assets/wechat/templates/alert2.html
new file mode 100644
index 000000000..d798ab20f
--- /dev/null
+++ b/public/assets/wechat/templates/alert2.html
@@ -0,0 +1,11 @@
+<div class="weui_dialog_confirm" ng-show="visible">
+    <div class="weui_mask"></div>
+    <div class="weui_dialog">
+      <div class="weui_dialog_hd"><strong class="weui_dialog_title">{{title}}</strong></div>
+      <div class="weui_dialog_bd">{{message}}</div>
+        <div class="weui_dialog_ft">
+            <a class="weui_btn_dialog default" ng-click="dismiss()">取消</a>
+            <a class="weui_btn_dialog primary" ng-click="confirm()">确定</a>
+        </div>
+    </div>
+</div>
diff --git a/public/assets/wechat/templates/loading.html b/public/assets/wechat/templates/loading.html
new file mode 100644
index 000000000..8113a78c2
--- /dev/null
+++ b/public/assets/wechat/templates/loading.html
@@ -0,0 +1,21 @@
+<!-- loading toast -->
+<div id="loadingToast" class="weui_loading_toast" ng-show="activeCalls>0">
+    <div class="weui_mask_transparent"></div>
+    <div class="weui_toast">
+        <div class="weui_loading">
+            <div class="weui_loading_leaf weui_loading_leaf_0"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_1"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_2"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_3"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_4"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_5"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_6"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_7"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_8"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_9"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_10"></div>
+            <div class="weui_loading_leaf weui_loading_leaf_11"></div>
+        </div>
+        <p class="weui_toast_content">数据加载中</p>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index f24704e7c..a342a9608 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1374,6 +1374,41 @@ function expand_journal_reply(container, btnid, id, type, div_id, allow_delete)
     }
 }
 
+function expand_message_reply(container, btnid, id, type, div_id, is_course, is_board) {
+    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,
+                is_course: is_course,
+                is_board: is_board
+            },
+            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_reply_homework(container, btnid, id, type, div_id, is_in_course, course_activity, user_activity_id) {
     var target = $(container);
     var btn = $(btnid);
@@ -1566,7 +1601,7 @@ function expand_course_list(id, target, btnid, count) {
         target.show();
     }else{
         btn.data('init',0);
-        btn.html('共'+count+ '个课程，点击全部展开');
+        btn.html('共'+count+ '个班级，点击全部展开');
         target.hide();
         target.eq(0).show();
         target.eq(1).show();
@@ -1775,3 +1810,72 @@ function showcity(province, cityField) {
          }*/
     }
 }
+
+function regex_syllabus_name() {
+    var name = $.trim($("#new_syllabus_name").val());
+    if(name.length < 2)
+    {
+        $("#new_syllabus_name_notice").show();
+        return false;
+    }
+    else
+    {
+        $("#new_syllabus_name_notice").hide();
+        return true;
+    }
+}
+
+function alert_new_syllabus(course_id, flag){
+    htmlvalue = "<div><h2 style='text-align: center'>新建课程</h2><ul>" +
+        "<li class='ml45'>" +
+        "<label><span class='c_red'>*</span>&nbsp;课程名称&nbsp;&nbsp;：</label>" +
+        "<input  type='text' name='title' id='new_syllabus_name' class='name_input' placeholder='例如：设计管理' maxlength='100' onkeyup='regex_syllabus_name();'><br>" +
+        "<span class='c_red' id='new_syllabus_name_notice' style='display: none; font-size: 12px;'>课程名称不能为空且至少有两个字符</span>" +
+        "</li>" +
+    "<div class='cl'></div>" +
+    "<li class='ml45'>" +
+        "<label><span class='c_white'>*</span>&nbsp;英文名称&nbsp;&nbsp;：</label>" +
+            "<input  type='text' name='eng_name' id='new_syllabus_eng_name' placeholder='例如：Management of design' class='name_input' maxlength='100'>" +
+            "</li>" +
+            "<div class='cl'></div>" +
+            "<li class='ml90' >" +
+                "<a href='javascript:void(0)' style='margin-left: 145px;' class='Blue-btn fl' onclick='admin_new_syllabus("+course_id+","+flag+");' >提交</a>" +
+                "<a href='javascript:void(0)' style='margin-left: 50px;' class='Blue-btn fl' onclick='hideModal();' >取消</a>" +
+                    "<div class='cl'></div>" +
+                "</li>" +
+                    "</ul></div>";
+    pop_up_box(htmlvalue,600,30,50);
+}
+
+function admin_new_syllabus(course_id, flag){
+    if(regex_syllabus_name()) {
+        $.ajax({
+            type: "post",
+            url: "/admin/create_syllabus",
+            data: {course_id: course_id,
+                title: $("#new_syllabus_name").val(),
+                eng_name: $("#new_syllabus_eng_name").val(),
+                flag: flag},
+            success: function (data) {
+            }
+        });
+        hideModal();
+    }
+}
+
+//执行修改courseName方法
+function updateCourseName(){
+    if(isdb){
+        isdb = false;
+        if($("#renameCourseName").val() == tagName){ //如果值一样，则恢复原来的状态
+            ele.parent().css("border","");
+            ele.parent().html(tagNameHtml);
+        }
+        else{
+            $.post(
+                '<%= admin_update_course_name_path %>',
+                {"course_id": tagId, "name": $("#renameCourseName").val().trim()}
+            );
+        }
+    }
+}
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 8215f3aa1..0e60f01c9 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -224,20 +224,6 @@ function submit_new_syllabus()
     }
 }
 
-function regex_syllabus_name() {
-    var name = $.trim($("#new_syllabus_name").val());
-    if(name.length < 2)
-    {
-        $("#new_syllabus_name_notice").show();
-        return false;
-    }
-    else
-    {
-        $("#new_syllabus_name_notice").hide();
-        return true;
-    }
-}
-
 //课程讨论区
 function regexTopicSubject() {
     var name = $("#message_subject").val();
diff --git a/public/javascripts/syllabus.js b/public/javascripts/syllabus.js
index 1b2a18a41..e3dc2e09b 100644
--- a/public/javascripts/syllabus.js
+++ b/public/javascripts/syllabus.js
@@ -48,6 +48,24 @@ function edit_syllabus_eng_name(url){
     );
 }
 
+//编辑课程名称
+function show_edit_title() {
+    $("#syllabus_title_show").hide();
+    $("#syllabus_title_edit").show();
+    $("#syllabus_title_edit").focus();
+}
+
+//编辑课程名称之后提交
+function edit_syllabus_title(url){
+    $.get(
+        url,
+        { title: $("#syllabus_title_edit").val().trim() },
+        function (data) {
+
+        }
+    );
+}
+
 //展开所有属性
 function toggle_all_syllabus_attr(){
     var btn = $("#show_all_syllabus_attr");
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index 1fea6f08a..7f9e91eb0 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -1,22 +1,24 @@
 var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location","$routeParams",function(t,a,e,r){g_redirect_path&&g_redirect_path.length>1&&(e.path(g_redirect_path),g_redirect_path=null),t.$on("$routeChangeError",function(t,a,r){a&&a.templateUrl&&(a.templateUrl.endsWith("login.html")||a.templateUrl.endsWith("reg.html")||e.path("/login"))}),t.$on("$routeChangeStart",function(t,a,e){})}]);
 app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,e,n){this.message=e,this.title=t,this.visible=!0,this.cb=n},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,e,n,o,a){var i=function(){var a=n.defer(),i=c();if(i&&i.length>10)a.resolve(i);else{window.g_code||e.code||o.get("code");t.post("/wechat/get_bind",{}).then(function(t){0!=t.data.status?a.reject(t.data.message):(o.save("token",t.data.token),a.resolve(t.data.token))})["catch"](function(t){a.reject(t)})}return a.promise},c=function(){return o.get("token")};return{get_bind:i,token:c}}]),app.factory("session",function(){return{save:function(t,e){sessionStorage.setItem(t,e)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},e=function(e,n){t[e]=n},n=function(e){return t[e]};return{save:e,get:n}}),app.factory("common",["$http","auth","$routeParams",function(t,e,n){var o=function(n,o,a,i){if(a.comment&&!(a.comment.length<=0)){var c=a.comment.replace(/\n/g,"<br/>"),s={type:o,content:c,token:e.token()};a.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+n,data:s}).then(function(t){a.disabled=!1,"function"==typeof i&&i()},function(t){})}},a=function(n,o){return t({method:"GET",url:apiUrl+o+"/"+n+"?token="+e.token()})},i=function(n){n.praise_count+=1,n.has_praise=!0,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},c=function(n){n.praise_count-=1,n.has_praise=!1,t({method:"POST",url:apiUrl+"praise/"+n.act_id,data:{token:e.token(),type:n.act_type}}).then(function(t){console.log(t.data)},function(t){})},s=function(t){t.scope.formData={comment:""};var e=function(e){a(e,t.type).then(function(e){t.loadCallback(e.data)},function(t){})};e(t.id),t.scope.addReply=function(n){console.log(n.comment),o(t.id,t.replyType,n,function(){t.scope.formData={comment:""},e(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=i,t.scope.decreasePraise=c};return{init:s,addCommonReply:o,loadCommonData:a,addCommonPraise:i,decreaseCommonPraise:c}}]);
 app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]),app.filter("identify",function(){return function(t){return"TeachingAsistant"==t?"教辅":""}});
-app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(a,t,e,o,i,c,n,r,s){e.replaceUrl=function(a){return a},e.alertService=s.create(),console.log("ActivityController load"),e.page=n.get("page")||0,e.activities=n.get("activities")||[],e.has_more=n.get("has_more"),e.loadActData=function(a){e.page=a,o({method:"POST",url:apiUrl+"activities",data:{token:c.token(),page:a}}).then(function(a){a.data.page>0?e.activities=e.activities.concat(a.data.data):e.activities=a.data.data,n.save("activities",e.activities),e.has_more=a.data.count+10*a.data.page<a.data.all_count,n.save("has_more",e.has_more),n.save("page",a.data.page),console.log(a.data)},function(a){})},e.activities.length<=0?e.loadActData(0):i(function(){window.scrollTo(0,n.get("yoffset"))}),e.goDetail=function(a,e,o){n.save("yoffset",window.document.body.scrollTop),t.path("/"+a+"/"+e)},e.addPraise=function(a){r.addCommonPraise(a)},e.decreasePraise=function(a){r.decreaseCommonPraise(a)}}]);
+app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(e,a,t,c,o,i,r,s,n){t.replaceUrl=function(e){return e},t.menus=["所有动态","课程动态","项目动态"],t.alertService=n.create(),console.log("ActivityController load"),t.page=r.get("page")||0,t.activities=r.get("activities")||[],t.has_more=r.get("has_more"),t.course_page=r.get("course_page")||0,t.course_activities=r.get("course_activities")||[],t.course_has_more=r.get("course_has_more"),t.project_page=r.get("project_page")||0,t.project_activities=r.get("project_activities")||[],t.project_has_more=r.get("project_has_more"),t.loadActData=function(e,a){switch(container_type="All",e){case 1:container_type="All",t.page=a;break;case 2:container_type="Course",t.course_page=a;break;case 3:container_type="Project",t.project_page=a}c({method:"POST",url:apiUrl+"activities",data:{token:i.token(),page:a,container_type:container_type}}).then(function(e){if(e.data.page>0)switch(e.data.container_type){case"All":t.activities=t.activities.concat(e.data.data);break;case"Course":t.course_activities=t.course_activities.concat(e.data.data);break;case"Project":t.project_activities=t.project_activities.concat(e.data.data);break;case 3:}else switch(e.data.container_type){case"All":t.activities=e.data.data;break;case"Course":t.course_activities=e.data.data;break;case"Project":t.project_activities=e.data.data;break;case 3:}switch(e.data.container_type){case"All":r.save("activities",t.activities),t.has_more=e.data.count+10*e.data.page<e.data.all_count,r.save("has_more",t.has_more),r.save("page",e.data.page);break;case"Course":r.save("course_activities",t.course_activities),t.course_has_more=e.data.count+10*e.data.page<e.data.all_count,r.save("course_has_more",t.course_has_more),r.save("course_page",e.data.page);break;case"Project":r.save("project_activities",t.project_activities),t.project_has_more=e.data.count+10*e.data.page<e.data.all_count,r.save("project_has_more",t.project_has_more),r.save("project_page",e.data.page);break;case 3:}console.log(e.data)},function(e){})},t.tab=function(e){switch(t.currentTab=e,e){case 1:t.activities.length<=0&&t.loadActData(e,0);break;case 2:t.course_activities.length<=0&&t.loadActData(e,0);break;case 3:t.project_activities.length<=0&&t.loadActData(e,0)}},t.currentTab=1,t.activities.length<=0?t.loadActData(1,0):o(function(){window.scrollTo(0,r.get("yoffset"))}),t.goDetail=function(e,t,c){r.save("yoffset",window.document.body.scrollTop),a.path("/"+e+"/"+t)},t.addPraise=function(e){s.addCommonPraise(e)},t.decreasePraise=function(e){s.decreaseCommonPraise(e)}}]);
 app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,l,t,n,a){a.init({id:t.id,scope:o,type:"blog_comments",replyType:"BlogComment",loadCallback:function(l){o.blog=l.data},replyCallback:function(){}})}]);
-app.controller("ClassController",["$scope","config","$http","auth","$location","$routeParams",function(e,t,s,o,a,n){var c=e,r=n.id,u=function(){c.teachers.length<=0&&s.get(t.apiUrl+"courses/teachers?token="+o.token()+"&course_id="+r).then(function(e){console.log(e.data),c.teachers=e.data.data}),c.students.length<=0&&s.get(t.apiUrl+"courses/students?token="+o.token()+"&course_id="+r).then(function(e){console.log(e.data),c.students=e.data.data})},h=function(){c.resources.length<=0&&s.post(t.apiUrl+"courses/"+r+"/attachments",{token:o.token(),name:""}).then(function(e){c.resources=e.data.data})},i=function(){c.homeworks.length<=0&&s.get(t.apiUrl+"courses/homeworks/"+r+"?token="+o.token()).then(function(e){c.homeworks=e.data.data,console.log(e.data)})},l=function(){c.exercises.length<=0&&s.get(t.apiUrl+"courses/"+r+"/exercises?token="+o.token()).then(function(e){c.exercises=e.data.data,console.log(e.data)})};c.isTeacher=!1,c.currentTab=1,c.tab=function(e){c.currentTab=e,c.searchText="",c.showClassMate=!1,c.showResources=!1,c.showHomework=!1,c.showTestcase=!1,c.isTeacher?1==e?(h(),c.showResources=!0):2==e?(i(),c.showHomework=!0):3==e?(l(),c.showTestcase=!0):4==e&&(u(),c.showClassMate=!0):2==e?(u(),c.showClassMate=!0):1==e&&(h(),c.showResources=!0)},c.course={},c.students=[],c.teachers=[],c.resources=[],c.homeworks=[],c.exercises=[],c.invite=function(){a.path("/invite_code").search({id:r})},s.get(t.apiUrl+"courses/"+r+"?token="+o.token()).then(function(e){console.log(e.data),c.course=e.data.data,d(c.course.current_user_is_teacher),c.tab(1)});var d=function(e){c.isTeacher=e,e?c.menus=["课件","作业","小测验","学生管理"]:c.menus=["课堂资源","我的同学"]}}]);
-app.controller("ClassListController",["$scope","config","auth","$http","$location",function(o,s,t,a,e){var n=o;n.courses=[],a.get(s.apiUrl+"courses?token="+t.token()+"&per_page_count=10&page=1").then(function(o){console.log(o.data),n.courses=o.data.data}),n.goClass=function(o){console.log(o),e.path("/class").search({id:o})},n.newClass=function(){e.path("/new_class")},n.goResource=function(){e.path("/myresource")}}]);
+app.controller("ClassController",["$scope","config","$http","auth","$location","$routeParams",function(e,s,t,o,a,n){var r=e,c=n.id,u=function(){r.teachers.length<=0&&t.get(s.apiUrl+"courses/teachers?token="+o.token()+"&course_id="+c).then(function(e){console.log(e.data),r.teachers=e.data.data}),r.students.length<=0&&t.get(s.apiUrl+"courses/students?token="+o.token()+"&course_id="+c).then(function(e){console.log(e.data),r.students=e.data.data})},i=function(){r.resources.length<=0&&t.post(s.apiUrl+"courses/"+c+"/attachments",{token:o.token(),name:""}).then(function(e){r.resources=e.data.data,r.resources_tag=!0})},h=function(){r.homeworks.length<=0&&t.get(s.apiUrl+"courses/homeworks/"+c+"?token="+o.token()).then(function(e){r.homeworks=e.data.data,console.log(e.data),r.homeworks_tag=!0})},l=function(){r.exercises.length<=0&&t.get(s.apiUrl+"courses/"+c+"/exercises?token="+o.token()).then(function(e){r.exercises=e.data.data,console.log(e.data),r.exercises_tag=!0})};r.isTeacher=!1,r.currentTab=1,r.tab=function(e){r.currentTab=e,r.searchText="",r.showClassMate=!1,r.showResources=!1,r.showHomework=!1,r.showTestcase=!1,r.resources_tag=!1,r.homeworks_tag=!1,r.exercises_tag=!1,r.isTeacher?1==e?(i(),r.showResources=!0):2==e?(h(),r.showHomework=!0):3==e?(l(),r.showTestcase=!0):4==e&&(u(),r.showClassMate=!0):2==e?(u(),r.showClassMate=!0):1==e&&(i(),r.showResources=!0)},r.course={},r.students=[],r.teachers=[],r.resources=[],r.homeworks=[],r.exercises=[],r.invite=function(){a.path("/invite_code").search({id:c})},r.sendFile=function(e){a.path("/send_class_list").search({id:e.id})},t.get(s.apiUrl+"courses/"+c+"?token="+o.token()).then(function(e){console.log(e.data),r.course=e.data.data,d(r.course.current_user_is_teacher),r.tab(1)});var d=function(e){r.isTeacher=e,e?r.menus=["课件","作业","小测验","学生管理"]:r.menus=["课件","我的同学"]}}]);
+app.controller("ClassListController",["$scope","config","auth","$http","$location","alertService","rms",function(e,s,a,t,o,l,n){var c=e;c.syllabuses=n.get("syllabuses")||[],c.alertService=l.create();var i=function(){t.get(s.apiUrl+"syllabuses?token="+a.token()).then(function(e){console.log(e.data),c.syllabuses=e.data.data,n.save("syllabuses",c.syllabuses)})};c.syllabuses.length<=0&&i(),c.goClass=function(e){console.log(e),o.path("/class").search({id:e})},c.newClass=function(){t.post(s.apiUrl+"syllabuses/auth",{token:a.token()}).then(function(e){console.log(e.data),0==e.data.auth?c.alertService.showMessage("提示","非教师身份不能创建课程哦~"):o.path("/new_class")})},c.goResource=function(){o.path("/myresource")},c.joinClass=function(){var e=window.prompt("请输入5位班级邀请码(不区分大小写)");e&&5==e.length?t.post(s.apiUrl+"courses/join",{token:a.token(),invite_code:e}).then(function(e){console.log(e.data),0!=e.data.status?c.alertService.showMessage("错误",e.data.message):(c.alertService.showMessage("提示","加入课程成功"),i())}):e&&c.alertService.showMessage("错误","邀请码格式不正确")},c.onSetting=function(e){console.log(e),n.save("current_edit_syllobus",e),o.path("/edit_class").search({id:e.id})}}]);
 app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,e,t,n,a){a.init({id:t.id,scope:o,type:"newss",replyType:"News",loadCallback:function(e){o.news=e.data},replyCallback:function(){}})}]);
 app.controller("DiscussionController",["$scope","$http","$routeParams","auth","common",function(o,s,a,e,n){n.init({id:a.id,scope:o,type:"messages",replyType:"Message",loadCallback:function(s){o.discussion=s.data},replyCallback:function(){}})}]);
+app.controller("EditClassController",["$scope","$http","auth","config","alertService","$location","$routeParams","rms",function(s,e,a,l,t,o,r,u){var n=s;n.syllabus=u.get("current_edit_syllobus");var i=r.id;if(n.syllabus||e.get(l.apiUrl+"syllabuses/"+i+"?token="+a.token()).then(function(s){if(console.log(s.data),n.syllabus=s.data.data,n.syllabus){for(var e in n.syllabus.courses){var a=n.syllabus.courses[e];a.tmpname=a.name}n.syllabus.tmptitle=n.syllabus.title}}),console.log(n.syllabus),n.syllabus){for(var c in n.syllabus.courses){var d=n.syllabus.courses[c];d.tmpname=d.name}n.syllabus.tmptitle=n.syllabus.title}n.alertService_1=t.create(),n.alertService_2=t.create(),n.addClass=function(){n.syllabus.courses.push({can_setting:!0})},n.deleteClass=function(s){var t=n.syllabus.courses[s];t.id>0?n.alertService_2.showMessage("提示","您确定要删除该班级吗？",function(){e.post(l.apiUrl+"courses/"+t.id+"/del",{token:a.token()}).then(function(e){0!=e.data.status?n.alertService_1.showMessage("出错了",e.data.message):n.alertService_1.showMessage("提示","删除班级成功",function(){n.syllabus.courses.splice(s,1)}),console.log(e.data.data)})}):n.syllabus.courses.splice(s,1)},n.newClass=function(s,t){if(s.$setSubmitted(),console.log(t),!s.$valid)return void console.log(s.$error);var r=[],c=[];for(var d in n.syllabus.courses){var b=n.syllabus.courses[d];b.id?b.tmpname!=b.name&&c.push({id:b.id,name:b.tmpname}):r.push(b.tmpname)}e.post(l.apiUrl+"syllabuses/"+i+"/edit",{token:a.token(),id:i,title:n.syllabus.tmptitle,add_courses:r,modify_courses:c}).then(function(s){0!=s.data.status?n.alertService_1.showMessage("出错了",s.data.message):n.alertService_1.showMessage("提示","保存课程成功",function(){u.save("syllabuses",[]),o.path("/class_list")}),console.log(s.data.data)})}}]);
 app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,e,l,n,r){r.init({id:l.id,scope:o,type:"whomeworks",replyType:"HomeworkCommon",loadCallback:function(e){console.log(e),o.homework=e.data},replyCallback:function(){}})}]);
 app.controller("InviteCodeController",["$scope","$http","$routeParams","config","auth",function(t,e,i,n,o){var a=t;a.course={};var c=i.id;e.get(n.apiUrl+"courses/"+c+"?token="+o.token()).then(function(t){console.log(t.data),a.course=t.data.data}),a.share=function(){window.WeixinJSBridge.invoke("sendAppMessage",{appid:"wxf694495398c7d470",type:"link",data_url:"",img_url:"http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640",img_height:370,img_width:550,link:"http://view.inews.qq.com/a/WXN2013101101385701",desc:"desc",title:"title"},function(t){})}}]);
 app.controller("IssueController",["$scope","$http","$routeParams","auth","common",function(o,e,l,s,t){t.init({id:l.id,scope:o,type:"issues",replyType:"Issue",loadCallback:function(e){console.log(e),o.issue=e.data},replyCallback:function(){}})}]);
 app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,a,e,l,n){n.init({id:e.id,scope:o,type:"journal_for_messages",replyType:"JournalsForMessage",loadCallback:function(a){o.message=a.data},replyCallback:function(){}})}]);
 app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,a,i,n,s,l){s.get_bind().then(function(){t.path("/activities")}),a.code&&l.save("code",a.code);var r=e;r.loginFailed=!1,r.alertService=i.create(),r.findPwdDialog=i.create(),r.login=function(a,i){return a.$setSubmitted(),console.log(i),a.$valid?(console.log(apiUrl+"auth"),void o.post(n.apiUrl+"users/wxbind",{login:i.login,password:i.password}).then(function(o){console.log(o.data),r.loginFailed=0!=o.data.status,e.loginFailed?r.alertService.showMessage("出错了",o.data.message):r.alertService.showMessage("提示",o.data.message,function(){t.path("/activities")})})["catch"](function(e){r.alertService.showMessage("出错了",e)})):void console.log(a.$error)},r.showBox=function(){r.findPwdDialog.showMessage("提示","请访问www.trustie.net获取密码，谢谢！")},r.goReg=function(){t.path("/reg")}}]);
-app.controller("MyResourceController",["$scope","$http","auth","config",function(e,o,t,a){var n=e;n.menus=["课件","作业","测验"],n.resources=[],n.homeworks=[],n.exercise=[],n.tab=function(e){n.currentTab=e,1==e?o.get(a.apiUrl+"resources?token="+t.token()).then(function(e){console.log(e.data),n.resources=e.data.data}):2==e?o.get(a.apiUrl+"resources/homeworks?token="+t.token()).then(function(e){console.log(e.data),n.homeworks=e.data.data}):3==e&&o.get(a.apiUrl+"resources/exercies?token="+t.token()).then(function(e){console.log(e.data),n.exercise=e.data.data})},n.tab(1)}]);
-app.controller("NewClassController",["$scope","$http","auth","config",function(e,o,r,s){var c=e;c.resources=[],c.homeworks=[],c.exercises=[]}]);
-app.controller("RegController",["$scope","$http","$location","alertService",function(e,o,a,r){var s=e;s.errDialog=r.create(),s.goLogin=function(){a.path("/login")},s.isagreed=!0,s.agreed=function(e){s.isagreed=!e},s.reg=function(e,a){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(a),void o.post(apiUrl+"users",{login:a.username,password:a.password,mail:a.email}).then(function(e){0!=e.data.status?s.errDialog.showMessage("出错了",e.data.message):s.errDialog.showMessage("提示","注册且绑定微信成功")},function(e){s.errDialo.showMessage("出错了",e.data)})):void console.log(e.$error)}}]);
-app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]);
+app.controller("MyResourceController",["$scope","$http","auth","config","$location",function(e,o,t,n,r){var s=e;s.menus=["课件","作业","测验"],s.resources=null,s.homeworks=null,s.exercise=null,s.searchText="",s.tab=function(e){s.currentTab=e,s.searchText="",1==e&&(!s.resources||s.resources.length<=0)?o.get(n.apiUrl+"resources?token="+t.token()).then(function(e){console.log(e.data),s.resources=e.data.data}):2==e&&(!s.homeworks||s.homeworks.length<=0)?o.get(n.apiUrl+"resources/homeworks?token="+t.token()).then(function(e){console.log(e.data),s.homeworks=e.data.data}):3==e&&(!s.exercise||s.exercise.length<=0)&&o.get(n.apiUrl+"resources/exercies?token="+t.token()).then(function(e){console.log(e.data),s.exercise=e.data.data})},s.tab(1),s.sendFile=function(e){r.path("/send_class_list").search({id:e.id})}}]);
+app.controller("NewClassController",["$scope","$http","auth","config","alertService","$location",function(s,e,a,o,l,t){var r=s;r.alertService=l.create(),r.syllabus={courses:[{name:""}]},r.addClass=function(){r.syllabus.courses.push({})},r.deleteClass=function(s){r.syllabus.courses.splice(s,1)},r.newClass=function(s,l){if(s.$setSubmitted(),console.log(l),!s.$valid)return void console.log(s.$error);var t=[];for(var n in r.syllabus.courses)t.push(r.syllabus.courses[n].name);e.post(o.apiUrl+"syllabuses",{token:a.token(),title:l.title,courses:t}).then(function(s){0!=s.data.status?r.alertService.showMessage("出错了",s.data.message):r.alertService.showMessage("提示","新建课程成功",function(){window.history.back()}),console.log(s.data.data)})}}]);
+app.controller("RegController",["$scope","$http","$location","alertService","$location",function(e,o,a,s,a){var t=e;t.errDialog=s.create(),t.successDialog=s.create(),t.goLogin=function(){a.path("/login")},t.isagreed=!0,t.agreed=function(e){t.isagreed=!e},t.reg=function(e,s){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(s),void o.post(apiUrl+"users",{login:s.username,password:s.password,mail:s.email}).then(function(e){0!=e.data.status?t.errDialog.showMessage("出错了",e.data.message):t.successDialog.showMessage("提示","注册且绑定微信成功",function(){a.path("/activities")})},function(e){t.errDialog.showMessage("出错了",e.data)})):void console.log(e.$error)}}]);
+app.controller("SendClassListController",["$scope","$http","$routeParams","config","auth","alertService","rms",function(e,s,o,a,t,r,c){var n=e,l=o.id;n.alertService=r.create(),n.syllabuses=[];var i=function(){s.get(a.apiUrl+"syllabuses?token="+t.token()).then(function(e){console.log(e.data),n.syllabuses=e.data.data})};i(),n.selectCourse=function(e){"boolean"!=typeof e.checked&&(e.checked=!1),e.checked=!e.checked},n.sendToCourses=function(){var e=[];for(var o in n.syllabuses)for(var r in n.syllabuses[o].courses)n.syllabuses[o].courses[r].checked&&e.push(n.syllabuses[o].courses[r].id);return e.length<=0?void n.alertService.showMessage("提醒","请先选择班级"):void s.post(a.apiUrl+"resources/send",{token:t.token(),course_ids:e,send_id:l}).then(function(e){console.log(e.data),0==e.data.status?n.alertService.showMessage("提示","发送成功",function(){window.history.back()}):n.alertService.showMessage("发送出错",e.data.message)})}}]);
+app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]),app.directive("myAlert2",["config",function(t){return{templateUrl:t.rootPath+"templates/alert2.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1},t.confirm=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]);
 app.directive("pwdconfirm",function(){return{require:"ngModel",link:function(r,n,i,e){e.$validators.pwdconfirm=function(n,i){return r.user&&r.user.password==i}}}});
 app.directive("inputAuto",function(){return{restrict:"A",scope:{},link:function(n,t){var e=t.parent().children().eq(0),i=t.parent().next();t.on("input",function(){console.log(i),e.html(t[0].value);var n=e[0].scrollHeight;t.css("height",n+"px")}),i.on("click",function(){t.css("height","28px")})}}});
-app.directive("loadingSpinner",["$http",function(i){return{restrict:"A",replace:!0,template:'<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>'}}]);
-app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,r,t){var l=t.rootPath,n={delay:["auth",function(e){return e.get_bind()}]},s=function(e,o){return{templateUrl:l+e,controller:o,resolve:n}};e.when("/login",{templateUrl:l+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:l+"reg.html",controller:"RegController"}).when("/activites",s("activities.html","ActivityController")).when("/issues/:id",s("issue_detail.html","IssueController")).when("/project_discussion/:id",s("project_discussion.html","DiscussionController")).when("/homework/:id",s("homework_detail.html","HomeworkController")).when("/course_notice/:id",s("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",s("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",s("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",s("blog_detail.html","BlogController")).when("/class",s("class.html","ClassController")).when("/new_class",s("new_class.html","NewClassController")).when("/class_list",s("class_list.html","ClassListController")).when("/myresource",s("myresource.html","MyResourceController")).when("/invite_code",s("invite_code.html","InviteCodeController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file
+app.directive("loadingSpinner",["$http","config",function(t,e){return{templateUrl:e.rootPath+"templates/loading.html"}}]);
+app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,o,t,l){var r=l.rootPath,s={delay:["auth",function(e){return e.get_bind()}]},n=function(e,o){return{templateUrl:r+e,controller:o,resolve:s}};e.when("/login",{templateUrl:r+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:r+"reg.html",controller:"RegController"}).when("/activites",n("activities.html","ActivityController")).when("/issues/:id",n("issue_detail.html","IssueController")).when("/project_discussion/:id",n("project_discussion.html","DiscussionController")).when("/homework/:id",n("homework_detail.html","HomeworkController")).when("/course_notice/:id",n("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",n("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",n("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",n("blog_detail.html","BlogController")).when("/class",n("class.html","ClassController")).when("/new_class",n("new_class.html","NewClassController")).when("/edit_class",n("edit_class.html","EditClassController")).when("/class_list",n("class_list.html","ClassListController")).when("/myresource",n("myresource.html","MyResourceController")).when("/invite_code",n("invite_code.html","InviteCodeController")).when("/send_class_list",n("send_class_list.html","SendClassListController")).otherwise({redirectTo:"/activites"}),o.interceptors.push(["$q","$rootScope",function(e,o){return void 0==o.activeCalls&&(o.activeCalls=0),{request:function(e){return o.activeCalls+=1,e},requestError:function(e){return o.activeCalls-=1,e},response:function(e){return o.activeCalls-=1,e},responseError:function(e){return o.activeCalls-=1,e}}}])}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index 73bd09f26..b89c46300 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -6,6 +6,8 @@ app.controller('ActivityController',
         return url;
     };
 
+    $scope.menus = ['所有动态', '课程动态', '项目动态'];
+
     $scope.alertService = alertService.create();
     console.log("ActivityController load");
 
@@ -13,33 +15,119 @@ app.controller('ActivityController',
     $scope.activities = rms.get("activities") || [];
     $scope.has_more = rms.get("has_more");
 
-    $scope.loadActData = function(page){
+    $scope.course_page = rms.get('course_page') || 0;
+    $scope.course_activities = rms.get("course_activities") || [];
+    $scope.course_has_more = rms.get("course_has_more");
+
+    $scope.project_page = rms.get('project_page') || 0;
+    $scope.project_activities = rms.get("project_activities") || [];
+    $scope.project_has_more = rms.get("project_has_more");
+
+    $scope.loadActData = function(index,page){
+        container_type = "All";
+        switch(index){
+            case 1:
+                container_type = "All";
+                $scope.page = page;
+                break;
+            case 2:
+                container_type = "Course";
+                $scope.course_page = page;
+                break;
+            case 3:
+                container_type = "Project";
+                $scope.project_page = page;
+                break;
+        }
 
-        $scope.page = page;
         $http({
             method: 'POST',
             url: apiUrl+ "activities",
-            data: {token: auth.token(), page: page}
+            data: {token: auth.token(), page: page, container_type: container_type}
         }).then(function successCallback(response) {
             if(response.data.page >0) {
-                $scope.activities = $scope.activities.concat(response.data.data);
+                switch(response.data.container_type){
+                    case "All":
+                        $scope.activities = $scope.activities.concat(response.data.data);
+                        break;
+                    case "Course":
+                        $scope.course_activities = $scope.course_activities.concat(response.data.data);
+                        break;
+                    case "Project":
+                        $scope.project_activities = $scope.project_activities.concat(response.data.data);
+                        break;
+                    case 3:
+                }
             } else {
-                $scope.activities = response.data.data;
+                switch(response.data.container_type){
+                    case "All":
+                        $scope.activities = response.data.data;
+                        break;
+                    case "Course":
+                        $scope.course_activities = response.data.data;
+                        break;
+                    case "Project":
+                        $scope.project_activities = response.data.data;
+                        break;
+                    case 3:
+                }
             }
 
-            rms.save("activities", $scope.activities);
-            $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
-            rms.save('has_more', $scope.has_more);
-            rms.save('page', response.data.page);
-
+            switch(response.data.container_type){
+                case "All":
+                    rms.save("activities", $scope.activities);
+                    $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+                    rms.save('has_more', $scope.has_more);
+                    rms.save('page', response.data.page);
+                    break;
+                case "Course":
+                    rms.save("course_activities", $scope.course_activities);
+                    $scope.course_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+                    rms.save('course_has_more', $scope.course_has_more);
+                    rms.save('course_page', response.data.page);
+                    break;
+                case "Project":
+                    rms.save("project_activities", $scope.project_activities);
+                    $scope.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+                    rms.save('project_has_more', $scope.project_has_more);
+                    rms.save('project_page', response.data.page);
+                    break;
+                case 3:
+            }
             console.log(response.data);
 
         }, function errorCallback(response) {
         });
     };
 
+    $scope.tab = function(index){
+        $scope.currentTab = index;
+        switch(index){
+            //ALL
+            case 1:
+                if($scope.activities.length<=0){
+                    $scope.loadActData(index,0);
+                }
+                break;
+            //Course
+            case 2:
+                if($scope.course_activities.length<=0){
+                    $scope.loadActData(index,0);
+                }
+                break;
+            //Project
+            case 3:
+                if($scope.project_activities.length<=0){
+                    $scope.loadActData(index,0);
+                }
+                break;
+        }
+    }
+
+    $scope.currentTab = 1;
+
     if($scope.activities.length<=0){
-        $scope.loadActData(0);
+        $scope.loadActData(1,0);
     } else {
         $timeout(function(){
             window.scrollTo(0, rms.get("yoffset"));
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index c2281be88..87703b681 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -31,6 +31,7 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
                 {token: auth.token(), name: ''}
             ).then(function(response){
                 vm.resources = response.data.data;
+                vm.resources_tag = true;
             });
         }
     }
@@ -40,6 +41,7 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
             $http.get(config.apiUrl + "courses/homeworks/"+courseid+"?token="+auth.token()).then(function(response){
                 vm.homeworks = response.data.data;
                 console.log(response.data);
+                vm.homeworks_tag = true;
             });
         }
     }
@@ -49,6 +51,7 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
             $http.get(config.apiUrl + "courses/"+courseid+"/exercises?token="+auth.token()).then(function(response){
                 vm.exercises = response.data.data;
                 console.log(response.data);
+                vm.exercises_tag = true;
             });
         }
     }
@@ -64,6 +67,9 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
         vm.showResources = false;
         vm.showHomework = false;
         vm.showTestcase = false;
+        vm.resources_tag = false;
+        vm.homeworks_tag = false;
+        vm.exercises_tag = false;
 
         if(vm.isTeacher){
             if(index == 1){ //课件
@@ -105,6 +111,10 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
        $location.path("/invite_code").search({id: courseid}); 
     };
 
+    vm.sendFile = function(r){
+        $location.path("/send_class_list").search({id: r.id});
+    }
+
     $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
         function(response) {
             console.log(response.data);
@@ -120,7 +130,7 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
         if(is_teacher){
             vm.menus = ["课件", "作业", "小测验", "学生管理"];
         } else {
-            vm.menus = ['课堂资源', "我的同学"];
+            vm.menus = ['课件', "我的同学"];
         }
 
     }
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index 4484ff834..b3f8a6ea3 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -3,28 +3,79 @@
  */
 
 
-app.controller('ClassListController', ['$scope','config','auth','$http','$location', function($scope, config, auth, $http, $location){
-    var vm = $scope;
-    vm.courses = [];
-
-    $http.get(config.apiUrl + "courses?token="+ auth.token() + "&per_page_count=10&page=1").then(
-        function(response){
-            console.log(response.data);
-            vm.courses = response.data.data;
+app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms',
+    function ($scope, config, auth, $http, $location, alertService,rms) {
+        var vm = $scope;
+        vm.syllabuses = rms.get('syllabuses') || [];
+
+        vm.alertService = alertService.create();
+
+        var loadClassList = function () {
+            $http.get(config.apiUrl + "syllabuses?token=" + auth.token()).then(
+                function (response) {
+                    console.log(response.data);
+                    vm.syllabuses = response.data.data;
+                    rms.save('syllabuses', vm.syllabuses);
+                }
+            );
+        };
+
+        if(vm.syllabuses.length<=0){
+            loadClassList();
         }
-    );
 
-    vm.goClass = function(course_id){
-        console.log(course_id);
-        $location.path("/class").search({id: course_id});
-    }
 
-    vm.newClass = function(){
-        $location.path("/new_class");
-    }
+        vm.goClass = function (course_id) {
+            console.log(course_id);
+            $location.path("/class").search({id: course_id});
+        }
+
+        vm.newClass = function () {
+            //先判断下权限
+            $http.post(config.apiUrl + "syllabuses/auth",{token: auth.token()} ).then(
+                function (response) {
+                    console.log(response.data);
+                    if (response.data.auth == 0) {
+                        vm.alertService.showMessage('提示', '非教师身份不能创建课程哦~');
+                    }
+                    else{
+                        $location.path("/new_class");
+                    }
+                }
+            );
+        }
 
-    vm.goResource =function(){
-        $location.path("/myresource");
-    }
+        vm.goResource = function () {
+            $location.path("/myresource");
+        }
+
+        vm.joinClass = function () {
+            var code = window.prompt("请输入5位班级邀请码(不区分大小写)");
+            if (code && code.length == 5) {
+                $http.post(config.apiUrl + "courses/join", {
+                    token: auth.token(),
+                    invite_code: code
+                }).then(function (response) {
+                    console.log(response.data);
+                    if (response.data.status != 0) {
+                        vm.alertService.showMessage('错误', response.data.message);
+                    } else {
+                        vm.alertService.showMessage('提示', '加入课程成功');
+                        loadClassList();
+                    }
+                });
+            } else {
+                if(code){
+                    vm.alertService.showMessage('错误', '邀请码格式不正确');
+                }
+
+            }
+        };
+
+        vm.onSetting = function (syllabus) {
+            console.log(syllabus);
+            rms.save('current_edit_syllobus', syllabus);
+            $location.path("/edit_class").search({id: syllabus.id});
+        }
 
-}]);
\ No newline at end of file
+    }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/edit_class.js b/public/javascripts/wechat/controllers/edit_class.js
new file mode 100644
index 000000000..5f377e594
--- /dev/null
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -0,0 +1,110 @@
+
+
+app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+    var vm = $scope;
+
+    vm.syllabus = rms.get('current_edit_syllobus');
+
+    var syllabus_id = $routeParams.id;
+    if(!vm.syllabus){
+        $http.get(config.apiUrl+"syllabuses/"+syllabus_id+"?token="+auth.token()).then(function(response){
+            console.log(response.data);
+            vm.syllabus = response.data.data;
+            if (vm.syllabus) {
+                for (var i in vm.syllabus.courses) {
+                    var course = vm.syllabus.courses[i];
+                    course.tmpname = course.name;
+                }
+                vm.syllabus.tmptitle = vm.syllabus.title;
+            }
+        });
+    }
+    console.log(vm.syllabus);
+
+    //名字用两份
+    if (vm.syllabus) {
+        for (var i in vm.syllabus.courses) {
+            var course = vm.syllabus.courses[i];
+            course.tmpname = course.name;
+        }
+        vm.syllabus.tmptitle = vm.syllabus.title;
+    }
+    //单弹框
+    vm.alertService_1 = alertService.create();
+
+    //双弹框
+    vm.alertService_2 = alertService.create();
+
+    vm.addClass = function(){
+        vm.syllabus.courses.push({can_setting:true});
+    };
+
+    vm.deleteClass = function(index){
+        var course = vm.syllabus.courses[index];
+        if(course.id >0){
+            vm.alertService_2.showMessage('提示', '您确定要删除该班级吗？', function() {
+                $http.post(config.apiUrl+'courses/'+course.id+'/del', {
+                    token: auth.token()
+                }).then(function(response){
+                    if(response.data.status!=0){
+                        vm.alertService_1.showMessage('出错了', response.data.message);
+                    } else {
+                        vm.alertService_1.showMessage('提示', '删除班级成功', function(){
+                            vm.syllabus.courses.splice(index, 1);
+                        });
+                    }
+                    console.log(response.data.data);
+                });
+            });
+
+        } else {
+            vm.syllabus.courses.splice(index, 1);
+        }
+
+    }
+
+    vm.newClass = function (frm, syllabus) {
+        frm.$setSubmitted();
+        console.log(syllabus);
+
+        if(!frm.$valid){
+            console.log(frm.$error);
+            return;
+        }
+
+        var add_courses = [];
+        var modify_courses = [];
+
+        for(var i in vm.syllabus.courses){
+            var course = vm.syllabus.courses[i];
+            if(!course.id){
+                add_courses.push(course.tmpname);
+            }
+            else if(course.tmpname != course.name){
+                modify_courses.push({id:course.id,name:course.tmpname});
+            }
+        }
+
+        $http.post(config.apiUrl+'syllabuses/'+syllabus_id+'/edit', {
+            token: auth.token(),
+            id: syllabus_id,
+            title:vm.syllabus.tmptitle,
+            add_courses: add_courses,
+            modify_courses: modify_courses
+        }).then(function(response){
+            if(response.data.status!=0){
+                vm.alertService_1.showMessage('出错了', response.data.message);
+            } else {
+                vm.alertService_1.showMessage('提示', '保存课程成功', function(){
+//                    window.history.back();
+                    rms.save('syllabuses',[]);
+                    $location.path("/class_list");
+
+                });
+            }
+           console.log(response.data.data);
+        });
+
+    }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
index 87b2a4d82..b371ee8cc 100644
--- a/public/javascripts/wechat/controllers/myresource.js
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -1,24 +1,27 @@
-app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', function($scope, $http, auth, config){
+app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', function($scope, $http, auth, config, $location){
     var vm = $scope;
     vm.menus = ['课件', '作业', '测验'];
 
-    vm.resources = [];
-    vm.homeworks = [];
-    vm.exercise  = [];
+    vm.resources = null;
+    vm.homeworks = null;
+    vm.exercise  = null;
+
+    vm.searchText = "";
 
     vm.tab = function(index){
         vm.currentTab = index;
-        if(index==1){
+        vm.searchText = "";
+        if(index==1 && (!vm.resources || vm.resources.length <= 0 )){
             $http.get(config.apiUrl + "resources?token="+auth.token()).then(function(response){
                 console.log(response.data);
                 vm.resources = response.data.data;
             });
-        } else if(index==2){
+        } else if(index==2 && (!vm.homeworks || vm.homeworks.length <= 0) ){
             $http.get(config.apiUrl + "resources/homeworks?token="+auth.token()).then(function(response){
                 console.log(response.data);
                 vm.homeworks = response.data.data;
             });
-        } else if(index==3){
+        } else if(index==3 && (!vm.exercise || vm.exercise.length <= 0) ){
             $http.get(config.apiUrl + "resources/exercies?token="+auth.token()).then(function(response){
                 console.log(response.data);
                 vm.exercise = response.data.data;
@@ -27,4 +30,8 @@ app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', fun
     }
 
     vm.tab(1);
-}] );
\ No newline at end of file
+
+    vm.sendFile = function(r){
+        $location.path("/send_class_list").search({id: r.id});
+    }
+}] );
diff --git a/public/javascripts/wechat/controllers/new_class.js b/public/javascripts/wechat/controllers/new_class.js
index 488db31c6..ef46fc4ba 100644
--- a/public/javascripts/wechat/controllers/new_class.js
+++ b/public/javascripts/wechat/controllers/new_class.js
@@ -1,12 +1,51 @@
 
 
-app.controller('NewClassController', ['$scope', '$http', 'auth', 'config', function($scope, $http, auth, config){
+app.controller('NewClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location', function($scope, $http, auth, config, alertService, $location){
     var vm = $scope;
 
-    vm.resources = [];
-    vm.homeworks = [];
-    vm.exercises = [];
+    vm.alertService = alertService.create();
 
-    
+    vm.syllabus = {
+        courses: [{name: ''}],
+    };
+
+    vm.addClass = function(){
+        vm.syllabus.courses.push({});
+    };
+
+    vm.deleteClass = function(index){
+        vm.syllabus.courses.splice(index, 1);
+    }
+
+    vm.newClass = function (frm, syllabus) {
+        frm.$setSubmitted();
+        console.log(syllabus);
+
+        if(!frm.$valid){
+            console.log(frm.$error);
+            return;
+        }
+
+        var courses = [];
+        for(var i in vm.syllabus.courses){
+            courses .push(vm.syllabus.courses[i].name);
+        }
+
+        $http.post(config.apiUrl+"syllabuses", {
+            token: auth.token(),
+            title: syllabus.title,
+            courses: courses
+        }).then(function(response){
+            if(response.data.status!=0){
+                vm.alertService.showMessage('出错了', response.data.message);
+            } else {
+                vm.alertService.showMessage('提示', '新建课程成功', function(){
+                    window.history.back();
+                });
+            }
+           console.log(response.data.data);
+        });
+
+    }
 
 }] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/reg.js b/public/javascripts/wechat/controllers/reg.js
index dfa010ad7..44c2e098b 100644
--- a/public/javascripts/wechat/controllers/reg.js
+++ b/public/javascripts/wechat/controllers/reg.js
@@ -1,8 +1,9 @@
-app.controller('RegController', ['$scope', '$http', '$location', 'alertService',
-    function ($scope, $http, $location, alertService) {
+app.controller('RegController', ['$scope', '$http', '$location', 'alertService','$location',
+    function ($scope, $http, $location, alertService, $location) {
 
         var vm = $scope;
         vm.errDialog = alertService.create();
+        vm.successDialog = alertService.create();
 
         vm.goLogin = function () {
             $location.path("/login");
@@ -32,10 +33,12 @@ app.controller('RegController', ['$scope', '$http', '$location', 'alertService',
                 if (response.data.status != 0) {
                     vm.errDialog.showMessage('出错了',response.data.message);
                 } else {
-                    vm.errDialog.showMessage("提示","注册且绑定微信成功");
+                    vm.successDialog.showMessage("提示","注册且绑定微信成功", function(){
+                        $location.path("/activities");
+                    });
                 }
             }, function (response) {
-                vm.errDialo.showMessage('出错了',response.data);
+                vm.errDialog.showMessage('出错了',response.data);
             });
         }
 
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
new file mode 100644
index 000000000..16875af9f
--- /dev/null
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -0,0 +1,55 @@
+app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'config','auth','alertService', 'rms', function($scope, $http, $routeParams, config, auth, alertService,rms){
+    var vm = $scope;
+    var send_id = $routeParams.id;
+
+    vm.alertService = alertService.create();
+    vm.syllabuses = [];
+
+    var loadClassList = function () {
+        $http.get(config.apiUrl + "syllabuses?token=" + auth.token()).then(
+            function (response) {
+                console.log(response.data);
+                vm.syllabuses = response.data.data;
+//                rms.save('syllabuses', vm.syllabuses);
+            }
+        );
+    };
+
+    loadClassList();
+
+    vm.selectCourse = function(course){
+        if( typeof course.checked !== 'boolean' ) course.checked = false;
+        course.checked = !course.checked;
+    }
+
+    vm.sendToCourses = function(){
+        var course_ids = [];
+
+        for(var i in vm.syllabuses) {
+            for (var j in vm.syllabuses[i].courses) {
+                if (vm.syllabuses[i].courses[j].checked) {
+                    course_ids.push(vm.syllabuses[i].courses[j].id);
+                }
+            }
+        }
+
+        if(course_ids.length <= 0){
+            vm.alertService.showMessage('提醒', '请先选择班级');
+            return;
+        }
+        
+        $http.post(config.apiUrl + "resources/send", {
+            token: auth.token(), course_ids: course_ids, send_id: send_id
+        }).then(function(response){
+            console.log(response.data);
+            if(response.data.status == 0){
+                vm.alertService.showMessage('提示', '发送成功', function () {
+                    window.history.back();
+                });
+            } else {
+                vm.alertService.showMessage('发送出错', response.data.message);
+            }
+        })
+    }
+
+}]);
diff --git a/public/javascripts/wechat/directives/alert.js b/public/javascripts/wechat/directives/alert.js
index f53ecdb5a..4b703811c 100644
--- a/public/javascripts/wechat/directives/alert.js
+++ b/public/javascripts/wechat/directives/alert.js
@@ -16,4 +16,27 @@ app.directive('myAlert', ['config', function(config){
             };
         }
     }
-}]);
\ No newline at end of file
+}]);
+
+app.directive('myAlert2', ['config', function(config){
+    return {
+        templateUrl: config.rootPath+ 'templates/alert2.html',
+        scope: {
+            title: "=",
+            message: "=",
+            visible: "=",
+            cb: "="
+        },
+        link: function(scope){
+            scope.dismiss = function(){
+                scope.visible = false;
+            };
+            scope.confirm = function(){
+              scope.visible = false;
+                if(typeof scope.cb === 'function'){
+                    scope.cb();
+                }
+            }
+        }
+    }
+}]);
diff --git a/public/javascripts/wechat/directives/loading_spinner.js b/public/javascripts/wechat/directives/loading_spinner.js
index 780056828..cea916997 100644
--- a/public/javascripts/wechat/directives/loading_spinner.js
+++ b/public/javascripts/wechat/directives/loading_spinner.js
@@ -1,7 +1,5 @@
-app.directive('loadingSpinner', ['$http', function ($http) {
+app.directive('loadingSpinner', ['$http', 'config', function ($http, config) {
     return {
-        restrict: 'A',
-        replace: true,
-        template: '<div ng-show="activeCalls>0" class="loading-bg"><div class="loading-box"><img src="/images/loading.gif" alt=""/><span>加载中...</span></div></div>',
+        templateUrl: config.rootPath+ 'templates/loading.html',
     };
 }]);
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 80efa71e9..2c63609b0 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -32,9 +32,11 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
         .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
         .when('/class', makeRoute('class.html', 'ClassController'))
         .when('/new_class', makeRoute('new_class.html', 'NewClassController'))
+        .when('/edit_class', makeRoute('edit_class.html', 'EditClassController'))
         .when('/class_list', makeRoute('class_list.html', 'ClassListController'))
         .when('/myresource', makeRoute('myresource.html', 'MyResourceController'))
         .when('/invite_code', makeRoute('invite_code.html', 'InviteCodeController'))
+        .when('/send_class_list', makeRoute('send_class_list.html', 'SendClassListController'))
         .otherwise({
             redirectTo: '/activites'
         });
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3764ceb04..112f8224b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1409,6 +1409,7 @@ table td {padding:2px;}
 table p {margin:0;}
 .odd {background-color:#f6f7f8;}
 .even {background-color: #fff;}
+.odd_grey {background-color: #b4b4b4}
 
 a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
 a.sort.asc  { background-image: url(../images/sort_asc.png); }
@@ -2847,4 +2848,10 @@ img.school_avatar {
 }
 
 .admin_message_warn{font-size: 12px;color: red;}
-a.btn_message_free{ background:#15BCCF; display:block;  text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;margin-left: 58px;}
\ No newline at end of file
+a.btn_message_free{ background:#15BCCF; display:block;  text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;margin-left: 58px;}
+
+.course_syllabus_input{width:120px;}
+.name_input{ border:1px solid #64bdd9; height:16px; width:310px; background:#fff; margin-bottom:10px; padding:5px;}
+a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.Blue-btn{ background:#3598db; color:#fff;}
+.c_white {color:#fff;}
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 1df2a2ece..174f572fa 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -52,25 +52,41 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .hworkTip span {display:block; border-width:8px; position:absolute; bottom:4px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;}
 .hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;}
 .hworkList30 {width:30px; text-align:center;}
+.hworkList40 {width:40px; text-align:center;}
 .hworkList50 {width:50px; text-align:center;}
 .hworkList60 {width:60px; text-align:center;}
+.hworkList60 {width:60px; text-align:center;}
+.hworkList70 {width:70px; text-align:center;}
 .hworkList80 {width:80px; text-align:center;}
 .hworkList90 {width:90px; text-align:center;}
 .hworkList100 {width:100px; text-align:center;}
+.hworkList110 {width:110px; text-align:center;}
 .hworkList130 {width:130px; text-align:center;}
+.hworkList140 {width:140px; text-align:center;}
+.hworkList150 {width:150px; text-align:center;}
 .hworkList160 {width:160px; text-align:center;}
+.hworkList190 {width:190px; text-align:center;}
+.hworkList200 {width:200px; text-align:center;}
 .hworkList210 {width:210px; text-align:center;}
+.hworkList230 {width:230px; text-align:left;}
 .hworkList260 {width:260px; text-align:left;}
+.hworkList270 {width:270px; text-align:left;}
+.hworkList280 {width:280px; text-align:left;}
 .hworkList290 {width:290px; text-align:left;}
 .hworkList340 {width:340px; text-align:left;}
-.hworkList420 {width:420px; text-align:left;}
+.hworkList390 {width:390px; text-align:left;}
+.hworkList420 {width:400px; text-align:left;}
 .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px;  width:714px; margin-bottom:10px; }
 .hworkName {width:80px; float:left; line-height:18px;}
 .hworkName div{max-height: 36px;overflow: hidden;}
 .hworkStName {width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .hworkStName100 {width:100px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkStName110 {width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkStName130 {width:130px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .hworkStID {width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .hworkStID90 {width:90px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkStID100 {width:100px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkStID130 {width:130px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .hworkDate {max-width:150px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:14px; line-height:14px; font-size:12px; color:#888888;}
 .hworkMenu {width:100px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-110px; font-size:12px; color:#888888; display:none; line-height:2; z-index:99;}
 a.hworkExport {background:url(../images/homepage_icon2.png) -10px -401px no-repeat; padding-left:23px;}
@@ -94,9 +110,11 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .width130{width: 130px;}
 .width165{width: 165px;}
 .width180{width: 180px;}
+.width210{width: 210px;}
 .width290{width: 290px;}
 .width340{width: 340px;}
 .width525{width: 525px;}
+.width280{width: 280px;}
 .width285{width: 285px;}
 .width255{width: 255px;}
 .width530{width: 530px;}
@@ -189,7 +207,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
 .homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
-.homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
@@ -1262,8 +1280,8 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .ml7 {margin-left:7px;}
 .tac {text-align:center;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
-.hworkPrName {width:160px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
-.hworkPrName2 {width:210px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkPrName {width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkPrName2 {width:150px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
 .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
 .captainName {max-width:65px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 5700d0b00..c0a38d690 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -33,7 +33,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
 .homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
 .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
-.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
+.homepageSignatureTextarea {resize:none; width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
 .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
 .homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
 .homepageImageNumber {font-size:12px; color:#484848;}
@@ -292,4 +292,18 @@ div.modal {
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
 a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.Blue-btn{ background:#3598db; color:#fff;}
-/***** end Ajax indicator ******/
\ No newline at end of file
+/***** end Ajax indicator ******/
+
+/*消息弹框*/
+.shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
+.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
+.shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;}
+.shadowbox_news font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.shadowbox_news_list{ max-height:400px; overflow:hidden;}
+.shadowbox_news_list a{ color:#999;}
+.shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
+.shadowbox_news_list li:hover{ background-color:#eee;}
+span.shadowbox_news_user{ color:#3b94d6;}
+a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
+.undis {display:none;}
+.text_c {text-align:center;}
diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css
index 98120676e..b56fed804 100644
--- a/public/stylesheets/leftside.css
+++ b/public/stylesheets/leftside.css
@@ -3,7 +3,7 @@
 .search{ margin-top:8px; margin-left:71px;}
 /*信息*/
 .project_info{ background:#fff; padding:10px; padding-right:0px;width:222px;  padding-right:8px; margin-bottom:10px;}
-.pr_info_id{ width:137px; color:#5a5a5a; font-size:14px; margin-top:5px;}
+.pr_info_id{ width:130px; color:#5a5a5a; font-size:14px; margin-top:5px;}
 .pr_info_logo{ border:1px solid  #eaeaea; width:60px; height:60px; padding:1px;}
 .pr_info_logo:hover{ border:1px solid #64bdd9; }
 .pr_info_join{}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index b931dff6b..c38bd19b3 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -578,7 +578,7 @@ a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3;
 a:hover.UsersAttBtn{border:1px solid #888888; }
 a.UsersApBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
 a:hover.UsersApBtn{border:1px solid #888888; }
-.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 0px;}
+.homepageSignatureTextarea {resize:none; width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 0px;}
 .homepageSignature {font-size:12px; color:#888888; margin:10px 0; width:208px;}
 .homepageImageBlock {margin:0 auto; width:68px; float:left; text-align:center; display:inline-block;}
 a.homepageImageNumber {font-size:12px; font-weight: bold;} /*color:#484848;*/
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 459d050e1..71c2736bb 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -181,3 +181,17 @@ a.follow-button:hover {background-color:#c1c1c1;}
 
 /*组织未登录提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/* 未登录的提示信息 */
+.syllabusbox_tishi{
+    font-size:14px;
+    width:733px;
+    color:#cb7c01;
+    padding:10px 0 0 15px;
+    background:#fff7d1;
+    border:1px solid #fcd9b4;
+    height:34px;
+}
+a.syllabusbox_a_blue{
+    color:#3b94d6 !important;
+}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index bde560613..9a3ba2e47 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1273,11 +1273,11 @@ a.pages-big{ width:50px;}
 .analysis-result-list {padding:5px;}
 .analysis-result-list:nth-of-type(odd){background:#fff;}/*奇数行*/
 .analysis-result-list:nth-of-type(even){background:#f5f5f5;}/*偶数行*/
-.analysis-result-name {width:200px; cursor:pointer;}
-.analysis-result-version {width:90px; text-align:right; cursor:pointer;}
-.analysis-result-loc {width:60px; text-align:right; cursor:pointer;}
-.analysis-result-debt {width:160px; text-align:right; cursor:pointer;}
-.analysis-result-time {width:150px; text-align:right; cursor:pointer;}
+.analysis-result-name {width:200px;}
+.analysis-result-version {width:90px; text-align:right;}
+.analysis-result-loc {width:60px; text-align:right;}
+.analysis-result-debt {width:160px; text-align:right;}
+.analysis-result-time {width:150px; text-align:right;}
 .analysis-name-icon {background:url(../images/code-analysis-icon.png) -2px -148px no-repeat; width:16px; height:16px; display:inline-block; vertical-align:middle;}
 
 /*未登录回复提示*/
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index c86e0f42d..73387a095 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -160,7 +160,9 @@ h4{ font-size:14px; }
 .w90{ width:90px;}
 .w100{width: 100px;}
 .w125{width:125px;}
-.w180{width:180px;}
+.w180{width:180px;!important;}
+.w190{width:190px;!important;}
+.w220{ width:220px;}
 .w210{ width:210px;}
 .w150{ width:150px;}
 .w170{width:170px;}
@@ -173,6 +175,7 @@ h4{ font-size:14px; }
 .w270{ width: 270px;}
 .w350 {width:350px;}
 .w362 {width:362px;}
+.w380 {width:380px;}
 .w430{ width:470px;}
 .w455{width:455px !important;}
 .w465{width:465px !important;}
@@ -246,7 +249,7 @@ a.c_green{ color:#28be6c;}
 .b_blue{background:#64bdd9;}
 .b_green{background:#28be6c;}
 .b_slow_yellow{background:#adde18;}
-.b_yellow{background:#DDDF0D;}
+.b_yellow{background:#e4de4b;}
 .b_slow_red{background:#df8538;}
 .b_green2 {background:#63c360;}
 .b_red {background:#d60308;}
@@ -665,7 +668,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyPortrait {float:left; width:45px;}
 .homepagePostReplyDes {float:left; width:620px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;}
-.homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;}
 .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
@@ -1184,3 +1187,59 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 
 /*20160622代码分析弹窗*/
 .analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
+
+/* 二级回复 */
+.clearfix:after { content:"."; display:block; height:0; visibility:hidden; clear:both; }
+.clearfix { zoom:1; }
+.clearit { clear:both; height:0; font-size:0; overflow:hidden; }
+.comment_item{ width:720px; background-color:#f1f1f1; color:#888;}
+.comment_top{ height:15px;    border: 1px solid #e4e4e4; padding:10px; position:relative;}
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.fl{ float:left;}
+.fr{ float:right;}
+.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
+.J_Comment_Face img{ width:40px; height:40px; }
+.t_content{ width:92%; margin-left:15px;}
+a.content-username { color:#269ac9; font-size:14px; margin-right:15px;}
+a.content-username:hover{ color:#297fb8;}
+.orig_user img{width:32px; height:32px;}
+.reply-right{ float:right; position:relative;}
+.reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.comment_orig_content{margin:10px 0; color:#999;}
+.comment_orig_content .comment_orig_content{margin-top:0;}
+.orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px;}
+.orig_cont_sub{ border-top:0}
+.orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
+.orig_user{ margin:10px 15px 10px 5px;}
+.orig_user span{ color:#999; padding-right:5px;}
+.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
+.orig_right{ width:80%; margin-top:5px;}
+a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
+a:hover.comment_ding_link{ color:#269ac9;}
+.comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
+.comment_ding_link em{font-style: normal;font-family: arial;}
+.comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
+.comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
+.comment_content{ color:#333;}
+.t_txt{ margin-top:10px;}
+.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;}
+.orig_textarea{width:90%;  margin-bottom:10px;}
+.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
+.orig_sub:hover{ background:#297fb8;}
+.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
+
+/* 未登录的提示信息 */
+.syllabusbox_tishi{
+    font-size:14px;
+    width:733px;
+    color:#cb7c01;
+    padding:10px 0 0 15px;
+    background:#fff7d1;
+    border:1px solid #fcd9b4;
+    height:34px;
+}
+a.syllabusbox_a_blue{
+    color:#3b94d6 !important;
+}
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 2abbffda7..a42e07489 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -10,7 +10,7 @@ a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
 .tag_h span,.tag_h a{ margin-bottom:5px;}
 /*信息*/
 .project_info{ background:#fff; padding:10px 8px; width:222px;  margin-bottom:10px; border:1px solid #dddddd;}
-.pr_info_id{ width:137px; color:#5a5a5a; font-size:14px; margin-top:5px;}
+.pr_info_id{ width:130px; color:#5a5a5a; font-size:14px; margin-top:5px;}
 .pr_info_logo{ border:1px solid  #eaeaea; width:60px; height:60px; padding:1px;}
 .pr_info_logo:hover{ border:1px solid #297fb8; }
 
@@ -113,7 +113,7 @@ a.syllabusbox_a_blue{
 .syllabus_courses_list:hover{ background:#f6fafd;}
 .syllabus_courses_title{ font-size:16px; color:#333; width:650px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
 .sy_p_grey{ margin-left:25px; color:#888; margin-top:5px; font-size:12px;}
-.syllabus_class_box{ padding-left:30px; background:#f6f6f6;}
+.syllabus_class_box{ padding-left:43px; background:#f6f6f6;}
 .syllabus_class_list{ padding:12px 0 12px 15px; height:44px;border-left:1px solid #e7e7e7;border-bottom:1px solid #e7e7e7; position:relative;}
 .syllabus_class_list:hover{ background:#ececec;}
 .syllabus_class_list_more{padding:8px; text-align:center;border-left:1px solid #e7e7e7;border-bottom:1px solid #e7e7e7;}
@@ -155,4 +155,6 @@ a:hover.course-title{ color:#269ac9;}
 /*新建页面*/
 .name_input{ border:1px solid #64bdd9; height:16px; width:310px; background:#fff; margin-bottom:10px; padding:5px;}
 
-.homepageSyllabusName {font-size:16px; color:#484848; height:25px; float:left; font-weight: bold; max-width:120px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;}
+.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;}
+
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 3360d81ee..1f758d296 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -4,14 +4,16 @@
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体","Helvetica Neue", Helvetica, Arial, sans-serif;}
 body, ul, h1,h2,h3,h4,h5,p,pre,input {padding:0px; margin:0px;}
-body{background-color: #EFEFF4;}
+body{background-color: #efeff4;}
 ul li {list-style:none;}
 img {max-width:100%;}
 blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%; margin-top:5px;}
 .text-control {word-break:normal; word-wrap:break-word;}
 .f12 {font-size:12px;}
 .f13 {font-size:13px;}
+.f14 {font-size:14px;}
 .f15 {font-size:15px;}
+.f16 {font-size:16px;}
 .fb {font-weight:bold;}
 .mt2 {margin-top:2px;}
 .mt3 {margin-top:3px;}
@@ -19,12 +21,14 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .mt5 {margin-top:5px;}
 .mt10 {margin-top:10px;}
 .mt11 {margin-top:11px;}
+.mt12 {margin-top:12px;}
 .mt15 {margin-top:15px;}
 .mt30 {margin-top:30px;}
 .mt70 {margin-top:70px;}
 .mb5 {margin-bottom:5px;}
 .mb10 {margin-bottom:10px;}
 .mb20 {margin-bottom:20px;}
+.ml5 {margin-left:5px;}
 .ml10 {margin-left:10px;}
 .mr5 {margin-right:5px;}
 .mr10 {margin-right:10px;}
@@ -44,6 +48,8 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .c-grey5 {color:#aaaaaa;}
 .c-grey6 {color:#777777;}
 .c-blue {color:#3b94d6;}
+.c-white {color:#ffffff;}
+.c-black {color:#333}
 a {color:#707070;}
 a.c-grey {color:#707070;}
 a.c-grey2 {color:#9a9a9a;}
@@ -72,8 +78,8 @@ a.underline {text-decoration:underline;}
 /*按钮样式*/
 .btn1 {width:100%; height:40px; line-height:40px; vertical-align:middle; text-align:center; color:#fff; display:block; border-radius:5px;}
 .bg-blue:not(.btn-disabled):active {background-color:#2780c2;}
-.btn-disabled {background-color:#ccc;}
-
+.btn-disabled {background-color:#ccc !important;}
+.btn2 {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; margin:18px auto 20px auto; border-radius:50px; display:block;}
 
 /*tab*/
 .tab-wrap {position:relative; line-height:38px; display:flex; font-size:13px; background-color:#fff;}
@@ -87,43 +93,52 @@ a.underline {text-decoration:underline;}
 .bottom-tab-wrap a {display:block; flex:1; position:relative;}
 .bottom-tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
 
-
 /*动态样式*/
 .post-container {width:100%;}
-.post-wrapper {width:98%; border-radius:3px; box-shadow:0px 0px 8px  rgba(146, 153, 169, 0.5); background-color:#ffffff; margin:10px auto;}
-.post-main {padding:10px; color:#9a9a9a;}
-.post-avatar {width:40px; height:40px; margin-right:5px;}
+.post-wrapper {width:100%; background-color:#ffffff; margin:10px auto;}
+.post-main {padding:10px 15px; color:#9a9a9a;}
+.post-avatar {width:30px; height:30px;}
 .post-title {font-size:13px; text-align:left;}
 .post-detail-info {font-size:13px; text-align:left; color:#9a9a9a;}
 .fl {float:left;}
 .fr {float:right;}
 .cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content {width:100%; font-size:14px; line-height:20px; height:100px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
 .post-all-content a {color:#136ec2;}
 .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
 .post-interactive-column,
 .post-interactive-reply,
 .post-interactive-praise {width:50%; text-align:center; float:left; font-size:13px;}
 .more-wrap {width:100%;}
-.more-events {width:98%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; }
+.more-events {width:100%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border-top:1px solid #e6e6e6; border-bottom:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; }
 .border-bottom {border-bottom:1px solid #e6e6e6;}
-.post-reply-wrap, .post-input-wrap {width:100%; background-color:#f8f9fb;}
-.post-reply-row {padding:10px; color:#9a9a9a;}
+.post-reply-wrap {width:100%;}
+.post-reply-wrap:first-child {border-top:1px solid #ccc;}
+.post-input-wrap {width:100%; position:fixed; bottom:0;}
+.post-input-wrap2 {width:100%;}
+.post-reply-row {padding:10px 15px; color:#9a9a9a; background-color:#fff;}
 .post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;}
 .post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;}
-.post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word; overflow:hidden;}
+.post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word; overflow:hidden; padding-bottom:15px; border-bottom:1px solid #ccc;}
 .post-reply-content img {max-width:100%;}
 .post-reply-date, .post-reply-trigger {font-size:13px;}
-.post-input-container {padding-right:12px;}
+.post-input-container {position:relative; padding-right:70px;}
 .copy-input {width:100%; height:28px; line-height:28px; padding:0 5px; vertical-align: middle; font-size:12px; border-radius:3px; position:absolute; left:-9999em;}
-.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; vertical-align: middle; font-size:12px; border:1px solid #e6e6e6; outline:none; padding:0 5px; margin:0; border-radius:3px; overflow-y:auto; resize:none;}
-.post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
+.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; vertical-align: middle; font-size:13px; border:1px solid #e6e6e6; outline:none; padding:0 5px; margin:0; border-radius:3px; overflow-y:auto; resize:none; background-color:#f0eff4;}
+.post-reply-submit {position:absolute; font-size:13px; height:30px; line-height:30px; vertical-align:middle; padding:0 8px; color:#fff; background-color:#269ac9; outline:none; border:none; top:0; right:0;}
 .reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .num-block {display:inline-block; vertical-align:top;}
 .post-op-banner {height:20px; line-height:20px; vertical-align:middle;}
 
+/*20160628动态新样式*/
+.post-dynamic-author {width:50%; height:30px; line-height:30px; font-size:14px; color:#5b5b5b; vertical-align:middle;}
+.post-dynamic-time {height:30px; line-height:30px; vertical-align:middle;}
+.post-dynamic-title {font-size:15px;}
+.post-dynamic-from {width:50%; font-size:13px;}
+.post-box-shadow {box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
+
 /* loading 弹框*/
 .loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}
 .loading-box {position:absolute; top:50%; background:rgba(240,240,240, 0.5); width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;}
@@ -134,7 +149,7 @@ a.underline {text-decoration:underline;}
 .locked_btn_cir {background: url("/images/wechat/locked.png") 0 0 no-repeat; cursor: default;}
 
 /*20150612加入班级样式*/
-.add-class-box {width:80%; max-width:300px; min-width:240px; height:150px; font-size:15px; color:#444; background-color:#fff; margin:0 auto; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; margin-top:100px;}
+.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; margin:0 auto; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%);}
 .add-class-tip {padding-top:20px; padding-bottom:20px;}
 .class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
 .cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
@@ -162,7 +177,8 @@ a.underline {text-decoration:underline;}
 .class-detail-tab {width:23%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
 .class-detail-tab2 {width:32%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
 .class-detail-tab3 {width:48%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
-.class-tab-active {border-bottom:1px solid #3b94d6;}
+.class-tab-active {border-bottom:3px solid #3b94d6;}
+.tab-active-arrow {border-width:4px; position:absolute; top:41px; left:50%; transform:translate(-50%,0); border-color:#3b94d6 transparent transparent transparent; border-style:solid dashed dashed dashed;}
 .class-search-wrap {padding:8px 12px; position:relative;}
 .class-search-inner {padding:0 30px; background-color:#fff;}
 .class-search-icon {position:absolute; top:16px; left:16px;}
@@ -183,7 +199,7 @@ a.underline {text-decoration:underline;}
 .students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;}
 .new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
 .join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
-.new-class-input {width:60%; color:#aaa; height:35px; line-height:35px; vertical-align:middle; border:none; outline:none;}
+.new-class-input {width:60%; color:#555; height:35px; line-height:35px; vertical-align:middle; border:none; outline:none;}
 
 /*20160616登录注册*/
 .login-wrap {padding:0 10px;}
@@ -191,7 +207,7 @@ a.underline {text-decoration:underline;}
 .input-box { -webkit-appearance: none; font-size: 16px;width:100%; height:16px; padding: 10px 0px 10px 5px; line-height:16px; border:1px solid #ccc; border-radius:5px;}
 .login-op-wrap {height:30px; line-height:30px; vertical-align:middle;}
 .login-box{display:inline-block; width:14px; height:14px; line-height:14px; text-align:center; vertical-align:middle; border:1px solid #ccc; background:#fff; border-radius:3px; color:#fff; cursor:pointer;}
-.login-box.checked{background:#63c360;}
+.login-box.checked{background:#63c360; border:1px solid #63c360;}
 .login-box.checked:after{content:url(/images/wechat/checked.png);}
 .forget-psw-wrap {width:60px; margin:0 auto;}
-.forget-psw {position:fixed; bottom:10px;}
+.forget-psw {position:fixed; bottom:10px;}
\ No newline at end of file
diff --git a/public/stylesheets/weui/weui.min.css b/public/stylesheets/weui/weui.min.css
index 7b75fa7dd..f999fdfaf 100644
--- a/public/stylesheets/weui/weui.min.css
+++ b/public/stylesheets/weui/weui.min.css
@@ -2,4 +2,4 @@
  * WeUI v0.2.2 (https://github.com/weui/weui)
  * Copyright 2016 Tencent, Inc.
  * Licensed under the MIT license
- */.weui_input,.weui_select,.weui_switch{-webkit-appearance:none}.weui_btn,.weui_btn:after,.weui_grid,.weui_switch{box-sizing:border-box}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{line-height:1.6;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}*{margin:0;padding:0}a img{border:0}a{text-decoration:none}@font-face{font-weight:400;font-style:normal;font-family:weui;src:url(data:application/octet-stream;base64,d09GRgABAAAAAA8oAA4AAAAAGewAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAEQAAABWQClLhWNtYXAAAAGIAAAAOgAAAUrUIBe2Y3Z0IAAAAcQAAAAKAAAACgAAAABmcGdtAAAB0AAABZQAAAtwiJCQWWdhc3AAAAdkAAAACAAAAAgAAAAQZ2x5ZgAAB2wAAASuAAAHEkoVOHVoZWFkAAAMHAAAADUAAAA2CDTIZ2hoZWEAAAxUAAAAHQAAACQHlgNiaG10eAAADHQAAAAPAAAAPDqYAABsb2NhAAAMhAAAACAAAAAgDBYN2W1heHAAAAykAAAAIAAAACAApQu0bmFtZQAADMQAAAF6AAACnb2DL0hwb3N0AAAOQAAAAH0AAADNNS4jc3ByZXAAAA7AAAAAZQAAAHvdawOFeJxjYGR+wTiBgZWBg6mKaQ8DA0MPhGZ8wGDIyMTAwMTAysyAFQSkuaYwOLxifMXHHPQ/iyGKOYhhGlCYESQHAA5IDDB4nGNgYGBmgGAZBkYGEHAB8hjBfBYGDSDNBqQZGZgYGF7x/f8PUvCKEUSLMUDVAwEjG8OIBwB1qwa+AAAAAAAAAAAAAAAAAAB4nK1WaXMTRxCd1WHLNj6CDxI2gVnGcox2VpjLCBDG7EoW4BzylexCjl1Ldu6LT/wG/ZpekVSRb/y0vB4d2GAnVVQoSv2m9+1M9+ueXpPQksReWI+k3HwpprY2aWTnSUg3bFqO4kPZ2QspU0z+LoiCaLXUvu04JCISgap1hSWC2PfI0iTjQ48yWrYlvWpSbulJd9kaD+qt+vbT0FGO3QklNZuhQ+uRLanCqBJFMu2RkjYtw9VfSVrh5yvMfNUMJYLoJJLGm2EMj+Rn44xWGa3GdhxFkU2WG0WKRDM8iCKPslpin1wxQUD5oBlSXvk0onyEH5EVe5TTCnHJdprf9yU/6R3OvyTieouyJQf+QHZkB3unK/ki0toK46adbEehivB0fSfEI5uT6p/sUV7TaOB2RaYnzQiWyleQWPkJZfYPyWrhfMqXPBrVkoOcCFovc2Jf8g60HkdMiWsmyILujk6IoO6XnKHYY/q4+OO9XSwXIQTIOJb1jkq4EEYpYbOaJG0EOYiSskWV1HpHTJzyOi3iLWG/Tu3oS2e0Sag7MZ6th46tnKjkeDSp00ymTu2k5tGUBlFKOhM85tcBlB/RJK+2sZrEyqNpbDNjJJFQoIVzaSqIZSeWNAXRPJrRm7thmmvXokWaPFDPPXpPb26Fmzs9p+3AP2v8Z3UqpoO9MJ2eDshKfJp2uUnRun56hn8m8UPWAiqRLTbDlMVDtn4H5eVjS47CawNs957zK+h99kTIpIH4G/AeL9UpBUyFmFVQC9201rUsy9RqVotUZOq7IU0rX9ZpAk05Dn1jX8Y4/q+ZGUtMCd/vxOnZEZeeufYlyDSH3GZdj+Z1arFdgM5sz+k0y/Z9nebYfqDTPNvzOh1ha+t0lO2HOi2w/UinY2wvaEGT7jsEchGBXMAGEoGwdRAI20sIhK1CIGwXEQjbIgJhu4RA2H6MQNguIxC2l7Wsmn4qaRw7E8sARYgDoznuyGVuKldTyaUSrotGpzbkKXKrpKJ4Vv0rA/3ikTesgbVAukTW/IpJrnxUleOPrmh508S5Ao5Vf3tzXJ8TD2W/WPhT8L/amqqkV6x5ZHIVeSPQk+NE1yYVj67p8rmqR9f/i4oOa4F+A6UQC0VZlg2+mZDwUafTUA1c5RAzGzMP1/W6Zc3P4fybGCEL6H78NxQaC9yDTllJWe1gr9XXj2W5twflsCdYkmK+zOtb4YuMzEr7RWYpez7yecAVMCqVYasNXK3gzXsS85DpTfJMELcVZYOkjceZILGBYx4wb76TICRMXbWB2imcsIG8YMwp2O+EQ1RvlOVwe6F9Ho2Uf2tX7MgZFU0Q+G32Rtjrs1DyW6yBhCe/1NdAVSFNxbipgEsj5YZq8GFcrdtGMk6gr6jYDcuyig8fR9x3So5lIPlIEatHRz+tvUKd1Ln9yihu3zv9CIJBaWL+9r6Z4qCUd7WSZVZtA1O3GpVT15rDxasO3c2j7nvH2Sdy1jTddE/c9L6mVbeDg7lZEO3bHJSlTC6o68MOG6jLzaXQ6mVckt52DzAsMKDfoRUb/1f3cfg8V6oKo+NIvZ2oH6PPYgzyDzh/R/UF6OcxTLmGlOd7lxOfbtzD2TJdxV2sn+LfwKy15mbpGnBD0w2Yh6xaHbrKDXynBjo90tyO9BDwse4K8QBgE8Bi8InuWsbzKYDxfMYcH+Bz5jBoMofBFnMYbDNnDWCHOQx2mcNgjzkMvmDOOsCXzGEQModBxBwGT5gTADxlDoOvmMPga+Yw+IY59wG+ZQ6DmDkMEuYw2Nd0ayhzixd0F6htUBXowPQTFvewONRUGbK/44Vhf28Qs38wiKk/aro9pP7EC0P92SCm/mIQU3/VdGdI/Y0Xhvq7QUz9wyCmPtMvxnKZwV9GvkuFA8ouNp/z98T7B8IaQLYAAQAB//8AD3icdZVfbFN1FMd/557f73dv713b3d723rVrV9aut7qtlXWj5U8GPmJMTCC8khgffZfEEBPxiQQVEX1wPpgYDIRNE4I4B3Vk/JkQQjQREzABFv4EfRCJYbDKeue5t5QMTZPbb257TnLO93PO71emMLZyCL9BhxnMYdqJWJdkSmkIIqD2gbMZamXAMhTphb5GABbrDSEa9foS6ampO5zfmZr0FR369RTFlur1xvK3/PbU1G0eKGN+jS/wOGaoRj/V6In8v4Yqcy+BW90E5hhJxU6YoxUb/jr5RIgnJ880hWgWdkXd6K5I2Nmpa66m7+zpwoxonmlnNBcnYrEJKwmOZhia90eSMaS6X+HXmKC6SZZj+nRfyqba+J/acTkEOXedWa2N2k6xDGPVih2X8GD6sRCPp0/7hj/X1bSqgzasQTaWTBaSSUyIxul2RvMtVddVSGkA2gbww26y5fsjPIDDLMyy5DvdrbZ9mzZ3qgM1swwWSDK+BapZsGsFX+Hhngs7QoAHDgCGdlzY7c0i/wSVhCLe5ghFjnEFh/vG097ZKw8GBh5cgfH0uHfdO4f4GYpejjsBHiFaGPj/Et/DFNVv+7ciatu/2QJAPaijdhTiBGFdsWrl3Kf+F3fPbQs19u37R9s293FZB13khA7ZiGWlLQtTmU0p76dL9/L5e5dgJLXpMWhXhbiqecf8cNpiLf+f4g9YpM3Kk//+3kTY91+GLbAZyGmFDFecoh1XQbrFgsuKkqk2c6oM1gjgKKPqG2pMQlyaUpHS+1l2SyUtvOX52RUmBLDZeeAwImOSq4p4VYi7gvK6pferBDlFMbEqlzH+3K6X2AgLv6yPlIddf+l556W3RARoRjIK0g66pu7dnFNJOB2Pw5D3iLp6XUYFchDvyKiEggAjGgfofFKU3HUB4hWhkB1TvisF9IuowcHv3f8wPKUcos7lcbsbSkPWKo5QtVscI1AcN4Qq1WTXpXC2S8l09Rlhw2jOGGkDMkZ/xIjI0EFNh9kQUCBjNI/RZFuzmsDvMUdsTJpV5Ok9IBUfCa2qy6x+c9Qchft1/zTWzwNRXWEbvd9KDczR2/lnvzdvwGvezdW8kUVZL5194t2Xtrt1jgFvIogdmGM+Mbour9wF+LsD4msDzWvwJwAMd+RZag4E2KiP/XgWS+QtRZuoT2d7ra7WPdBeOPKn0o2TCC4Dt4juqoNwf84ja4BzF0GljWrcqGp6RPJBTQmDnrdSKTeVwhIFLq5KvKdr3i9cQgiGNcN7wc9xUy0mB/E0vsg0FmN9bNBnUsgmrWiIB0w2w5ibk3HbIQBmAAH9HrmPyFWeu4sfJrPZSja7ff+GDRc3Dl32ljgH7fLMCs3lx0mfwWSgig5rRtbQszHjnUunlWPcW2plzVwGbflwO4+0xWoSD6MZnBGfVV9P7Ckrtag6qlNzasVap7EpH05MpNvPdzOLQizOtPTITc5vHjmywPmCEl+VBMlnKTOLy/N8oZVDGuzkm/g7bqeNzPj/GzEzRDtZiED+Wcm4VEGFoI9i0JPywdierUdvcX7rKOnaQcitby7sPYF4Ym+g7w+ubYVIt+4Z866vh552jJT9C4YpwdAAAHicY2BkYGAA4udtFj/j+W2+MnAzvwCKMFyadr0aQq/1ZmD4n8X8gjkIyOVgYAKJAgB9Iw0DAAAAeJxjYGRgYA76n8UQxfyCAQiAJCMDKuAHAGaBBAAAAAB4nGN+wcDATCYGAKtTDcYAAAAAAAAyAG4ArgDuAS4BdgHUAgQCLgJyArgDCANOA4kAAQAAAA8AMgAEAAAAAAACAAAAEABzAAAAHgtwAAAAAHicdZDNSgMxFIVPbKu1BReK7oS7USzC9AdcqJtCRV0r1PXYpjNTppOSyVi69R1c+HK+ip6ZRhHBCZn73ZObk5sA2McHFDbfBeeGFerMNryFHVx6rlEfeq5z3HhuoI17z9vUHz23cI4nz20c4JUOqr7LbI43zwpNfHrewp7a8VxDUx16rpOPPTdwpE48b1O/9tzCWI08t3Gq3kdmubZJFDs5G3Vk0OtfyPNaDKUkC1MJCxcbm8tQZiZzOk1NMDGLlS6SBx0VaWhLLOdY2zwxmfSDXpne6Uzb0Olp6Za/RAPnZjKzZiG33keW1sz1xAWxc8urbve3P0YwWGINiwQRYjgIzqh2GAfooc+HFzyzQli5qUqQIURKJUTBHXG1kjMfcs6YZVQ1K1JygAn/C6yoFNz7wBiRUu62P+p3HDOWXknlIjw/YBffq3eMWVURVidMf3rL8ULXAVXHDsoubHWq4PZPP8L7lmtzKhPqQXVrR/UKXY5/+v8CE7x2bAAAeJxtjd0KwyAUg086p/2bZU9Y5NRugijohq8/up7dLTchHyShjk6N9F8LETpcoHCFhkGPASMmzLjBYtEcCkffb7mlmN2mQtrzXN3u1/pm9rUO39BcSUaIFV/P7v0XUxZimguvkB5WXLA6RqbjQIBml9hHXb0r/CT6AAFSNNIAAAB4nGPw3sFwIihiIyNjX+QGxp0cDBwMyQUbGVidNjIwaEFoDhR6JwMDAycyi5nBZaMKY0dgxAaHjoiNzCkuG9VAvF0cDQyMLA4dySERICWRQLCRgUdrB+P/1g0svRuZGFwAB9MiuAAAAA==) format('truetype'),url(data:application/octet-stream;base64,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) format('woff'),url(data:application/octet-stream;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxtZXRhZGF0YT5Db3B5cmlnaHQgKEMpIDIwMTUgYnkgb3JpZ2luYWwgYXV0aG9ycyBAIGZvbnRlbGxvLmNvbTwvbWV0YWRhdGE+CjxkZWZzPgo8Zm9udCBpZD0id2V1aSIgaG9yaXotYWR2LXg9IjEwMDAiID4KPGZvbnQtZmFjZSBmb250LWZhbWlseT0id2V1aSIgZm9udC13ZWlnaHQ9IjQwMCIgZm9udC1zdHJldGNoPSJub3JtYWwiIHVuaXRzLXBlci1lbT0iMTAwMCIgYXNjZW50PSI4NTAiIGRlc2NlbnQ9Ii0xNTAiIC8+CjxtaXNzaW5nLWdseXBoIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0iY2lyY2xlIiB1bmljb2RlPSImI3hlYTAxOyIgZD0ibTUwMSA3OTFjLTI0NCAwLTQ0Mi0xOTgtNDQyLTQ0MiAwLTI0MyAxOTgtNDQxIDQ0Mi00NDFzNDQxIDE5NyA0NDEgNDQxYzAgMjQ0LTE5OCA0NDItNDQxIDQ0MnogbTAtODQ5Yy0yMjMgMC00MDQgMTgwLTQwNCA0MDMgMCAyMjMgMTgxIDQwMyA0MDQgNDAzIDIyMiAwIDQwMy0xODAgNDAzLTQwMyAwLTIyMy0xODEtNDAzLTQwMy00MDN6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPGdseXBoIGdseXBoLW5hbWU9ImRvd25sb2FkIiB1bmljb2RlPSImI3hlYTAyOyIgZD0ibTQ5NSA3OTdjLTI0MiAwLTQ0Mi0yMDAtNDQyLTQ1MiAwLTI0MiAyMDAtNDQyIDQ0Mi00NDIgMjUyIDAgNDUyIDIwMCA0NTIgNDQyIDAgMjUyLTIwMCA0NTItNDUyIDQ1MnogbTE1Ny01MjhsLTExOC0xNTRjLTE5LTI0LTQ5LTI0LTY4IDBsLTExOCAxNTRjLTE5IDI0LTkgNDQgMjIgNDRoOTN2Mjc5YzAgMTAgOCAxOSAxOCAxOWgzOGMxMCAwIDE4LTkgMTgtMTl2LTI3OWg5M2MzMSAwIDQxLTIwIDIyLTQ0eiIgaG9yaXotYWR2LXg9IjEwMDAiIC8+CjxnbHlwaCBnbHlwaC1uYW1lPSJpbmZvIiB1bmljb2RlPSImI3hlYTAzOyIgZD0ibTQ5NiA3ODljLTIzOCAwLTQzNS0xOTctNDM1LTQ0NSAwLTIzOCAxOTctNDM1IDQzNS00MzUgMjQ4IDAgNDQ1IDE5NyA0NDUgNDM1IDAgMjQ4LTE5NyA0NDUtNDQ1IDQ0NXogbTM2LTY1NmMwLTktOC0xNy0xNy0xN2gtMjhjLTkgMC0xNyA4LTE3IDE3djI4MmMwIDUgNCA5IDkgOWg0NGM1IDAgOS00IDktOXYtMjgyeiBtLTMxIDMzOWMtMjQgMC00NCAyMC00NCA0NHMyMCA0NCA0NCA0NGMyNCAwIDQ0LTE5IDQ0LTQ0cy0yMC00NC00NC00NHoiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0ic2FmZV9zdWNjZXNzIiB1bmljb2RlPSImI3hlYTA0OyIgZD0ibTUwMCA4MTJjLTE3My0zOS0yOTktODItNDEzLTExOSAwLTEyMCAwLTIxNiAwLTMxNyAwLTI4MyAyMzEtNDM5IDQxMy00ODggMTgyIDQ5IDQxMyAyMDUgNDEzIDQ4OCAwIDEwMSAwIDE5NyAwIDMxNy0xMTQgMzctMjQwIDgwLTQxMyAxMTl6IG0yNTItMzIxbC0zMjItMzE2Yy0yLTItNS0yLTcgMGwtMTQ4IDE1M2MtMiAyLTIgNS0xIDhsMjEgMjdjMSAyIDQgMyA3IDFsMTIxLTkzYzItMSA1LTEgNyAwbDI5NSAyNDZjMiAyIDUgMiA3IDBsMjAtMTljMS0yIDEtNSAwLTd6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPGdseXBoIGdseXBoLW5hbWU9InNhZmVfd2FybiIgdW5pY29kZT0iJiN4ZWEwNTsiIGQ9Im01MDEgNzk0Yy0xNjYtMzgtMjg3LTgwLTM5Ny0xMTQgMC0xMTYgMC0yMDggMC0zMDUgMC0yNzIgMjIzLTQyMiAzOTctNDY5IDE3NCA0NyAzOTcgMTk3IDM5NyA0NjkgMCA5NyAwIDE4OSAwIDMwNS0xMTAgMzQtMjMxIDc2LTM5NyAxMTR6IG0tMjMtMjc2aDQ2YzYgMCAxMC00IDktOWwtMTAtMjE2YzAtMy0yLTUtNS01aC0zNGMtMyAwLTUgMi01IDVsLTEwIDIxNmMwIDUgNCA5IDkgOXogbTIzLTMzNmMtMTggMC0zMyAxNS0zMyAzM3MxNSAzMyAzMyAzMyAzMy0xNSAzMy0zMy0xNS0zMy0zMy0zM3oiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0ic3VjY2VzcyIgdW5pY29kZT0iJiN4ZWEwNjsiIGQ9Im0yODggMzA1Yy03IDgtOCAyMi0yIDMwbDMgNGM3IDkgMTkgMTEgMjggNGw5OC03NWM5LTcgMjMtNyAzMSAwbDI3NiAyMjljOCA3IDIxIDcgMjktMWwtMiAyYzgtOCA4LTIwIDAtMjhsLTMwNC0yOTljLTctOC0yMC03LTI4IDFsLTEyOSAxMzN6IG02NjkgMzljMCAyNTgtMjA1IDQ2My00NjMgNDYzLTI0NiAwLTQ1MS0yMDUtNDUxLTQ2MyAwLTI0NiAyMDUtNDUxIDQ1MS00NTEgMjU4IDAgNDYzIDIwNSA0NjMgNDUxeiIgaG9yaXotYWR2LXg9IjEwMDAiIC8+CjxnbHlwaCBnbHlwaC1uYW1lPSJzdWNjZXNzX2NpcmNsZSIgdW5pY29kZT0iJiN4ZWEwNzsiIGQ9Im01MDEgNzkxYy0yNDQgMC00NDItMTk4LTQ0Mi00NDIgMC0yNDMgMTk4LTQ0MSA0NDItNDQxczQ0MSAxOTcgNDQxIDQ0MWMwIDI0NC0xOTggNDQyLTQ0MSA0NDJ6IG0wLTg0OWMtMjIzIDAtNDA0IDE4MC00MDQgNDAzIDAgMjIzIDE4MSA0MDMgNDA0IDQwMyAyMjIgMCA0MDMtMTgwIDQwMy00MDMgMC0yMjMtMTgxLTQwMy00MDMtNDAzeiBtMjE0IDU1MGwtMjY2LTIyMWMtOC03LTIyLTctMzAtMWwtOTYgNzNjLTggNy0yMCA1LTI2LTNsLTMtNGMtNi05LTUtMjIgMi0zMGwxMjUtMTI4YzctOCAxOS04IDI3LTFsMjkzIDI4OWM3IDcgOCAxOCAxIDI2LTggNy0yMCA3LTI3IDB6IG0yNiAxYzAgMCAxLTEgMS0xIDAgMCAxLTEgMS0xbC0yIDJ6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPGdseXBoIGdseXBoLW5hbWU9InN1Y2Nlc3Nfbm9fY2lyY2xlIiB1bmljb2RlPSImI3hlYTA4OyIgZD0ibTYxIDI4NWMtMTQgMTQtMTggNDAtOSA1OGw2IDExYzggMTggMjggMjMgNDQgMTFsMjAzLTE0N2MxNi0xMSA0MS0xMSA1NiAybDU0MSA0NDZjMTUgMTIgMzkgMTEgNTMtM2wtMTMgMTNjMTQtMTQgMTQtMzcgMC01MWwtNTgzLTU5MWMtMTQtMTQtMzYtMTQtNTAtMWwtMjQ4IDI1MnoiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0id2FpdGluZyIgdW5pY29kZT0iJiN4ZWEwOTsiIGQ9Im00OTQgODAyYy0yNDQgMC00NDYtMjAyLTQ0Ni00NTggMC0yNDQgMjAyLTQ0NiA0NDYtNDQ2IDI1NiAwIDQ1OCAyMDIgNDU4IDQ0NiAwIDI1Ni0yMDIgNDU4LTQ1OCA0NTh6IG0yNTUtNTUxaC0yOTR2MzM0aDQ1di0yODloMjQ5di00NXoiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0id2FpdGluZ19jaXJjbGUiIHVuaWNvZGU9IiYjeGVhMGE7IiBkPSJtNzQxIDQ5M2MwIDAgMS0xIDEtMSAwIDAgMS0xIDEtMWwtMiAyeiBtLTI0MCAyOThjLTI0NCAwLTQ0Mi0xOTgtNDQyLTQ0MiAwLTI0MyAxOTgtNDQxIDQ0Mi00NDFzNDQxIDE5NyA0NDEgNDQxYzAgMjQ0LTE5OCA0NDItNDQxIDQ0MnogbTAtODQ5Yy0yMjMgMC00MDQgMTgwLTQwNCA0MDMgMCAyMjMgMTgxIDQwMyA0MDQgNDAzIDIyMiAwIDQwMy0xODAgNDAzLTQwMyAwLTIyMy0xODEtNDAzLTQwMy00MDN6IG0tNDYgNTYxaC0zNnYtMjUzaDI1M3YzNmgtMjE3eiIgaG9yaXotYWR2LXg9IjEwMDAiIC8+CjxnbHlwaCBnbHlwaC1uYW1lPSJ3YXJuIiB1bmljb2RlPSImI3hlYTBiOyIgZD0ibTQ5NCA4MTNjLTI1MCAwLTQ1Ny0yMDctNDU3LTQ2OSAwLTI1MCAyMDctNDU3IDQ1Ny00NTcgMjYyIDAgNDY5IDIwNyA0NjkgNDU3IDAgMjYyLTIwNyA0NjktNDY5IDQ2OXogbS0yMS0yMzZoNTRjMTAgMCAxOC04IDE4LTE4bC0xNC0zMDFjMC01LTUtMTAtMTAtMTBoLTQyYy01IDAtOSA1LTEwIDEwbC0xMyAzMDBjLTEgMTAgNyAxOSAxNyAxOXogbTI3LTQ3MmMtMjUgMC00NSAyMC00NSA0NSAwIDI1IDIwIDQ2IDQ1IDQ2IDI1IDAgNDUtMjEgNDUtNDYgMC0yNS0yMC00NS00NS00NXoiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0iaW5mb19jaXJjbGUiIHVuaWNvZGU9IiYjeGVhMGM7IiBkPSJtNTAwIDUyMmMzMiAwIDU3IDI2IDU3IDU4IDAgMzEtMjUgNTctNTcgNTctMzIgMC01Ny0yNi01Ny01NyAwLTMyIDI1LTU4IDU3LTU4eiBtNTctNTdoLTE0M3YtMjloNTd2LTMxNmgtNTd2LTI4aDIwMXYyOGgtNTh2MzQ1eiBtLTQzIDM0NGMtMjY4IDAtNDczLTIwNS00NzMtNDczIDAtMjQwIDIwNS00NDUgNDczLTQ0NSAyNDAgMCA0NDUgMjA1IDQ0NSA0NDUgMCAyNjgtMjA1IDQ3My00NDUgNDczeiBtLTE0LTg2MWMtMjIyIDAtNDAyIDE4MC00MDIgNDAyIDAgMjIyIDE4MCA0MDIgNDAyIDQwMiAyMjIgMCA0MDItMTgwIDQwMi00MDIgMC0yMjItMTgwLTQwMi00MDItNDAyeiIgaG9yaXotYWR2LXg9IjEwMDAiIC8+CjxnbHlwaCBnbHlwaC1uYW1lPSJjYW5jZWwiIHVuaWNvZGU9IiYjeGVhMGQ7IiBkPSJtNjU0IDUzMmwtMTU0LTE1NC0xNTQgMTU0LTI4LTI4IDE1NC0xNTQtMTU0LTE1NCAyOC0yOCAxNTQgMTU0IDE1NC0xNTQgMjggMjgtMTU0IDE1NCAxNTQgMTU0eiBtLTE1NCAyNTNjLTI0MCAwLTQzNS0xOTUtNDM1LTQzNSAwLTI0MCAxOTUtNDM1IDQzNS00MzUgMjQwIDAgNDM1IDE5NSA0MzUgNDM1IDAgMjQwLTE5NSA0MzUtNDM1IDQzNXogbTAtODMxYy0yMTggMC0zOTUgMTc4LTM5NSAzOTYgMCAyMTggMTc3IDM5NiAzOTUgMzk2IDIxOCAwIDM5Ni0xNzggMzk2LTM5NiAwLTIxOC0xNzgtMzk2LTM5Ni0zOTZ6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPGdseXBoIGdseXBoLW5hbWU9InNlYXJjaCIgdW5pY29kZT0iJiN4ZWEwZTsiIGQ9Im02NTMgMTQwYy02OS01Ni0xNTctOTAtMjUzLTkwLTIyMSAwLTQwMCAxNzktNDAwIDQwMHMxNzkgNDAwIDQwMCA0MDAgNDAwLTE3OSA0MDAtNDAwYzAtOTYtMzQtMTg0LTkwLTI1M2wyOTAtMjkxLTU2LTU2LTI5MSAyOTB6IG0tMjUzLTEwYzE3NyAwIDMyMCAxNDMgMzIwIDMyMHMtMTQzIDMyMC0zMjAgMzIwLTMyMC0xNDMtMzIwLTMyMCAxNDMtMzIwIDMyMC0zMjB6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPC9mb250Pgo8L2RlZnM+Cjwvc3ZnPg==) format('svg')}[class*=" weui_icon_"]:before,[class^=weui_icon_]:before{font-family:weui;font-style:normal;font-weight:400;speak:none;display:inline-block;vertical-align:middle;text-decoration:inherit;width:1em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin:0}.weui_btn,.weui_dialog_ft a{text-decoration:none;-webkit-tap-highlight-color:transparent}.weui_icon_circle:before{content:"\EA01"}.weui_icon_download:before{content:"\EA02"}.weui_icon_info:before{content:"\EA03"}.weui_icon_safe_success:before{content:"\EA04"}.weui_icon_safe_warn:before{content:"\EA05"}.weui_icon_success:before{content:"\EA06";font-size:23px;color:#09BB07}.weui_icon_success_circle:before{content:"\EA07"}.weui_icon_success_no_circle:before{content:"\EA08"}.weui_icon_waiting:before{content:"\EA09";font-size:23px;color:#10AEFF}.weui_icon_waiting_circle:before{content:"\EA0A"}.weui_icon_warn:before{content:"\EA0B";font-size:23px;color:#F43530}.weui_icon_info_circle:before{content:"\EA0C"}.weui_icon_cancel:before{content:"\EA0D"}.weui_icon_info:before{font-size:23px;color:#10AEFF}.weui_icon_success_circle:before,.weui_icon_success_no_circle:before{font-size:23px;color:#09BB07}.weui_icon_waiting_circle:before{font-size:23px;color:#10AEFF}.weui_icon_circle:before{font-size:23px;color:#C9C9C9}.weui_icon_download:before,.weui_icon_info_circle:before{font-size:23px;color:#09BB07}.weui_icon_safe_success:before{color:#09BB07}.weui_icon_safe_warn:before{color:#FFBE00}.weui_icon_cancel:before{color:#F43530;font-size:22px}.weui_icon_search:before{content:"\EA0E";color:#B2B2B2;font-size:14px}.weui_icon_msg:before,.weui_icon_safe:before{font-size:104px}.weui_icon_warn.weui_icon_msg:before{color:#F76260}.weui_btn.weui_btn_mini{line-height:1.9;font-size:14px;padding:0 .75em;display:inline-block}button.weui_btn,input.weui_btn{width:100%;border-width:0;outline:0;-webkit-appearance:none}button.weui_btn:focus,input.weui_btn:focus{outline:0}button.weui_btn_inline,button.weui_btn_mini,input.weui_btn_inline,input.weui_btn_mini{width:auto}.weui_btn+.weui_btn{margin-top:15px}.weui_btn.weui_btn_inline+.weui_btn.weui_btn_inline{margin-top:auto;margin-left:15px}.weui_btn_area{margin:1.17647059em 15px .3em}.weui_btn_area.weui_btn_area_inline{-webkit-display:-webkit-box;-webkit-display:-webkit-flex;display:-webkit-box;display:-ms-flexbox;display:flex}.weui_btn_area.weui_btn_area_inline .weui_btn{margin-top:auto;margin-right:15px;width:100%;-webkit-flex:1;-webkit-box-flex:1;-ms-flex:1;flex:1}.weui_btn_area.weui_btn_area_inline .weui_btn:last-child{margin-right:0}.weui_btn{position:relative;display:block;margin-left:auto;margin-right:auto;padding-left:14px;padding-right:14px;font-size:18px;text-align:center;color:#FFF;line-height:2.33333333;border-radius:5px;overflow:hidden}.weui_btn:after,.weui_cell:before{content:" ";position:absolute}.weui_btn:after{width:200%;height:200%;top:0;left:0;border:1px solid rgba(0,0,0,.2);-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;border-radius:10px}.weui_btn.weui_btn_inline{display:inline-block}.weui_btn_default{background-color:#F7F7F7;color:#454545}.weui_btn_default:not(.weui_btn_disabled):visited{color:#454545}.weui_btn_default:not(.weui_btn_disabled):active{color:#A1A1A1;background-color:#DEDEDE}.weui_btn_primary{background-color:#04BE02}.weui_btn_primary:not(.weui_btn_disabled):visited{color:#FFF}.weui_btn_primary:not(.weui_btn_disabled):active{color:rgba(255,255,255,.4);background-color:#039702}.weui_btn_warn{background-color:#EF4F4F}.weui_btn_warn:not(.weui_btn_disabled):visited{color:#FFF}.weui_btn_warn:not(.weui_btn_disabled):active{color:rgba(255,255,255,.4);background-color:#C13E3E}.weui_btn_disabled{color:rgba(255,255,255,.6)}.weui_btn_disabled.weui_btn_default{color:#C9C9C9}.weui_btn_plain_primary{color:#04BE02;border:1px solid #04BE02}button.weui_btn_plain_primary,input.weui_btn_plain_primary{border-width:1px;background-color:transparent}.weui_btn_plain_primary:active{border-color:#039702}.weui_btn_plain_primary:after{border-width:0}.weui_btn_plain_default{color:#5A5A5A;border:1px solid #5A5A5A}button.weui_btn_plain_default,input.weui_btn_plain_default{border-width:1px;background-color:transparent}.weui_btn_plain_default:after{border-width:0}.weui_cell:before,.weui_cells:before{top:0;border-top:1px solid #D9D9D9;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5)}.weui_cell:before{width:100%;height:1px;color:#D9D9D9;-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;transform:scaleY(.5);left:15px}.weui_cells:before,.weui_grids:before{-webkit-transform-origin:0 0;-ms-transform-origin:0 0}.weui_cell:first-child:before{display:none}.weui_cells{margin-top:1.17647059em;background-color:#FFF;line-height:1.41176471;font-size:17px;overflow:hidden;position:relative}.weui_cells_access .weui_cell:not(.no_access):active,.weui_cells_checkbox .weui_cell:active,.weui_cells_radio .weui_cell:active{background-color:#ECECEC}.weui_cells_tips,.weui_cells_title{padding-left:15px;padding-right:15px;font-size:14px}.weui_cells:after,.weui_cells:before{position:absolute;left:0;width:100%;height:1px;color:#D9D9D9;content:" "}.weui_cells:before{transform-origin:0 0;transform:scaleY(.5)}.weui_cells:after{bottom:0;border-bottom:1px solid #D9D9D9;-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_cells_title{margin-top:.77em;margin-bottom:.3em;color:#888}.weui_cells_title+.weui_cells{margin-top:0}.weui_cells_tips{margin-top:.3em;color:#888}.weui_cell{padding:10px 15px;position:relative;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.weui_cell_ft{text-align:right;color:#888}.weui_cell_primary{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.weui_cells_access .weui_cell:not(.no_access){-webkit-tap-highlight-color:transparent}.weui_cells_access a.weui_cell{color:inherit}.weui_cells_access .weui_cell_ft:after{content:" ";display:inline-block;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);height:6px;width:6px;border-width:2px 2px 0 0;border-color:#C8C8CD;border-style:solid;position:relative;top:-2px;top:-1px;margin-left:.3em}.weui_check_label{-webkit-tap-highlight-color:transparent}.weui_check{position:absolute;left:-9999em}.weui_cells_radio .weui_cell_ft{padding-left:.35em}.weui_cells_radio .weui_check:checked+.weui_icon_checked:before{content:'\EA08';color:#09BB07;font-size:16px}.weui_cells_checkbox .weui_cell_hd{padding-right:.35em}.weui_cells_checkbox .weui_icon_checked:before{content:'\EA01';color:#C9C9C9;font-size:23px;display:block}.weui_cells_checkbox .weui_check:checked+.weui_icon_checked:before{content:'\EA06';color:#09BB07}.weui_input,.weui_textarea{border:0;color:inherit;outline:0}.weui_label{display:block;width:3em}.weui_input{width:100%;background-color:transparent;font-size:inherit;height:1.41176471em;line-height:1.41176471}.weui_input::-webkit-inner-spin-button,.weui_input::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.weui_textarea{display:block;resize:none;width:100%;font-size:1em;line-height:inherit}.weui_textarea_counter{color:#B2B2B2;text-align:right}.weui_dialog,.weui_grid_label,.weui_msg,.weui_toptips{text-align:center}.weui_cell_warn .weui_textarea_counter{color:#E64340}.weui_toptips{display:none;position:fixed;-webkit-transform:translateZ(0);width:100%;top:0;line-height:2.3;font-size:14px;color:#FFF;z-index:2}.weui_toptips.weui_warn{background-color:#E64340}.weui_cells_form .weui_cell_warn{color:#E64340}.weui_cells_form .weui_cell_warn .weui_icon_warn{display:inline-block}.weui_cells_form .weui_cell_hd{padding-right:.3em}.weui_cells_form .weui_cell_ft{font-size:0}.weui_cells_form .weui_icon_warn{display:none}.weui_cell_select .weui_cell_bd:after,.weui_select_before .weui_cell_hd:before{content:" ";display:inline-block;margin-top:-3px}.weui_cell_select{padding:0}.weui_select,.weui_select_after,.weui_select_before .weui_cell_bd{padding-left:15px}.weui_cell_select .weui_select{padding-right:30px}.weui_cell_select .weui_cell_bd:after{-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);height:6px;width:6px;border-width:2px 2px 0 0;border-color:#C8C8CD;border-style:solid;position:absolute;top:50%;right:15px}.weui_grid:before,.weui_select_before .weui_cell_hd:after{-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%}.weui_select,.weui_select_before .weui_cell_hd{position:relative}.weui_select{border:0;outline:0;background-color:transparent;width:100%;font-size:inherit;height:44px;z-index:1}.weui_select_before{padding-right:15px}.weui_select_before .weui_select{width:auto}.weui_select_before .weui_cell_hd:after{content:" ";position:absolute;right:0;top:0;width:1px;height:100%;border-right:1px solid #D9D9D9;color:#D9D9D9;transform-origin:0 100%;-webkit-transform:scaleX(.5);-ms-transform:scaleX(.5);transform:scaleX(.5)}.weui_select_before .weui_cell_hd:before{-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);height:6px;width:6px;border-width:2px 2px 0 0;border-color:#C8C8CD;border-style:solid;position:absolute;top:50%;right:15px}.weui_select_before .weui_cell_bd:after{display:none}.weui_vcode{padding-top:0;padding-right:0;padding-bottom:0}.weui_vcode .weui_cell_ft img{margin-left:5px;height:44px;vertical-align:middle}.weui_cell_switch{padding-top:6px;padding-bottom:6px}.weui_switch{-moz-appearance:none;appearance:none;position:relative;width:52px;height:32px;border:1px solid #DFDFDF;outline:0;border-radius:16px;background:#DFDFDF}.weui_switch:after,.weui_switch:before{position:absolute;height:30px;border-radius:15px;top:0;left:0;content:" "}.weui_switch:before{width:50px;background-color:#FDFDFD;-webkit-transition:-webkit-transform .3s;transition:transform .3s}.weui_switch:after{width:30px;background-color:#FFF;box-shadow:0 1px 3px rgba(0,0,0,.4);-webkit-transition:-webkit-transform .3s;transition:transform .3s}.weui_switch:checked{border-color:#04BE02;background-color:#04BE02}.weui_switch:checked:before{-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0)}.weui_switch:checked:after{-webkit-transform:translateX(20px);-ms-transform:translateX(20px);transform:translateX(20px)}.weui_uploader_hd{padding-top:0;padding-right:0;padding-left:0}.weui_uploader_hd .weui_cell_ft{font-size:1em}.weui_uploader_bd{margin-bottom:-4px;margin-right:-9px;overflow:hidden}.weui_uploader_file,.weui_uploader_input_wrp{margin-right:9px;margin-bottom:9px;float:left}.weui_uploader_files{list-style:none}.weui_uploader_file{width:79px;height:79px;background:center center no-repeat;background-size:cover}.weui_uploader_status{position:relative}.weui_uploader_status:before{content:" ";position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.5)}.weui_uploader_status .weui_uploader_status_content{position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);color:#FFF}.weui_uploader_status .weui_icon_warn{display:block}.weui_uploader_input_wrp{position:relative;width:77px;height:77px;border:1px solid #D9D9D9}.weui_uploader_input_wrp:after,.weui_uploader_input_wrp:before{content:" ";position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#D9D9D9}.weui_uploader_input_wrp:before{width:2px;height:39.5px}.weui_uploader_input_wrp:after{width:39.5px;height:2px}.weui_uploader_input_wrp:active{border-color:#999}.weui_uploader_input_wrp:active:after,.weui_uploader_input_wrp:active:before{background-color:#999}.weui_uploader_input{position:absolute;z-index:1;top:0;left:0;width:100%;height:100%;opacity:0;-webkit-tap-highlight-color:transparent}.weui_msg{padding-top:36px}.weui_msg .weui_icon_area{margin-bottom:30px}.weui_msg .weui_text_area{margin-bottom:25px;padding:0 20px}.weui_msg .weui_msg_title{margin-bottom:5px;font-weight:400;font-size:20px}.weui_msg .weui_msg_desc{font-size:14px;color:#888}.weui_msg .weui_opr_area{margin-bottom:25px}.weui_msg .weui_extra_area{margin-bottom:15px;font-size:14px;color:#888}.weui_msg .weui_extra_area a{color:#61749B}@media screen and (min-height:438px){.weui_extra_area{position:fixed;left:0;bottom:0;width:100%;text-align:center}}.weui_article{padding:20px 15px;font-size:15px}.weui_article section{margin-bottom:1.5em}.weui_article h1{font-size:17px;font-weight:400;margin-bottom:.75em}.weui_article h2{font-size:16px;font-weight:400;margin-bottom:.3em}.weui_article h3{font-weight:400;font-size:15px}.weui_progress{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.weui_progress_bar{background-color:#EBEBEB;height:3px;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.weui_progress_inner_bar{width:0;height:100%;background-color:#09BB07}.weui_progress_opr{display:block;margin-left:15px;font-size:0}.weui_grids{position:relative;overflow:hidden}.weui_grids:after,.weui_grids:before{content:" ";position:absolute;color:#D9D9D9;top:0;left:0}.weui_grids:before{width:100%;height:1px;border-top:1px solid #D9D9D9;transform-origin:0 0;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_dialog_ft:after,.weui_grids:after{-webkit-transform-origin:0 0;-ms-transform-origin:0 0}.weui_grids:after{width:1px;height:100%;border-left:1px solid #D9D9D9;transform-origin:0 0;-webkit-transform:scaleX(.5);-ms-transform:scaleX(.5);transform:scaleX(.5)}.weui_grid{position:relative;float:left;padding:20px 10px;width:33.33333333%}.weui_grid:after,.weui_grid:before{content:" ";position:absolute;color:#D9D9D9}.weui_grid:before{top:0;width:1px;height:100%;border-right:1px solid #D9D9D9;transform-origin:0 100%;-webkit-transform:scaleX(.5);-ms-transform:scaleX(.5);transform:scaleX(.5);right:-1px}.weui_grid:after{left:0;bottom:0;width:100%;height:1px;border-bottom:1px solid #D9D9D9;-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_grid:active{background-color:#E4E4E4}.weui_grid_icon{width:28px;height:28px;margin:0 auto}.weui_grid_icon img{display:block;width:100%;height:100%}.weui_grid_icon+.weui_grid_label{margin-top:5px}.weui_grid_label{display:block;color:#000;font-size:14px}.weui_dialog{position:fixed;z-index:13;width:85%;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#FAFAFC;border-radius:3px}.weui_dialog_confirm .weui_dialog .weui_dialog_hd{padding:1.2em 20px .5em}.weui_dialog_confirm .weui_dialog .weui_dialog_bd{text-align:left}.weui_dialog_hd{padding:1.2em 0 .5em}.weui_dialog_title{font-weight:400;font-size:17px}.weui_dialog_bd{padding:0 20px;font-size:15px;color:#888}.weui_dialog_ft{position:relative;line-height:42px;margin-top:20px;font-size:17px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.weui_dialog_ft a{display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;color:#3CC51F}.weui_dialog_confirm .weui_dialog_ft a:after,.weui_dialog_ft:after{content:" ";left:0;top:0;color:#D5D5D6}.weui_dialog_ft a:active{background-color:#EEE}.weui_dialog_ft:after{position:absolute;width:100%;height:1px;border-top:1px solid #D5D5D6;transform-origin:0 0;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_dialog_confirm .weui_dialog_ft a{position:relative}.weui_dialog_confirm .weui_dialog_ft a:after{position:absolute;width:1px;height:100%;border-left:1px solid #D5D5D6;-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);-ms-transform:scaleX(.5);transform:scaleX(.5)}.weui_dialog_confirm .weui_dialog_ft a:first-child:after{display:none}.weui_btn_dialog.default{color:#353535}.weui_btn_dialog.primary{color:#0BB20C}@media screen and (min-width:1024px){.weui_dialog{width:35%}}.weui_toast{position:fixed;z-index:3;width:7.6em;min-height:7.6em;top:180px;left:50%;margin-left:-3.8em;background:rgba(40,40,40,.75);text-align:center;border-radius:5px;color:#FFF}.weui_icon_toast{margin:22px 0 0;display:block}.weui_icon_toast:before{content:'\EA08';color:#FFF;font-size:55px}.weui_toast_content{margin:0 0 15px}.weui_loading_toast .weui_toast_content{margin-top:64%;font-size:14px}.weui_loading{position:absolute;width:0;z-index:2000000000;left:50%;top:38%}.weui_loading_leaf{position:absolute;top:-1px;opacity:.25}.weui_loading_leaf:before{content:" ";position:absolute;width:8.14px;height:3.08px;background:#d1d1d5;box-shadow:rgba(0,0,0,.0980392) 0 0 1px;border-radius:1px;-webkit-transform-origin:left 50% 0;-ms-transform-origin:left 50% 0;transform-origin:left 50% 0}.weui_mask,.weui_mask_transition,.weui_mask_transparent{z-index:1;height:100%;position:fixed;left:0;top:0;width:100%}.weui_loading_leaf_0{-webkit-animation:opacity-60-25-0-12 1.25s linear infinite;animation:opacity-60-25-0-12 1.25s linear infinite}.weui_loading_leaf_0:before{-webkit-transform:rotate(0) translate(7.92px,0);-ms-transform:rotate(0) translate(7.92px,0);transform:rotate(0) translate(7.92px,0)}.weui_loading_leaf_1{-webkit-animation:opacity-60-25-1-12 1.25s linear infinite;animation:opacity-60-25-1-12 1.25s linear infinite}.weui_loading_leaf_1:before{-webkit-transform:rotate(30deg) translate(7.92px,0);-ms-transform:rotate(30deg) translate(7.92px,0);transform:rotate(30deg) translate(7.92px,0)}.weui_loading_leaf_2{-webkit-animation:opacity-60-25-2-12 1.25s linear infinite;animation:opacity-60-25-2-12 1.25s linear infinite}.weui_loading_leaf_2:before{-webkit-transform:rotate(60deg) translate(7.92px,0);-ms-transform:rotate(60deg) translate(7.92px,0);transform:rotate(60deg) translate(7.92px,0)}.weui_loading_leaf_3{-webkit-animation:opacity-60-25-3-12 1.25s linear infinite;animation:opacity-60-25-3-12 1.25s linear infinite}.weui_loading_leaf_3:before{-webkit-transform:rotate(90deg) translate(7.92px,0);-ms-transform:rotate(90deg) translate(7.92px,0);transform:rotate(90deg) translate(7.92px,0)}.weui_loading_leaf_4{-webkit-animation:opacity-60-25-4-12 1.25s linear infinite;animation:opacity-60-25-4-12 1.25s linear infinite}.weui_loading_leaf_4:before{-webkit-transform:rotate(120deg) translate(7.92px,0);-ms-transform:rotate(120deg) translate(7.92px,0);transform:rotate(120deg) translate(7.92px,0)}.weui_loading_leaf_5{-webkit-animation:opacity-60-25-5-12 1.25s linear infinite;animation:opacity-60-25-5-12 1.25s linear infinite}.weui_loading_leaf_5:before{-webkit-transform:rotate(150deg) translate(7.92px,0);-ms-transform:rotate(150deg) translate(7.92px,0);transform:rotate(150deg) translate(7.92px,0)}.weui_loading_leaf_6{-webkit-animation:opacity-60-25-6-12 1.25s linear infinite;animation:opacity-60-25-6-12 1.25s linear infinite}.weui_loading_leaf_6:before{-webkit-transform:rotate(180deg) translate(7.92px,0);-ms-transform:rotate(180deg) translate(7.92px,0);transform:rotate(180deg) translate(7.92px,0)}.weui_loading_leaf_7{-webkit-animation:opacity-60-25-7-12 1.25s linear infinite;animation:opacity-60-25-7-12 1.25s linear infinite}.weui_loading_leaf_7:before{-webkit-transform:rotate(210deg) translate(7.92px,0);-ms-transform:rotate(210deg) translate(7.92px,0);transform:rotate(210deg) translate(7.92px,0)}.weui_loading_leaf_8{-webkit-animation:opacity-60-25-8-12 1.25s linear infinite;animation:opacity-60-25-8-12 1.25s linear infinite}.weui_loading_leaf_8:before{-webkit-transform:rotate(240deg) translate(7.92px,0);-ms-transform:rotate(240deg) translate(7.92px,0);transform:rotate(240deg) translate(7.92px,0)}.weui_loading_leaf_9{-webkit-animation:opacity-60-25-9-12 1.25s linear infinite;animation:opacity-60-25-9-12 1.25s linear infinite}.weui_loading_leaf_9:before{-webkit-transform:rotate(270deg) translate(7.92px,0);-ms-transform:rotate(270deg) translate(7.92px,0);transform:rotate(270deg) translate(7.92px,0)}.weui_loading_leaf_10{-webkit-animation:opacity-60-25-10-12 1.25s linear infinite;animation:opacity-60-25-10-12 1.25s linear infinite}.weui_loading_leaf_10:before{-webkit-transform:rotate(300deg) translate(7.92px,0);-ms-transform:rotate(300deg) translate(7.92px,0);transform:rotate(300deg) translate(7.92px,0)}.weui_loading_leaf_11{-webkit-animation:opacity-60-25-11-12 1.25s linear infinite;animation:opacity-60-25-11-12 1.25s linear infinite}.weui_loading_leaf_11:before{-webkit-transform:rotate(330deg) translate(7.92px,0);-ms-transform:rotate(330deg) translate(7.92px,0);transform:rotate(330deg) translate(7.92px,0)}@-webkit-keyframes opacity-60-25-0-12{0%,0.01%{opacity:.25}0.02%{opacity:1}100%,60.01%{opacity:.25}}@-webkit-keyframes opacity-60-25-1-12{0%,8.34333%{opacity:.25}8.35333%{opacity:1}100%,68.3433%{opacity:.25}}@-webkit-keyframes opacity-60-25-2-12{0%,16.6767%{opacity:.25}16.6867%{opacity:1}100%,76.6767%{opacity:.25}}@-webkit-keyframes opacity-60-25-3-12{0%,25.01%{opacity:.25}25.02%{opacity:1}100%,85.01%{opacity:.25}}@-webkit-keyframes opacity-60-25-4-12{0%,33.3433%{opacity:.25}33.3533%{opacity:1}100%,93.3433%{opacity:.25}}@-webkit-keyframes opacity-60-25-5-12{0%{opacity:.270958333333333}41.6767%{opacity:.25}41.6867%{opacity:1}1.67667%{opacity:.25}100%{opacity:.270958333333333}}@-webkit-keyframes opacity-60-25-6-12{0%{opacity:.375125}50.01%{opacity:.25}50.02%{opacity:1}10.01%{opacity:.25}100%{opacity:.375125}}@-webkit-keyframes opacity-60-25-7-12{0%{opacity:.479291666666667}58.3433%{opacity:.25}58.3533%{opacity:1}18.3433%{opacity:.25}100%{opacity:.479291666666667}}@-webkit-keyframes opacity-60-25-8-12{0%{opacity:.583458333333333}66.6767%{opacity:.25}66.6867%{opacity:1}26.6767%{opacity:.25}100%{opacity:.583458333333333}}@-webkit-keyframes opacity-60-25-9-12{0%{opacity:.687625}75.01%{opacity:.25}75.02%{opacity:1}35.01%{opacity:.25}100%{opacity:.687625}}@-webkit-keyframes opacity-60-25-10-12{0%{opacity:.791791666666667}83.3433%{opacity:.25}83.3533%{opacity:1}43.3433%{opacity:.25}100%{opacity:.791791666666667}}@-webkit-keyframes opacity-60-25-11-12{0%{opacity:.895958333333333}91.6767%{opacity:.25}91.6867%{opacity:1}51.6767%{opacity:.25}100%{opacity:.895958333333333}}.weui_mask{background:rgba(0,0,0,.6)}.weui_mask_transition{display:none;background:0 0;-webkit-transition:background .3s;transition:background .3s}.weui_fade_toggle{background:rgba(0,0,0,.6)}.weui_actionsheet{position:fixed;left:0;bottom:0;-webkit-transform:translate(0,100%);-ms-transform:translate(0,100%);transform:translate(0,100%);-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:2;width:100%;background-color:#EFEFF4;-webkit-transition:-webkit-transform .3s;transition:transform .3s}.weui_actionsheet_menu{background-color:#FFF}.weui_actionsheet_action{margin-top:6px;background-color:#FFF}.weui_actionsheet_cell{position:relative;padding:10px 0;text-align:center;font-size:18px}.weui_actionsheet_cell:before{content:" ";position:absolute;left:0;top:0;width:100%;height:1px;border-top:1px solid #D9D9D9;color:#D9D9D9;-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_actionsheet_cell:active{background-color:#ECECEC}.weui_actionsheet_cell:first-child:before{display:none}.weui_actionsheet_toggle{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}
\ No newline at end of file
+ */.weui_input,.weui_select,.weui_switch{-webkit-appearance:none}.weui_btn,.weui_btn:after,.weui_grid,.weui_switch{box-sizing:border-box}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{line-height:1.6;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}*{margin:0;padding:0}a img{border:0}a{text-decoration:none}@font-face{font-weight:400;font-style:normal;font-family:weui;src:url(data:application/octet-stream;base64,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) format('truetype'),url(data:application/octet-stream;base64,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) format('woff'),url(data:application/octet-stream;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxtZXRhZGF0YT5Db3B5cmlnaHQgKEMpIDIwMTUgYnkgb3JpZ2luYWwgYXV0aG9ycyBAIGZvbnRlbGxvLmNvbTwvbWV0YWRhdGE+CjxkZWZzPgo8Zm9udCBpZD0id2V1aSIgaG9yaXotYWR2LXg9IjEwMDAiID4KPGZvbnQtZmFjZSBmb250LWZhbWlseT0id2V1aSIgZm9udC13ZWlnaHQ9IjQwMCIgZm9udC1zdHJldGNoPSJub3JtYWwiIHVuaXRzLXBlci1lbT0iMTAwMCIgYXNjZW50PSI4NTAiIGRlc2NlbnQ9Ii0xNTAiIC8+CjxtaXNzaW5nLWdseXBoIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0iY2lyY2xlIiB1bmljb2RlPSImI3hlYTAxOyIgZD0ibTUwMSA3OTFjLTI0NCAwLTQ0Mi0xOTgtNDQyLTQ0MiAwLTI0MyAxOTgtNDQxIDQ0Mi00NDFzNDQxIDE5NyA0NDEgNDQxYzAgMjQ0LTE5OCA0NDItNDQxIDQ0MnogbTAtODQ5Yy0yMjMgMC00MDQgMTgwLTQwNCA0MDMgMCAyMjMgMTgxIDQwMyA0MDQgNDAzIDIyMiAwIDQwMy0xODAgNDAzLTQwMyAwLTIyMy0xODEtNDAzLTQwMy00MDN6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPGdseXBoIGdseXBoLW5hbWU9ImRvd25sb2FkIiB1bmljb2RlPSImI3hlYTAyOyIgZD0ibTQ5NSA3OTdjLTI0MiAwLTQ0Mi0yMDAtNDQyLTQ1MiAwLTI0MiAyMDAtNDQyIDQ0Mi00NDIgMjUyIDAgNDUyIDIwMCA0NTIgNDQyIDAgMjUyLTIwMCA0NTItNDUyIDQ1MnogbTE1Ny01MjhsLTExOC0xNTRjLTE5LTI0LTQ5LTI0LTY4IDBsLTExOCAxNTRjLTE5IDI0LTkgNDQgMjIgNDRoOTN2Mjc5YzAgMTAgOCAxOSAxOCAxOWgzOGMxMCAwIDE4LTkgMTgtMTl2LTI3OWg5M2MzMSAwIDQxLTIwIDIyLTQ0eiIgaG9yaXotYWR2LXg9IjEwMDAiIC8+CjxnbHlwaCBnbHlwaC1uYW1lPSJpbmZvIiB1bmljb2RlPSImI3hlYTAzOyIgZD0ibTQ5NiA3ODljLTIzOCAwLTQzNS0xOTctNDM1LTQ0NSAwLTIzOCAxOTctNDM1IDQzNS00MzUgMjQ4IDAgNDQ1IDE5NyA0NDUgNDM1IDAgMjQ4LTE5NyA0NDUtNDQ1IDQ0NXogbTM2LTY1NmMwLTktOC0xNy0xNy0xN2gtMjhjLTkgMC0xNyA4LTE3IDE3djI4MmMwIDUgNCA5IDkgOWg0NGM1IDAgOS00IDktOXYtMjgyeiBtLTMxIDMzOWMtMjQgMC00NCAyMC00NCA0NHMyMCA0NCA0NCA0NGMyNCAwIDQ0LTE5IDQ0LTQ0cy0yMC00NC00NC00NHoiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0ic2FmZV9zdWNjZXNzIiB1bmljb2RlPSImI3hlYTA0OyIgZD0ibTUwMCA4MTJjLTE3My0zOS0yOTktODItNDEzLTExOSAwLTEyMCAwLTIxNiAwLTMxNyAwLTI4MyAyMzEtNDM5IDQxMy00ODggMTgyIDQ5IDQxMyAyMDUgNDEzIDQ4OCAwIDEwMSAwIDE5NyAwIDMxNy0xMTQgMzctMjQwIDgwLTQxMyAxMTl6IG0yNTItMzIxbC0zMjItMzE2Yy0yLTItNS0yLTcgMGwtMTQ4IDE1M2MtMiAyLTIgNS0xIDhsMjEgMjdjMSAyIDQgMyA3IDFsMTIxLTkzYzItMSA1LTEgNyAwbDI5NSAyNDZjMiAyIDUgMiA3IDBsMjAtMTljMS0yIDEtNSAwLTd6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPGdseXBoIGdseXBoLW5hbWU9InNhZmVfd2FybiIgdW5pY29kZT0iJiN4ZWEwNTsiIGQ9Im01MDEgNzk0Yy0xNjYtMzgtMjg3LTgwLTM5Ny0xMTQgMC0xMTYgMC0yMDggMC0zMDUgMC0yNzIgMjIzLTQyMiAzOTctNDY5IDE3NCA0NyAzOTcgMTk3IDM5NyA0NjkgMCA5NyAwIDE4OSAwIDMwNS0xMTAgMzQtMjMxIDc2LTM5NyAxMTR6IG0tMjMtMjc2aDQ2YzYgMCAxMC00IDktOWwtMTAtMjE2YzAtMy0yLTUtNS01aC0zNGMtMyAwLTUgMi01IDVsLTEwIDIxNmMwIDUgNCA5IDkgOXogbTIzLTMzNmMtMTggMC0zMyAxNS0zMyAzM3MxNSAzMyAzMyAzMyAzMy0xNSAzMy0zMy0xNS0zMy0zMy0zM3oiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0ic3VjY2VzcyIgdW5pY29kZT0iJiN4ZWEwNjsiIGQ9Im0yODggMzA1Yy03IDgtOCAyMi0yIDMwbDMgNGM3IDkgMTkgMTEgMjggNGw5OC03NWM5LTcgMjMtNyAzMSAwbDI3NiAyMjljOCA3IDIxIDcgMjktMWwtMiAyYzgtOCA4LTIwIDAtMjhsLTMwNC0yOTljLTctOC0yMC03LTI4IDFsLTEyOSAxMzN6IG02NjkgMzljMCAyNTgtMjA1IDQ2My00NjMgNDYzLTI0NiAwLTQ1MS0yMDUtNDUxLTQ2MyAwLTI0NiAyMDUtNDUxIDQ1MS00NTEgMjU4IDAgNDYzIDIwNSA0NjMgNDUxeiIgaG9yaXotYWR2LXg9IjEwMDAiIC8+CjxnbHlwaCBnbHlwaC1uYW1lPSJzdWNjZXNzX2NpcmNsZSIgdW5pY29kZT0iJiN4ZWEwNzsiIGQ9Im01MDEgNzkxYy0yNDQgMC00NDItMTk4LTQ0Mi00NDIgMC0yNDMgMTk4LTQ0MSA0NDItNDQxczQ0MSAxOTcgNDQxIDQ0MWMwIDI0NC0xOTggNDQyLTQ0MSA0NDJ6IG0wLTg0OWMtMjIzIDAtNDA0IDE4MC00MDQgNDAzIDAgMjIzIDE4MSA0MDMgNDA0IDQwMyAyMjIgMCA0MDMtMTgwIDQwMy00MDMgMC0yMjMtMTgxLTQwMy00MDMtNDAzeiBtMjE0IDU1MGwtMjY2LTIyMWMtOC03LTIyLTctMzAtMWwtOTYgNzNjLTggNy0yMCA1LTI2LTNsLTMtNGMtNi05LTUtMjIgMi0zMGwxMjUtMTI4YzctOCAxOS04IDI3LTFsMjkzIDI4OWM3IDcgOCAxOCAxIDI2LTggNy0yMCA3LTI3IDB6IG0yNiAxYzAgMCAxLTEgMS0xIDAgMCAxLTEgMS0xbC0yIDJ6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPGdseXBoIGdseXBoLW5hbWU9InN1Y2Nlc3Nfbm9fY2lyY2xlIiB1bmljb2RlPSImI3hlYTA4OyIgZD0ibTYxIDI4NWMtMTQgMTQtMTggNDAtOSA1OGw2IDExYzggMTggMjggMjMgNDQgMTFsMjAzLTE0N2MxNi0xMSA0MS0xMSA1NiAybDU0MSA0NDZjMTUgMTIgMzkgMTEgNTMtM2wtMTMgMTNjMTQtMTQgMTQtMzcgMC01MWwtNTgzLTU5MWMtMTQtMTQtMzYtMTQtNTAtMWwtMjQ4IDI1MnoiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0id2FpdGluZyIgdW5pY29kZT0iJiN4ZWEwOTsiIGQ9Im00OTQgODAyYy0yNDQgMC00NDYtMjAyLTQ0Ni00NTggMC0yNDQgMjAyLTQ0NiA0NDYtNDQ2IDI1NiAwIDQ1OCAyMDIgNDU4IDQ0NiAwIDI1Ni0yMDIgNDU4LTQ1OCA0NTh6IG0yNTUtNTUxaC0yOTR2MzM0aDQ1di0yODloMjQ5di00NXoiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0id2FpdGluZ19jaXJjbGUiIHVuaWNvZGU9IiYjeGVhMGE7IiBkPSJtNzQxIDQ5M2MwIDAgMS0xIDEtMSAwIDAgMS0xIDEtMWwtMiAyeiBtLTI0MCAyOThjLTI0NCAwLTQ0Mi0xOTgtNDQyLTQ0MiAwLTI0MyAxOTgtNDQxIDQ0Mi00NDFzNDQxIDE5NyA0NDEgNDQxYzAgMjQ0LTE5OCA0NDItNDQxIDQ0MnogbTAtODQ5Yy0yMjMgMC00MDQgMTgwLTQwNCA0MDMgMCAyMjMgMTgxIDQwMyA0MDQgNDAzIDIyMiAwIDQwMy0xODAgNDAzLTQwMyAwLTIyMy0xODEtNDAzLTQwMy00MDN6IG0tNDYgNTYxaC0zNnYtMjUzaDI1M3YzNmgtMjE3eiIgaG9yaXotYWR2LXg9IjEwMDAiIC8+CjxnbHlwaCBnbHlwaC1uYW1lPSJ3YXJuIiB1bmljb2RlPSImI3hlYTBiOyIgZD0ibTQ5NCA4MTNjLTI1MCAwLTQ1Ny0yMDctNDU3LTQ2OSAwLTI1MCAyMDctNDU3IDQ1Ny00NTcgMjYyIDAgNDY5IDIwNyA0NjkgNDU3IDAgMjYyLTIwNyA0NjktNDY5IDQ2OXogbS0yMS0yMzZoNTRjMTAgMCAxOC04IDE4LTE4bC0xNC0zMDFjMC01LTUtMTAtMTAtMTBoLTQyYy01IDAtOSA1LTEwIDEwbC0xMyAzMDBjLTEgMTAgNyAxOSAxNyAxOXogbTI3LTQ3MmMtMjUgMC00NSAyMC00NSA0NSAwIDI1IDIwIDQ2IDQ1IDQ2IDI1IDAgNDUtMjEgNDUtNDYgMC0yNS0yMC00NS00NS00NXoiIGhvcml6LWFkdi14PSIxMDAwIiAvPgo8Z2x5cGggZ2x5cGgtbmFtZT0iaW5mb19jaXJjbGUiIHVuaWNvZGU9IiYjeGVhMGM7IiBkPSJtNTAwIDUyMmMzMiAwIDU3IDI2IDU3IDU4IDAgMzEtMjUgNTctNTcgNTctMzIgMC01Ny0yNi01Ny01NyAwLTMyIDI1LTU4IDU3LTU4eiBtNTctNTdoLTE0M3YtMjloNTd2LTMxNmgtNTd2LTI4aDIwMXYyOGgtNTh2MzQ1eiBtLTQzIDM0NGMtMjY4IDAtNDczLTIwNS00NzMtNDczIDAtMjQwIDIwNS00NDUgNDczLTQ0NSAyNDAgMCA0NDUgMjA1IDQ0NSA0NDUgMCAyNjgtMjA1IDQ3My00NDUgNDczeiBtLTE0LTg2MWMtMjIyIDAtNDAyIDE4MC00MDIgNDAyIDAgMjIyIDE4MCA0MDIgNDAyIDQwMiAyMjIgMCA0MDItMTgwIDQwMi00MDIgMC0yMjItMTgwLTQwMi00MDItNDAyeiIgaG9yaXotYWR2LXg9IjEwMDAiIC8+CjxnbHlwaCBnbHlwaC1uYW1lPSJjYW5jZWwiIHVuaWNvZGU9IiYjeGVhMGQ7IiBkPSJtNjU0IDUzMmwtMTU0LTE1NC0xNTQgMTU0LTI4LTI4IDE1NC0xNTQtMTU0LTE1NCAyOC0yOCAxNTQgMTU0IDE1NC0xNTQgMjggMjgtMTU0IDE1NCAxNTQgMTU0eiBtLTE1NCAyNTNjLTI0MCAwLTQzNS0xOTUtNDM1LTQzNSAwLTI0MCAxOTUtNDM1IDQzNS00MzUgMjQwIDAgNDM1IDE5NSA0MzUgNDM1IDAgMjQwLTE5NSA0MzUtNDM1IDQzNXogbTAtODMxYy0yMTggMC0zOTUgMTc4LTM5NSAzOTYgMCAyMTggMTc3IDM5NiAzOTUgMzk2IDIxOCAwIDM5Ni0xNzggMzk2LTM5NiAwLTIxOC0xNzgtMzk2LTM5Ni0zOTZ6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPGdseXBoIGdseXBoLW5hbWU9InNlYXJjaCIgdW5pY29kZT0iJiN4ZWEwZTsiIGQ9Im02NTMgMTQwYy02OS01Ni0xNTctOTAtMjUzLTkwLTIyMSAwLTQwMCAxNzktNDAwIDQwMHMxNzkgNDAwIDQwMCA0MDAgNDAwLTE3OSA0MDAtNDAwYzAtOTYtMzQtMTg0LTkwLTI1M2wyOTAtMjkxLTU2LTU2LTI5MSAyOTB6IG0tMjUzLTEwYzE3NyAwIDMyMCAxNDMgMzIwIDMyMHMtMTQzIDMyMC0zMjAgMzIwLTMyMC0xNDMtMzIwLTMyMCAxNDMtMzIwIDMyMC0zMjB6IiBob3Jpei1hZHYteD0iMTAwMCIgLz4KPC9mb250Pgo8L2RlZnM+Cjwvc3ZnPg==) format('svg')}[class*=" weui_icon_"]:before,[class^=weui_icon_]:before{font-family:weui;font-style:normal;font-weight:400;speak:none;display:inline-block;vertical-align:middle;text-decoration:inherit;width:1em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin:0}.weui_btn,.weui_dialog_ft a{text-decoration:none;-webkit-tap-highlight-color:transparent}.weui_icon_circle:before{content:"\EA01"}.weui_icon_download:before{content:"\EA02"}.weui_icon_info:before{content:"\EA03"}.weui_icon_safe_success:before{content:"\EA04"}.weui_icon_safe_warn:before{content:"\EA05"}.weui_icon_success:before{content:"\EA06";font-size:23px;color:#09BB07}.weui_icon_success_circle:before{content:"\EA07"}.weui_icon_success_no_circle:before{content:"\EA08"}.weui_icon_waiting:before{content:"\EA09";font-size:23px;color:#10AEFF}.weui_icon_waiting_circle:before{content:"\EA0A"}.weui_icon_warn:before{content:"\EA0B";font-size:23px;color:#F43530}.weui_icon_info_circle:before{content:"\EA0C"}.weui_icon_cancel:before{content:"\EA0D"}.weui_icon_info:before{font-size:23px;color:#10AEFF}.weui_icon_success_circle:before,.weui_icon_success_no_circle:before{font-size:23px;color:#09BB07}.weui_icon_waiting_circle:before{font-size:23px;color:#10AEFF}.weui_icon_circle:before{font-size:23px;color:#C9C9C9}.weui_icon_download:before,.weui_icon_info_circle:before{font-size:23px;color:#09BB07}.weui_icon_safe_success:before{color:#09BB07}.weui_icon_safe_warn:before{color:#FFBE00}.weui_icon_cancel:before{color:#F43530;font-size:22px}.weui_icon_search:before{content:"\EA0E";color:#B2B2B2;font-size:14px}.weui_icon_msg:before,.weui_icon_safe:before{font-size:104px}.weui_icon_warn.weui_icon_msg:before{color:#F76260}.weui_btn.weui_btn_mini{line-height:1.9;font-size:14px;padding:0 .75em;display:inline-block}button.weui_btn,input.weui_btn{width:100%;border-width:0;outline:0;-webkit-appearance:none}button.weui_btn:focus,input.weui_btn:focus{outline:0}button.weui_btn_inline,button.weui_btn_mini,input.weui_btn_inline,input.weui_btn_mini{width:auto}.weui_btn+.weui_btn{margin-top:15px}.weui_btn.weui_btn_inline+.weui_btn.weui_btn_inline{margin-top:auto;margin-left:15px}.weui_btn_area{margin:1.17647059em 15px .3em}.weui_btn_area.weui_btn_area_inline{-webkit-display:-webkit-box;-webkit-display:-webkit-flex;display:-webkit-box;display:-ms-flexbox;display:flex}.weui_btn_area.weui_btn_area_inline .weui_btn{margin-top:auto;margin-right:15px;width:100%;-webkit-flex:1;-webkit-box-flex:1;-ms-flex:1;flex:1}.weui_btn_area.weui_btn_area_inline .weui_btn:last-child{margin-right:0}.weui_btn{position:relative;display:block;margin-left:auto;margin-right:auto;padding-left:14px;padding-right:14px;font-size:18px;text-align:center;color:#FFF;line-height:2.33333333;border-radius:5px;overflow:hidden}.weui_btn:after,.weui_cell:before{content:" ";position:absolute}.weui_btn:after{width:200%;height:200%;top:0;left:0;border:1px solid rgba(0,0,0,.2);-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;border-radius:10px}.weui_btn.weui_btn_inline{display:inline-block}.weui_btn_default{background-color:#F7F7F7;color:#454545}.weui_btn_default:not(.weui_btn_disabled):visited{color:#454545}.weui_btn_default:not(.weui_btn_disabled):active{color:#A1A1A1;background-color:#DEDEDE}.weui_btn_primary{background-color:#04BE02}.weui_btn_primary:not(.weui_btn_disabled):visited{color:#FFF}.weui_btn_primary:not(.weui_btn_disabled):active{color:rgba(255,255,255,.4);background-color:#039702}.weui_btn_warn{background-color:#EF4F4F}.weui_btn_warn:not(.weui_btn_disabled):visited{color:#FFF}.weui_btn_warn:not(.weui_btn_disabled):active{color:rgba(255,255,255,.4);background-color:#C13E3E}.weui_btn_disabled{color:rgba(255,255,255,.6)}.weui_btn_disabled.weui_btn_default{color:#C9C9C9}.weui_btn_plain_primary{color:#04BE02;border:1px solid #04BE02}button.weui_btn_plain_primary,input.weui_btn_plain_primary{border-width:1px;background-color:transparent}.weui_btn_plain_primary:active{border-color:#039702}.weui_btn_plain_primary:after{border-width:0}.weui_btn_plain_default{color:#5A5A5A;border:1px solid #5A5A5A}button.weui_btn_plain_default,input.weui_btn_plain_default{border-width:1px;background-color:transparent}.weui_btn_plain_default:after{border-width:0}.weui_cell:before,.weui_cells:before{top:0;border-top:1px solid #D9D9D9;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5)}.weui_cell:before{width:100%;height:1px;color:#D9D9D9;-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;transform:scaleY(.5);left:15px}.weui_cells:before,.weui_grids:before{-webkit-transform-origin:0 0;-ms-transform-origin:0 0}.weui_cell:first-child:before{display:none}.weui_cells{margin-top:1.17647059em;background-color:#FFF;line-height:1.41176471;font-size:17px;overflow:hidden;position:relative}.weui_cells_access .weui_cell:not(.no_access):active,.weui_cells_checkbox .weui_cell:active,.weui_cells_radio .weui_cell:active{background-color:#ECECEC}.weui_cells_tips,.weui_cells_title{padding-left:15px;padding-right:15px;font-size:14px}.weui_cells:after,.weui_cells:before{position:absolute;left:0;width:100%;height:1px;color:#D9D9D9;content:" "}.weui_cells:before{transform-origin:0 0;transform:scaleY(.5)}.weui_cells:after{bottom:0;border-bottom:1px solid #D9D9D9;-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_cells_title{margin-top:.77em;margin-bottom:.3em;color:#888}.weui_cells_title+.weui_cells{margin-top:0}.weui_cells_tips{margin-top:.3em;color:#888}.weui_cell{padding:10px 15px;position:relative;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.weui_cell_ft{text-align:right;color:#888}.weui_cell_primary{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.weui_cells_access .weui_cell:not(.no_access){-webkit-tap-highlight-color:transparent}.weui_cells_access a.weui_cell{color:inherit}.weui_cells_access .weui_cell_ft:after{content:" ";display:inline-block;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);height:6px;width:6px;border-width:2px 2px 0 0;border-color:#C8C8CD;border-style:solid;position:relative;top:-2px;top:-1px;margin-left:.3em}.weui_check_label{-webkit-tap-highlight-color:transparent}.weui_check{position:absolute;left:-9999em}.weui_cells_radio .weui_cell_ft{padding-left:.35em}.weui_cells_radio .weui_check:checked+.weui_icon_checked:before{content:'\EA08';color:#09BB07;font-size:16px}.weui_cells_checkbox .weui_cell_hd{padding-right:.35em}.weui_cells_checkbox .weui_icon_checked:before{content:'\EA01';color:#C9C9C9;font-size:23px;display:block}.weui_cells_checkbox .weui_check:checked+.weui_icon_checked:before{content:'\EA06';color:#09BB07}.weui_input,.weui_textarea{border:0;color:inherit;outline:0}.weui_label{display:block;width:3em}.weui_input{width:100%;background-color:transparent;font-size:inherit;height:1.41176471em;line-height:1.41176471}.weui_input::-webkit-inner-spin-button,.weui_input::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.weui_textarea{display:block;resize:none;width:100%;font-size:1em;line-height:inherit}.weui_textarea_counter{color:#B2B2B2;text-align:right}.weui_dialog,.weui_grid_label,.weui_msg,.weui_toptips{text-align:center}.weui_cell_warn .weui_textarea_counter{color:#E64340}.weui_toptips{display:none;position:fixed;-webkit-transform:translateZ(0);width:100%;top:0;line-height:2.3;font-size:14px;color:#FFF;z-index:2}.weui_toptips.weui_warn{background-color:#E64340}.weui_cells_form .weui_cell_warn{color:#E64340}.weui_cells_form .weui_cell_warn .weui_icon_warn{display:inline-block}.weui_cells_form .weui_cell_hd{padding-right:.3em}.weui_cells_form .weui_cell_ft{font-size:0}.weui_cells_form .weui_icon_warn{display:none}.weui_cell_select .weui_cell_bd:after,.weui_select_before .weui_cell_hd:before{content:" ";display:inline-block;margin-top:-3px}.weui_cell_select{padding:0}.weui_select,.weui_select_after,.weui_select_before .weui_cell_bd{padding-left:15px}.weui_cell_select .weui_select{padding-right:30px}.weui_cell_select .weui_cell_bd:after{-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);height:6px;width:6px;border-width:2px 2px 0 0;border-color:#C8C8CD;border-style:solid;position:absolute;top:50%;right:15px}.weui_grid:before,.weui_select_before .weui_cell_hd:after{-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%}.weui_select,.weui_select_before .weui_cell_hd{position:relative}.weui_select{border:0;outline:0;background-color:transparent;width:100%;font-size:inherit;height:44px;z-index:1}.weui_select_before{padding-right:15px}.weui_select_before .weui_select{width:auto}.weui_select_before .weui_cell_hd:after{content:" ";position:absolute;right:0;top:0;width:1px;height:100%;border-right:1px solid #D9D9D9;color:#D9D9D9;transform-origin:0 100%;-webkit-transform:scaleX(.5);-ms-transform:scaleX(.5);transform:scaleX(.5)}.weui_select_before .weui_cell_hd:before{-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);height:6px;width:6px;border-width:2px 2px 0 0;border-color:#C8C8CD;border-style:solid;position:absolute;top:50%;right:15px}.weui_select_before .weui_cell_bd:after{display:none}.weui_vcode{padding-top:0;padding-right:0;padding-bottom:0}.weui_vcode .weui_cell_ft img{margin-left:5px;height:44px;vertical-align:middle}.weui_cell_switch{padding-top:6px;padding-bottom:6px}.weui_switch{-moz-appearance:none;appearance:none;position:relative;width:52px;height:32px;border:1px solid #DFDFDF;outline:0;border-radius:16px;background:#DFDFDF}.weui_switch:after,.weui_switch:before{position:absolute;height:30px;border-radius:15px;top:0;left:0;content:" "}.weui_switch:before{width:50px;background-color:#FDFDFD;-webkit-transition:-webkit-transform .3s;transition:transform .3s}.weui_switch:after{width:30px;background-color:#FFF;box-shadow:0 1px 3px rgba(0,0,0,.4);-webkit-transition:-webkit-transform .3s;transition:transform .3s}.weui_switch:checked{border-color:#04BE02;background-color:#04BE02}.weui_switch:checked:before{-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0)}.weui_switch:checked:after{-webkit-transform:translateX(20px);-ms-transform:translateX(20px);transform:translateX(20px)}.weui_uploader_hd{padding-top:0;padding-right:0;padding-left:0}.weui_uploader_hd .weui_cell_ft{font-size:1em}.weui_uploader_bd{margin-bottom:-4px;margin-right:-9px;overflow:hidden}.weui_uploader_file,.weui_uploader_input_wrp{margin-right:9px;margin-bottom:9px;float:left}.weui_uploader_files{list-style:none}.weui_uploader_file{width:79px;height:79px;background:center center no-repeat;background-size:cover}.weui_uploader_status{position:relative}.weui_uploader_status:before{content:" ";position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.5)}.weui_uploader_status .weui_uploader_status_content{position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);color:#FFF}.weui_uploader_status .weui_icon_warn{display:block}.weui_uploader_input_wrp{position:relative;width:77px;height:77px;border:1px solid #D9D9D9}.weui_uploader_input_wrp:after,.weui_uploader_input_wrp:before{content:" ";position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#D9D9D9}.weui_uploader_input_wrp:before{width:2px;height:39.5px}.weui_uploader_input_wrp:after{width:39.5px;height:2px}.weui_uploader_input_wrp:active{border-color:#999}.weui_uploader_input_wrp:active:after,.weui_uploader_input_wrp:active:before{background-color:#999}.weui_uploader_input{position:absolute;z-index:1;top:0;left:0;width:100%;height:100%;opacity:0;-webkit-tap-highlight-color:transparent}.weui_msg{padding-top:36px}.weui_msg .weui_icon_area{margin-bottom:30px}.weui_msg .weui_text_area{margin-bottom:25px;padding:0 20px}.weui_msg .weui_msg_title{margin-bottom:5px;font-weight:400;font-size:20px}.weui_msg .weui_msg_desc{font-size:14px;color:#888}.weui_msg .weui_opr_area{margin-bottom:25px}.weui_msg .weui_extra_area{margin-bottom:15px;font-size:14px;color:#888}.weui_msg .weui_extra_area a{color:#61749B}@media screen and (min-height:438px){.weui_extra_area{position:fixed;left:0;bottom:0;width:100%;text-align:center}}.weui_article{padding:20px 15px;font-size:15px}.weui_article section{margin-bottom:1.5em}.weui_article h1{font-size:17px;font-weight:400;margin-bottom:.75em}.weui_article h2{font-size:16px;font-weight:400;margin-bottom:.3em}.weui_article h3{font-weight:400;font-size:15px}.weui_progress{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.weui_progress_bar{background-color:#EBEBEB;height:3px;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.weui_progress_inner_bar{width:0;height:100%;background-color:#09BB07}.weui_progress_opr{display:block;margin-left:15px;font-size:0}.weui_grids{position:relative;overflow:hidden}.weui_grids:after,.weui_grids:before{content:" ";position:absolute;color:#D9D9D9;top:0;left:0}.weui_grids:before{width:100%;height:1px;border-top:1px solid #D9D9D9;transform-origin:0 0;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_dialog_ft:after,.weui_grids:after{-webkit-transform-origin:0 0;-ms-transform-origin:0 0}.weui_grids:after{width:1px;height:100%;border-left:1px solid #D9D9D9;transform-origin:0 0;-webkit-transform:scaleX(.5);-ms-transform:scaleX(.5);transform:scaleX(.5)}.weui_grid{position:relative;float:left;padding:20px 10px;width:33.33333333%}.weui_grid:after,.weui_grid:before{content:" ";position:absolute;color:#D9D9D9}.weui_grid:before{top:0;width:1px;height:100%;border-right:1px solid #D9D9D9;transform-origin:0 100%;-webkit-transform:scaleX(.5);-ms-transform:scaleX(.5);transform:scaleX(.5);right:-1px}.weui_grid:after{left:0;bottom:0;width:100%;height:1px;border-bottom:1px solid #D9D9D9;-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_grid:active{background-color:#E4E4E4}.weui_grid_icon{width:28px;height:28px;margin:0 auto}.weui_grid_icon img{display:block;width:100%;height:100%}.weui_grid_icon+.weui_grid_label{margin-top:5px}.weui_grid_label{display:block;color:#000;font-size:14px}.weui_dialog{position:fixed;z-index:13;width:85%;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#FAFAFC;border-radius:3px}.weui_dialog_confirm .weui_dialog .weui_dialog_hd{padding:1.2em 20px .5em}.weui_dialog_confirm .weui_dialog .weui_dialog_bd{text-align:center}.weui_dialog_hd{padding:1.2em 0 .5em}.weui_dialog_title{font-weight:400;font-size:17px}.weui_dialog_bd{padding:0 20px;font-size:15px;color:#888}.weui_dialog_ft{position:relative;line-height:42px;margin-top:20px;font-size:17px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.weui_dialog_ft a{display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;color:#3CC51F}.weui_dialog_confirm .weui_dialog_ft a:after,.weui_dialog_ft:after{content:" ";left:0;top:0;color:#D5D5D6}.weui_dialog_ft a:active{background-color:#EEE}.weui_dialog_ft:after{position:absolute;width:100%;height:1px;border-top:1px solid #D5D5D6;transform-origin:0 0;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_dialog_confirm .weui_dialog_ft a{position:relative}.weui_dialog_confirm .weui_dialog_ft a:after{position:absolute;width:1px;height:100%;border-left:1px solid #D5D5D6;-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);-ms-transform:scaleX(.5);transform:scaleX(.5)}.weui_dialog_confirm .weui_dialog_ft a:first-child:after{display:none}.weui_btn_dialog.default{color:#353535}.weui_btn_dialog.primary{color:#0BB20C}@media screen and (min-width:1024px){.weui_dialog{width:35%}}.weui_toast{position:fixed;z-index:3;width:7.6em;min-height:7.6em;top:180px;left:50%;margin-left:-3.8em;background:rgba(40,40,40,.75);text-align:center;border-radius:5px;color:#FFF}.weui_icon_toast{margin:22px 0 0;display:block}.weui_icon_toast:before{content:'\EA08';color:#FFF;font-size:55px}.weui_toast_content{margin:0 0 15px}.weui_loading_toast .weui_toast_content{margin-top:64%;font-size:14px}.weui_loading{position:absolute;width:0;z-index:2000000000;left:50%;top:38%}.weui_loading_leaf{position:absolute;top:-1px;opacity:.25}.weui_loading_leaf:before{content:" ";position:absolute;width:8.14px;height:3.08px;background:#d1d1d5;box-shadow:rgba(0,0,0,.0980392) 0 0 1px;border-radius:1px;-webkit-transform-origin:left 50% 0;-ms-transform-origin:left 50% 0;transform-origin:left 50% 0}.weui_mask,.weui_mask_transition,.weui_mask_transparent{z-index:1;height:100%;position:fixed;left:0;top:0;width:100%}.weui_loading_leaf_0{-webkit-animation:opacity-60-25-0-12 1.25s linear infinite;animation:opacity-60-25-0-12 1.25s linear infinite}.weui_loading_leaf_0:before{-webkit-transform:rotate(0) translate(7.92px,0);-ms-transform:rotate(0) translate(7.92px,0);transform:rotate(0) translate(7.92px,0)}.weui_loading_leaf_1{-webkit-animation:opacity-60-25-1-12 1.25s linear infinite;animation:opacity-60-25-1-12 1.25s linear infinite}.weui_loading_leaf_1:before{-webkit-transform:rotate(30deg) translate(7.92px,0);-ms-transform:rotate(30deg) translate(7.92px,0);transform:rotate(30deg) translate(7.92px,0)}.weui_loading_leaf_2{-webkit-animation:opacity-60-25-2-12 1.25s linear infinite;animation:opacity-60-25-2-12 1.25s linear infinite}.weui_loading_leaf_2:before{-webkit-transform:rotate(60deg) translate(7.92px,0);-ms-transform:rotate(60deg) translate(7.92px,0);transform:rotate(60deg) translate(7.92px,0)}.weui_loading_leaf_3{-webkit-animation:opacity-60-25-3-12 1.25s linear infinite;animation:opacity-60-25-3-12 1.25s linear infinite}.weui_loading_leaf_3:before{-webkit-transform:rotate(90deg) translate(7.92px,0);-ms-transform:rotate(90deg) translate(7.92px,0);transform:rotate(90deg) translate(7.92px,0)}.weui_loading_leaf_4{-webkit-animation:opacity-60-25-4-12 1.25s linear infinite;animation:opacity-60-25-4-12 1.25s linear infinite}.weui_loading_leaf_4:before{-webkit-transform:rotate(120deg) translate(7.92px,0);-ms-transform:rotate(120deg) translate(7.92px,0);transform:rotate(120deg) translate(7.92px,0)}.weui_loading_leaf_5{-webkit-animation:opacity-60-25-5-12 1.25s linear infinite;animation:opacity-60-25-5-12 1.25s linear infinite}.weui_loading_leaf_5:before{-webkit-transform:rotate(150deg) translate(7.92px,0);-ms-transform:rotate(150deg) translate(7.92px,0);transform:rotate(150deg) translate(7.92px,0)}.weui_loading_leaf_6{-webkit-animation:opacity-60-25-6-12 1.25s linear infinite;animation:opacity-60-25-6-12 1.25s linear infinite}.weui_loading_leaf_6:before{-webkit-transform:rotate(180deg) translate(7.92px,0);-ms-transform:rotate(180deg) translate(7.92px,0);transform:rotate(180deg) translate(7.92px,0)}.weui_loading_leaf_7{-webkit-animation:opacity-60-25-7-12 1.25s linear infinite;animation:opacity-60-25-7-12 1.25s linear infinite}.weui_loading_leaf_7:before{-webkit-transform:rotate(210deg) translate(7.92px,0);-ms-transform:rotate(210deg) translate(7.92px,0);transform:rotate(210deg) translate(7.92px,0)}.weui_loading_leaf_8{-webkit-animation:opacity-60-25-8-12 1.25s linear infinite;animation:opacity-60-25-8-12 1.25s linear infinite}.weui_loading_leaf_8:before{-webkit-transform:rotate(240deg) translate(7.92px,0);-ms-transform:rotate(240deg) translate(7.92px,0);transform:rotate(240deg) translate(7.92px,0)}.weui_loading_leaf_9{-webkit-animation:opacity-60-25-9-12 1.25s linear infinite;animation:opacity-60-25-9-12 1.25s linear infinite}.weui_loading_leaf_9:before{-webkit-transform:rotate(270deg) translate(7.92px,0);-ms-transform:rotate(270deg) translate(7.92px,0);transform:rotate(270deg) translate(7.92px,0)}.weui_loading_leaf_10{-webkit-animation:opacity-60-25-10-12 1.25s linear infinite;animation:opacity-60-25-10-12 1.25s linear infinite}.weui_loading_leaf_10:before{-webkit-transform:rotate(300deg) translate(7.92px,0);-ms-transform:rotate(300deg) translate(7.92px,0);transform:rotate(300deg) translate(7.92px,0)}.weui_loading_leaf_11{-webkit-animation:opacity-60-25-11-12 1.25s linear infinite;animation:opacity-60-25-11-12 1.25s linear infinite}.weui_loading_leaf_11:before{-webkit-transform:rotate(330deg) translate(7.92px,0);-ms-transform:rotate(330deg) translate(7.92px,0);transform:rotate(330deg) translate(7.92px,0)}@-webkit-keyframes opacity-60-25-0-12{0%,0.01%{opacity:.25}0.02%{opacity:1}100%,60.01%{opacity:.25}}@-webkit-keyframes opacity-60-25-1-12{0%,8.34333%{opacity:.25}8.35333%{opacity:1}100%,68.3433%{opacity:.25}}@-webkit-keyframes opacity-60-25-2-12{0%,16.6767%{opacity:.25}16.6867%{opacity:1}100%,76.6767%{opacity:.25}}@-webkit-keyframes opacity-60-25-3-12{0%,25.01%{opacity:.25}25.02%{opacity:1}100%,85.01%{opacity:.25}}@-webkit-keyframes opacity-60-25-4-12{0%,33.3433%{opacity:.25}33.3533%{opacity:1}100%,93.3433%{opacity:.25}}@-webkit-keyframes opacity-60-25-5-12{0%{opacity:.270958333333333}41.6767%{opacity:.25}41.6867%{opacity:1}1.67667%{opacity:.25}100%{opacity:.270958333333333}}@-webkit-keyframes opacity-60-25-6-12{0%{opacity:.375125}50.01%{opacity:.25}50.02%{opacity:1}10.01%{opacity:.25}100%{opacity:.375125}}@-webkit-keyframes opacity-60-25-7-12{0%{opacity:.479291666666667}58.3433%{opacity:.25}58.3533%{opacity:1}18.3433%{opacity:.25}100%{opacity:.479291666666667}}@-webkit-keyframes opacity-60-25-8-12{0%{opacity:.583458333333333}66.6767%{opacity:.25}66.6867%{opacity:1}26.6767%{opacity:.25}100%{opacity:.583458333333333}}@-webkit-keyframes opacity-60-25-9-12{0%{opacity:.687625}75.01%{opacity:.25}75.02%{opacity:1}35.01%{opacity:.25}100%{opacity:.687625}}@-webkit-keyframes opacity-60-25-10-12{0%{opacity:.791791666666667}83.3433%{opacity:.25}83.3533%{opacity:1}43.3433%{opacity:.25}100%{opacity:.791791666666667}}@-webkit-keyframes opacity-60-25-11-12{0%{opacity:.895958333333333}91.6767%{opacity:.25}91.6867%{opacity:1}51.6767%{opacity:.25}100%{opacity:.895958333333333}}.weui_mask{background:rgba(0,0,0,.6)}.weui_mask_transition{display:none;background:0 0;-webkit-transition:background .3s;transition:background .3s}.weui_fade_toggle{background:rgba(0,0,0,.6)}.weui_actionsheet{position:fixed;left:0;bottom:0;-webkit-transform:translate(0,100%);-ms-transform:translate(0,100%);transform:translate(0,100%);-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:2;width:100%;background-color:#EFEFF4;-webkit-transition:-webkit-transform .3s;transition:transform .3s}.weui_actionsheet_menu{background-color:#FFF}.weui_actionsheet_action{margin-top:6px;background-color:#FFF}.weui_actionsheet_cell{position:relative;padding:10px 0;text-align:center;font-size:18px}.weui_actionsheet_cell:before{content:" ";position:absolute;left:0;top:0;width:100%;height:1px;border-top:1px solid #D9D9D9;color:#D9D9D9;-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.weui_actionsheet_cell:active{background-color:#ECECEC}.weui_actionsheet_cell:first-child:before{display:none}.weui_actionsheet_toggle{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}
\ No newline at end of file
diff --git a/spec/factories/sonar_errors.rb b/spec/factories/sonar_errors.rb
new file mode 100644
index 000000000..a5ed5485f
--- /dev/null
+++ b/spec/factories/sonar_errors.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :sonar_error do
+    project_id 1
+    jenkins_job_name "MyString"
+    output "MyText"
+  end
+end
diff --git a/spec/models/sonar_error_spec.rb b/spec/models/sonar_error_spec.rb
new file mode 100644
index 000000000..9aae8db29
--- /dev/null
+++ b/spec/models/sonar_error_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SonarError, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end