diff --git a/.access_token b/.access_token
new file mode 100644
index 000000000..610b08d2e
--- /dev/null
+++ b/.access_token
@@ -0,0 +1 @@
+{"access_token":"oEEf8ZKAB8Y2G0o_xnTPkPJHKKk8iHkLC-f5ptvQ2nCMj9IpC86ivLD2-p38GfOkuG-HuQp3pWZqhs3NJXUMdPLWsr5k67hPZYuqg4ozLccx0xdLswapj0mn8ovZhK1tKIKiAFAOMO","expires_in":7200,"got_token_at":1467012449}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ba7890841..dbc349c80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ vendor/cache
 /config/initializers/gitlab_config.rb
 1234567
 public/javascripts/wechat/node_modules/
+.ruby-version
diff --git a/Gemfile b/Gemfile
index d392c6561..eef93c371 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,19 @@
 source 'https://ruby.taobao.org/'
-### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   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
+  end
+  gem 'certified'
 end
 
-gem 'certified'
+gem 'net-ssh', '2.9.1'
+gem 'jenkins_api_client'
+gem 'nokogiri'
 
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
@@ -31,7 +38,6 @@ gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
 gem 'rails_kindeditor',path:'lib/rails_kindeditor'
-#gem "rmagick", ">= 2.0.0"
 gem 'binding_of_caller'
 gem 'chinese_pinyin'
 # gem 'sunspot_rails', '~> 1.3.3'
@@ -81,7 +87,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', :platforms => :ruby
+  # gem 'therubyracer', :platforms => :ruby
 
   gem 'uglifier', '>= 1.0.3'
 end
diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index c86a36d05..c555eb633 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -18,11 +18,13 @@ module Mobile
   require_relative 'apis/blog_comments'
   require_relative 'apis/new_comment'
   require_relative 'apis/praise'
+  require_relative 'apis/resources'
 
   class API < Grape::API
     version 'v1', using: :path
     format :json
     content_type :json, "application/json;charset=UTF-8"
+    use ActionDispatch::Session::CookieStore
     use Mobile::Middleware::ErrorHandler
 
     helpers do
@@ -34,6 +36,10 @@ module Mobile
         raise('Unauthorized. 用户认证失败.') unless current_user
       end
 
+      def session
+        env['rack.session']
+      end
+
       def current_user
         openid = params[:openid]
         if openid
@@ -66,9 +72,9 @@ module Mobile
     mount Apis::BlogComments
     mount Apis::NewComment
     mount Apis::Praise
+    mount Apis::Resources
 
-    #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'})
-    #add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
+    add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
   end
 end
diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 49fdaff8f..661925012 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -9,7 +9,7 @@ module Mobile
 
         params do
           requires :page, type: Integer
-          requires :openid, type: String
+          requires :token, type: String
         end
         post do
           authenticate!
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 3a36a9e37..42303b63d 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -14,8 +14,9 @@ module Mobile
           optional :token, type: String
         end
         get do
+          authenticate!
           cs = CoursesService.new
-          courses = cs.course_list(params,current_user.nil? ? User.find(2):current_user)
+          courses = cs.user_courses_list(current_user)
           present :data, courses, with: Mobile::Entities::Course
           present :status, 0
         end
@@ -97,25 +98,20 @@ module Mobile
 
         desc "加入课程"
         params do
-          requires :course_password, type: String
+          requires :token, type: String
+          requires :invite_code, type: String, desc: '邀请码'
         end
-        post ":id" do
+        post "join" do
           authenticate!
           cs = CoursesService.new
-          status = cs.join_course({:object_id => params[:id],:course_password => params[:course_password]},current_user)
-          out = {status: status[:state]}
-          message = case status[:state]
-          when 0; "加入成功"
-          when 1; "密码错误"
-          when 2; "课程已过期 请联系课程管理员重启课程。(在配置课程处)"
-          when 3; "您已经加入了课程"
-          when 4; "您加入的课程不存在"
-          when 5; "您还未登录"
-          else; "未知错误，请稍后再试"
-          end
-          out.merge(message: message)
+          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])
+          }
         end
 
+
         desc "退出课程"
         params do
           requires :token, type: String
@@ -201,6 +197,7 @@ module Mobile
         end
         route_param :id do
           get do
+            authenticate!
             cs = CoursesService.new
             course = cs.show_course(params,(current_user.nil? ? User.find(2):current_user))
             #course = Course.find(params[:id])
@@ -388,7 +385,16 @@ module Mobile
         end
 
 
-
+        desc '获取测验列表'
+        params do
+          requires :token, type:String
+        end
+        get ':course_id/exercises' do
+          authenticate!
+          exercises = Course.find(params[:course_id]).exercises
+          present :data,exercises,with:Mobile::Entities::Exercise
+          present :status,0
+        end
 
       end
     end
diff --git a/app/api/mobile/apis/issues.rb b/app/api/mobile/apis/issues.rb
index b767bd768..4a6417cb4 100644
--- a/app/api/mobile/apis/issues.rb
+++ b/app/api/mobile/apis/issues.rb
@@ -8,7 +8,8 @@ module Mobile
 
         desc "get special issuse"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           issue = Issue.find params[:id]
           present :data, issue, with: Mobile::Entities::Issue,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/journal_for_messages.rb b/app/api/mobile/apis/journal_for_messages.rb
index 15a571a82..5f2d01185 100644
--- a/app/api/mobile/apis/journal_for_messages.rb
+++ b/app/api/mobile/apis/journal_for_messages.rb
@@ -7,7 +7,8 @@ module Mobile
 
         desc "get special journal"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           jour = JournalsForMessage.find params[:id]
           present :data, jour, with: Mobile::Entities::Jours,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/messages.rb b/app/api/mobile/apis/messages.rb
index ae2f9a39c..bab82de8d 100644
--- a/app/api/mobile/apis/messages.rb
+++ b/app/api/mobile/apis/messages.rb
@@ -7,7 +7,8 @@ module Mobile
 
         desc "get special topic"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           message = Message.find params[:id]
           present :data, message, with: Mobile::Entities::Message,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/new_comment.rb b/app/api/mobile/apis/new_comment.rb
index 694ec0613..5b7159301 100644
--- a/app/api/mobile/apis/new_comment.rb
+++ b/app/api/mobile/apis/new_comment.rb
@@ -11,12 +11,12 @@ module Mobile
         params do
           requires :type, type: String
           requires :content, type: String
-          requires :openid, type: String
+          requires :token, type: String
         end
         post ':id' do
+          authenticate!
           type = params[:type]
           result = 1
-          current_user = UserWechat.find_by_openid(params[:openid]).user
           if params[:content]!="" && current_user
             case type
               when "HomeworkCommon"
diff --git a/app/api/mobile/apis/newss.rb b/app/api/mobile/apis/newss.rb
index 8bdd460cc..d42177783 100644
--- a/app/api/mobile/apis/newss.rb
+++ b/app/api/mobile/apis/newss.rb
@@ -7,7 +7,8 @@ module Mobile
 
         desc "get special news"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           news = News.find params[:id]
           present :data, news, with: Mobile::Entities::News,user: user
           present :status, 0
diff --git a/app/api/mobile/apis/praise.rb b/app/api/mobile/apis/praise.rb
index 57dbd0729..834d1195b 100644
--- a/app/api/mobile/apis/praise.rb
+++ b/app/api/mobile/apis/praise.rb
@@ -9,12 +9,13 @@ module Mobile
 
         params do
           requires :type, type: String
-          requires :openid, type: String
+          requires :token, type: String
         end
         post ':id' do
+          authenticate!
           obj_id = params[:id]
           obj_type = params[:type]
-          user = UserWechat.find_by_openid(params[:openid]).user
+          user = current_user
           pts = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",obj_id,obj_type.to_s,user.id).first
           if pts.blank?
             praise_or_cancel(obj_type,obj_id,user,1)
diff --git a/app/api/mobile/apis/resources.rb b/app/api/mobile/apis/resources.rb
new file mode 100644
index 000000000..fca94a642
--- /dev/null
+++ b/app/api/mobile/apis/resources.rb
@@ -0,0 +1,55 @@
+#coding=utf-8
+module Mobile
+  module Apis
+    class Resources < Grape::API
+
+      resource :resources do
+
+        desc '获取所有课件'
+        params do
+          requires :token, type: String
+        end
+        get do
+          authenticate!
+          data = current_user.course_attachments
+          present :data, data, with: Mobile::Entities::Attachment
+          present :status, 0
+
+        end
+
+
+
+        desc '获取所有作业'
+        params do
+          requires :token, type: String
+        end
+        get 'homeworks' do
+          authenticate!
+
+          homeworks = current_user.homework_commons
+
+          present :data, homeworks, with: Mobile::Entities::Homework
+          present :status, 0
+
+        end
+
+        desc '获取所有测验'
+        params do
+          requires :token, type: String
+        end
+        get 'exercies' do
+          authenticate!
+
+          exercises = current_user.exercises
+          present :data, exercises, with: Mobile::Entities::Exercise
+          present :status, 0
+        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 6ce3cacbb..b5ee14d19 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -4,6 +4,48 @@ module Mobile
     class Users < Grape::API
       resource :users do
 
+        desc "查询是否已绑定"
+        params do
+          requires :openid, type: String, desc: 'wechat openid'
+        end
+        post 'isbind' do
+          openid = params[:openid]
+          uw = UserWechat.where(openid: openid).first
+          raise "还未绑定trustie帐户" unless uw
+
+          user = uw.user
+          ::ApiKey.delete_all(user_id: user.id)
+          key = ::ApiKey.create!(user_id: user.id)
+          present status: 0, token: key.access_token
+        end
+
+        desc "绑定微信用户"
+        params do
+          requires :login, type: String, desc: 'username'
+          requires :password, type: String, desc: 'password'
+        end
+        post 'wxbind' do
+            openid = session[:wechat_openid]
+            logger.debug "openid ============== #{openid}"
+            raise "无法获取到openid,请在微信中打开本页面" unless openid
+            uw = UserWechat.where(openid: openid).first
+            raise "此微信号已绑定用户(#{uw.user.login}), 不能重复绑定" if uw
+
+            user, last_login_on = User.try_to_login(params[:login], params[:password])
+            raise "用户名或密码错误,请重新输入" unless user
+            #补全用户信息
+
+            raise "此用户已经绑定过公众号, 请换一个帐户试试" if user.user_wechat
+
+            UserWechat.create!(
+                openid: openid,
+                user: user
+            )
+            # ws = WechatService.new
+            # ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
+            present status: 0, message: '您已成功绑定Trustie平台'
+        end
+
         desc "注册用户"
         params do
           requires :login, type: String, desc: 'username'
diff --git a/app/api/mobile/apis/whomeworks.rb b/app/api/mobile/apis/whomeworks.rb
index a88d509a3..c8377aa0d 100644
--- a/app/api/mobile/apis/whomeworks.rb
+++ b/app/api/mobile/apis/whomeworks.rb
@@ -7,7 +7,8 @@ module Mobile
 
         desc "get one homework"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          authenticate!
+          user = current_user
           homework = HomeworkCommon.find params[:id]
           present :data, homework, with: Mobile::Entities::Whomework,user: user
           present :status, 0
diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb
index 50812b349..487a75c4d 100644
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@@ -45,6 +45,8 @@ module Mobile
       course_expose :tea_id
       course_expose :term
       course_expose :time
+      course_expose :invite_code
+      course_expose :qrcode
       course_expose :updated_at
       course_expose :course_student_num
       expose :teacher, using: Mobile::Entities::User do |c, opt|
diff --git a/app/api/mobile/entities/exercise.rb b/app/api/mobile/entities/exercise.rb
new file mode 100644
index 000000000..3218264fb
--- /dev/null
+++ b/app/api/mobile/entities/exercise.rb
@@ -0,0 +1,8 @@
+module Mobile
+  module Entities
+    class Exercise < Grape::Entity
+      expose :exercise_name
+      expose :exercise_description
+    end
+  end
+end
diff --git a/app/api/mobile/entities/user.rb b/app/api/mobile/entities/user.rb
index 8c6a839b3..2eb20f0db 100644
--- a/app/api/mobile/entities/user.rb
+++ b/app/api/mobile/entities/user.rb
@@ -26,6 +26,8 @@ module Mobile
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.student_id
                 when :realname
                   u.nil? ? "" : get_user_realname(u)
+                when :name
+                  u.nil? ? "" : u.show_name
               end
             end
           end
@@ -57,6 +59,11 @@ module Mobile
       user_expose :student_num
       # 活跃值
       user_expose :active_count
+
+      user_expose :role_name
+
+      user_expose :name
+
     end
   end
 
diff --git a/app/assets/javascripts/quality_analyses.js.coffee b/app/assets/javascripts/quality_analyses.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/quality_analyses.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/quality_analyses.css.scss b/app/assets/stylesheets/quality_analyses.css.scss
new file mode 100644
index 000000000..9404eb70f
--- /dev/null
+++ b/app/assets/stylesheets/quality_analyses.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the QualityAnalyses controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index e421b8c69..7dea90e4b 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -74,7 +74,7 @@ class CoursesController < ApplicationController
     else
       @state = 5 #未登录
     end
-    @object_id = params[:object_id]
+    @object_id = @course.id if @course
     respond_to do |format|
       format.js #{ render :partial => 'set_join', :locals => {:user => @user, :course => @course, :object_id => params[:object_id]} }
     end
@@ -1224,7 +1224,7 @@ class CoursesController < ApplicationController
   def member_to_xls homeworks, course, members,groups
     xls_report = StringIO.new
     book = Spreadsheet::Workbook.new
-    sheet1 = book.create_worksheet :name => "student"
+    sheet1 = book.create_worksheet :name => "总成绩"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     #sheet1.row(0).default_format = blue
     #sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_class),l(:excel_f_score),l(:excel_commit_time)])
@@ -1268,6 +1268,121 @@ class CoursesController < ApplicationController
       count_row += 1
     end
 
+    homeworks.each_with_index do |home, i|
+      sheet = book.create_worksheet :name => "第#{i+1}次作业"
+      sheet[0,0] = "课程编号"
+      sheet[0,1] = course.id
+      sheet[1,0] = "课程学期"
+      sheet[1,1] = course.time.to_s+"年"+course.term
+      sheet[2,0] = "课程名称"
+      sheet[2,1] = course.name
+      sheet[3,0] = "教师团队"
+      sheet[3,1] = (searchTeacherAndAssistant course).map{|member| member.user.show_name}.join('、')
+      sheet[4,0] = "主讲教师"
+      sheet[4,1] = course.teacher.show_name
+      sheet[4,0] = "作业批次"
+      sheet[4,1] = "第#{i+1}次作业"
+      sheet[4,0] = "作业名称"
+      sheet[4,1] = home.name
+      if home.homework_type == 1 #普通作业
+        if home.anonymous_comment ==0
+          sheet.row(5).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        else
+          sheet.row(5).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        end
+        count_row = 6
+        items = home.student_works.order("work_score desc")
+        items.each_with_index do |stu, j|
+          sheet[count_row,0]= j + 1
+          sheet[count_row,1] = stu.user.show_name
+          sheet[count_row,2] = stu.user.login
+          sheet[count_row,3] = stu.user.user_extensions.student_id
+          sheet[count_row,4] = stu.name
+          sheet[count_row,5] = strip_html stu.description
+          sheet[count_row,6] = stu.teacher_score.nil? ? l(:label_without_score) : stu.teacher_score.round(2)
+          sheet[count_row,7] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
+          if home.anonymous_comment ==0
+            sheet[count_row,8] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
+            sheet[count_row,9] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.absence_penalty
+            sheet[count_row,10] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
+            sheet[count_row,11] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,12] = format_time(stu.created_at)
+          else
+            sheet[count_row,8] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
+            sheet[count_row,9] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,10] = format_time(stu.created_at)
+          end
+          count_row += 1
+        end
+      elsif home.homework_type == 2 #编程作业
+        if home.anonymous_comment ==0
+          sheet.row(5).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        else
+          sheet.row(5).concat([l(:excel_rank),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_homework_name),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        end
+        count_row = 6
+        items = home.student_works.order("work_score desc")
+        items.each_with_index do |stu, j|
+          sheet[count_row,0]= j + 1
+          sheet[count_row,1] = stu.user.show_name
+          sheet[count_row,2] = stu.user.login
+          sheet[count_row,3] = stu.user.user_extensions.student_id
+          sheet[count_row,4] = stu.name
+          sheet[count_row,5] = stu.description
+          sheet[count_row,6] = stu.teacher_score.nil? ? l(:label_without_score) : stu.teacher_score.round(2)
+          sheet[count_row,7] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
+          sheet[count_row,8] = stu.system_score.nil? ? l(:label_without_score) : stu.system_score.round(2)
+          if home.anonymous_comment ==0
+            sheet[count_row,9] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
+            sheet[count_row,10] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.absence_penalty
+            sheet[count_row,11] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
+            sheet[count_row,12] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,13] = format_time(stu.created_at)
+          else
+            sheet[count_row,9] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
+            sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,11] = format_time(stu.created_at)
+          end
+          count_row += 1
+        end
+      elsif home.homework_type == 3 #分组作业
+        if home.anonymous_comment ==0
+          sheet.row(5).concat([l(:excel_rank),l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        else
+          sheet.row(5).concat([l(:excel_rank),l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        end
+        count_row = 6
+        items = home.student_works.order("work_score desc")
+        items.each_with_index do |stu, j|
+          sheet[count_row,0] = j + 1
+          sheet[count_row,1] = get_group_member_names stu
+          sheet[count_row,2] = stu.name
+          sheet[count_row,3] = (stu.project_id == 0 || stu.project_id.nil?) ? l(:excel_no_project) : stu.project.name
+          sheet[count_row,4] = strip_html stu.description
+          sheet[count_row,5] = stu.teacher_score.nil? ? l(:label_without_score) : stu.teacher_score.round(2)
+          sheet[count_row,6] = stu.teaching_asistant_score.nil? ? l(:label_without_score) : stu.teaching_asistant_score.round(2)
+          if home.anonymous_comment ==0
+            sheet[count_row,7] = stu.student_score.nil? ? l(:label_without_score) : stu.student_score.round(2)
+            sheet[count_row,8] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.absence_penalty
+            sheet[count_row,9] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
+            sheet[count_row,10] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,11] = format_time(stu.created_at)
+          else
+            sheet[count_row,7] = (home.teacher_priority == 1 && !stu.teacher_score.nil?) ? 0 : stu.late_penalty
+            sheet[count_row,8] = stu.work_score.nil? ? l(:label_without_score) : stu.work_score.round(2)
+            sheet[count_row,9] = format_time(stu.created_at)
+          end
+          count_row += 1
+        end
+      end
+    end
+
 =begin
     group0 = CourseGroup.new();
     group0.id = 0;
diff --git a/app/controllers/org_member_controller.rb b/app/controllers/org_member_controller.rb
index 642a100c3..2eaa790cd 100644
--- a/app/controllers/org_member_controller.rb
+++ b/app/controllers/org_member_controller.rb
@@ -54,4 +54,8 @@ class OrgMemberController < ApplicationController
   def index
 
   end
+
+  def deleteOrgMember
+    destroy
+  end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c8b272480..8664a1372 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -100,8 +100,8 @@ class ProjectsController < ApplicationController
     render_404
   end
   
-  def course
-    render_404
+  def courserender_404
+
   end
 
   # Time 2015-01-29 11:19:11
@@ -299,6 +299,8 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
+
+    logger.debug "111111111"*100
     # over
     @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
     @page = params[:page] ? params[:page].to_i + 1 : 0
@@ -319,6 +321,7 @@ class ProjectsController < ApplicationController
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10);
     end
+    logger.debug "2"*100
     # g = Gitlab.client
     unless @project.gpid.nil? || @project.project_score.changeset_num == 0
       # rep_statics_commit = @project.rep_statics.order("commits_num desc")
@@ -332,12 +335,20 @@ class ProjectsController < ApplicationController
       @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
       @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
       g = Gitlab.client
+      logger.debug "3"*100
       begin
-        g_branch = g.project(@project.gpid).default_branch.to_s
-      rescue
-        logger.error("get gitlab project failed!")
+        gid = @project.gpid
+        logger.debug "31"*100
+        g_branch = g.project(gid)
+        logger.debug "4"*100
+        g_branch = g_branch.default_branch.to_s
+        logger.debug "5"*100
+      rescue =>e
+        logger.error("get gitlab project failed: " + e)
       end
+      logger.debug "6"*100
       @rev = g_branch.nil? ? "master" : g_branch
+      logger.debug "7"*100
     end
     # 根据对应的请求，返回对应的数据
     respond_to do |format|
@@ -393,7 +404,7 @@ class ProjectsController < ApplicationController
     unless @project.gpid.nil?
       g = Gitlab.client
       @gitlab_branches = g.branches(@project.gpid)
-      @branch_names = g.branches(@project.gpid).map{|b| b.name}
+      @branch_names = @gitlab_branches.map{|b| b.name}
       @gitlab_default_branch = g.project(@project.gpid).default_branch
     end
   end
@@ -645,7 +656,7 @@ class ProjectsController < ApplicationController
     params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0
     params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0
     # 更新公开私有时同步gitlab公开私有
-    unless @project.gpid.nil?
+    if !@project.gpid.nil? && @project.is_public != (params[:project][:is_public] == "on" ? true : false)
       g = Gitlab.client
       params[:project][:is_public] ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
     end
diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
new file mode 100644
index 000000000..83e5960b9
--- /dev/null
+++ b/app/controllers/quality_analysis_controller.rb
@@ -0,0 +1,99 @@
+class QualityAnalysisController < ApplicationController
+  before_filter :find_project_by_project_id#, :except => [:getattachtype]
+  before_filter :authorize
+  layout "base_projects"
+  include ApplicationHelper
+  require 'jenkins_api_client'
+  require 'nokogiri'
+  require 'json'
+  require 'open-uri'
+
+  def show
+
+  end
+
+  def create
+    gitlab_address = Redmine::Configuration['gitlab_address']
+    jenkins_address = Redmine::Configuration['jenkins_address']
+    @client = JenkinsApi::Client.new(:server_url => jenkins_address,
+                                     :username => "temp",
+                                     :password => '123123')
+    #@client.exists?(job_name)
+    @g = Gitlab.client
+    user_name = User.find(params[:user_id]).try(:login)
+    branch = params[:branch].nil? ? "master" : params[:branch]
+    language = params[:language]
+    path = params[:path]
+    identifier = params[:identifier]
+    qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
+    version = qa.nil? ? 1 : qa.sonar_version + 1
+    properties = "sonar.projectKey=#{user_name}:#{identifier}
+        sonar.projectName=#{user_name}:#{identifier}
+        sonar.projectVersion=#{version}
+        sonar.sources=#{path}
+        sonar.language=#{language.downcase}
+        sonar.sourceEncoding=utf-8"
+    git_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
+
+    # # # modify config
+    @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
+    @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
+    @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
+    @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties #sonar-properties
+    #
+    # replace config.xml of jenkins
+    @client = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+    # relace gitlab hook
+    # genkins address
+    @g.add_project_hook(@project.gpid, jenkins_address + "/project/#{user_name}_#{identifier}")
+    if qa.nil?
+      QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :sonar_version => version, :path => path, :branch => branch, :language => language)
+
+    else
+      qa.update_attribute(:sonar_version, version)
+    end
+  end
+
+  def index
+    @sonar_address = Redmine::Configuration['sonar_address']
+    # if params[:resource_id].nil?
+    #   @name_flag = true
+    #   @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
+    #   # @quality_analyses.map {|qa| qa.}
+    #   # if @quality_analyses.count > 0
+    #   #   @quality_analyses.each do |qa|
+    #   #     ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+    #   #
+    #   #   end
+    #   # end
+    #   # projects_date = open(@sonar_address + "/api/projects/index").read
+    #   # arr = JSON.parse(projects_date).map {|m| m["nm"]}
+    #   # arr.map
+    # else
+    qa = QualityAnalysis.where(:project_id => @project.id).first
+    @resource_id = qa.author_login+":"+qa.rep_identifier
+    @name_flag = false
+    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
+    @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
+    # end
+  end
+
+  # Find project of id params[:project_id]
+  def find_project_by_project_id
+    @project = Project.find(params[:project_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  # Authorize the user for the requested action
+  def authorize(ctrl = params[:controller], action = params[:action], global = false)
+    unless @project.archived? && @project.gpid.nil?
+      true
+    else
+      render_403 :message => :notice_not_authorized_archived_project
+    end
+  end
+
+end
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 9e785c562..cbb5b2f69 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -30,11 +30,13 @@ class RepositoriesController < ApplicationController
   menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers]
   default_search_scope :changesets
 
-  before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats]
+  before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats, :quality_analysis]
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked, :project_archive]
   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]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive, :quality_analysis]
+  # 链接gitlab
+  before_filter :connect_gitlab, :only => [:quality_analysis]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -43,6 +45,7 @@ class RepositoriesController < ApplicationController
   helper :project_score
   #@root_path = RepositoriesHelper::ROOT_PATH
   $g=Gitlab.client
+  require 'net/ssh'
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
@@ -306,6 +309,37 @@ update
     end
   end
 
+  def quality_analysis
+    gitlab_branches = @g.branches(@project.gpid)
+    @branch_names = gitlab_branches.map{|b| b.name}
+    @gitlab_default_branch = @g.project(@project.gpid).default_branch
+    # language = params[:language]
+    # branch = params[:branch]
+    # path = params[:path]
+    # user_name = User.find(@project.user_id).try(:login)
+    # rep_name = params[:repository_id]
+    # host = "192.168.0.200"
+    # port = "1125"
+    # username = "git"
+    # password = "123123"
+    # server_cmd1 = "sh gitclone.sh" + " " + user_name + " " + rep_name
+    # # 连接到远程主机 foobar
+    # ssh = Net::SSH.start(host, username, :port => port, :password => password) do |ssh|
+    #   result = ssh.exec!(server_cmd1)
+    #   path = "/home/git/repo/" + user_name + "/" + rep_name
+    #   # sonar 分析
+    #   # server_cmd2
+    #   # 删除clone的版本库
+    #   # server_cmd3
+    # end
+    respond_to do |format|
+      format.js
+      format.html{
+        render :layout => "base_projects"
+      }
+    end
+  end
+
   def destroy
     DestroyRepositoryTask.new.destroy(User.current.id, @repository.id)
     @repository.hidden = true
@@ -615,6 +649,14 @@ update
     project.project_score.update_attribute(:commit_time, date.created_at)
   end
 
+  # 链接gitlab
+  def connect_gitlab
+    @g = Gitlab.client
+    unless @project.gpid.nil?
+      @g_project = @g.project(@project.gpid)
+    end
+  end
+
   def find_repository
     @repository = Repository.find(params[:id])
     @project = @repository.project
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index d478b4d63..661770206 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1096,7 +1096,7 @@ class StudentWorkController < ApplicationController
       all_student_ids = "(" + pro.members.map{|member| member.user_id}.join(",") + ")"
     end
     all_students = User.where("id in #{all_student_ids}")
-    student_work_id = @homework.student_work_projects.where("user_id=?",User.current.id).empty? ? -1 : @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
+    student_work_id = @homework.student_work_projects.where("user_id=? and student_work_id is not null",User.current.id).first.nil? ? -1 : @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
     @commit_student_ids = @homework.student_work_projects.where("student_work_id != #{student_work_id}").map{|student| student.user_id}
     @users = searchstudent_by_name all_students,name
     respond_to do |format|
@@ -1209,13 +1209,18 @@ class StudentWorkController < ApplicationController
     sheet1 = book.create_worksheet :name => "homework"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
-    if @homework.homework_type == 1 #匿评作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
-                            l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
+    if @homework.homework_type == 1 #普通作业
+      if @homework.anonymous_comment ==0
+        sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
+                            l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+      else
+        sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
+                              l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+      end
       count_row = 1
       items.each do |homework|
         sheet1[count_row,0]=homework.user.id
-        sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+        sheet1[count_row,1] = homework.user.show_name
         sheet1[count_row,2] = homework.user.login
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
@@ -1223,18 +1228,31 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,6] = strip_html homework.description
         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)
-        sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-        sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
-        sheet1[count_row,11] = format_time(homework.created_at)
+        if @homework.anonymous_comment ==0
+          sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+          sheet1[count_row,10] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.absence_penalty
+          sheet1[count_row,11] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
+          sheet1[count_row,12] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+          sheet1[count_row,13] = format_time(homework.created_at)
+        else
+          sheet1[count_row,9] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
+          sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+          sheet1[count_row,11] = format_time(homework.created_at)
+        end
         count_row += 1
       end
     elsif @homework.homework_type == 2 #编程作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
-                            l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
+      if @homework.anonymous_comment ==0
+        sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
+                              l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+      else
+        sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
+                              l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+      end
       count_row = 1
       items.each do |homework|
         sheet1[count_row,0]=homework.user.id
-        sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+        sheet1[count_row,1] = homework.user.show_name
         sheet1[count_row,2] = homework.user.login
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
@@ -1243,11 +1261,48 @@ class StudentWorkController < ApplicationController
         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)
         sheet1[count_row,9] = homework.system_score.nil? ? l(:label_without_score) : homework.system_score.round(2)
-        sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
-        sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
-        sheet1[count_row,12] = format_time(homework.created_at)
+        if @homework.anonymous_comment ==0
+          sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+          sheet1[count_row,11] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.absence_penalty
+          sheet1[count_row,12] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
+          sheet1[count_row,13] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+          sheet1[count_row,14] = format_time(homework.created_at)
+        else
+          sheet1[count_row,10] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
+          sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+          sheet1[count_row,12] = format_time(homework.created_at)
+        end
         count_row += 1
       end
+    elsif @homework.homework_type == 3 #分组作业
+        if @homework.anonymous_comment ==0
+          sheet1.row(0).concat([l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_a_penalty),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        else
+          sheet1.row(0).concat([l(:excel_group_member),l(:excel_homework_name),l(:excel_homework_project),l(:excel_homework_des),
+                                l(:excel_t_score),l(:excel_ta_score),l(:excel_l_penalty),l(:excel_f_score),l(:excel_commit_time)])
+        end
+        count_row = 1
+        items.each do |homework|
+          sheet1[count_row,0] = get_group_member_names homework
+          sheet1[count_row,1] = homework.name
+          sheet1[count_row,2] = (homework.project_id == 0 || homework.project_id.nil?) ? l(:excel_no_project) : homework.project.name
+          sheet1[count_row,3] = strip_html homework.description
+          sheet1[count_row,4] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
+          sheet1[count_row,5] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
+          if @homework.anonymous_comment ==0
+            sheet1[count_row,6] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+            sheet1[count_row,7] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.absence_penalty
+            sheet1[count_row,8] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
+            sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+            sheet1[count_row,10] = format_time(homework.created_at)
+          else
+            sheet1[count_row,6] = (@homework.teacher_priority == 1 && !homework.teacher_score.nil?) ? 0 : homework.late_penalty
+            sheet1[count_row,7] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+            sheet1[count_row,8] = format_time(homework.created_at)
+          end
+          count_row += 1
+        end
     end
     book.write xls_report
     xls_report.string
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ed8a9fa36..2995d880d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -87,7 +87,10 @@ class UsersController < ApplicationController
 
   #展开所有回复
   def show_all_replies
-    @comment = JournalsForMessage.find params[:comment].to_i
+    case params[:type]
+      when 'JournalsForMessage'
+        @comment = JournalsForMessage.find params[:comment].to_i
+    end
   end
 
   #二级回复
@@ -95,6 +98,7 @@ class UsersController < ApplicationController
     case params[:type]
       when 'HomeworkCommon'
         @reply = JournalsForMessage.find params[:reply_id]
+        @type = 'HomeworkCommon'
         if params[:user_activity_id]
           @user_activity_id = params[:user_activity_id]
         else
@@ -102,6 +106,11 @@ class UsersController < ApplicationController
         end
         @is_in_course = params[:is_in_course].to_i
         @course_activity = params[:course_activity].to_i
+      when 'JournalsForMessage'
+        @reply = JournalsForMessage.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @type = 'JournalsForMessage'
     end
     respond_to do |format|
       format.js
@@ -135,7 +144,7 @@ class UsersController < ApplicationController
         unless (message_all.message_type == 'CourseMessage' && mess && mess.course  && mess.course.is_delete == 1)
           @message_alls << mess
         end
-        break if @message_alls.length == 5
+        break if @message_alls.length == 10
       end
     end
   end
@@ -1495,8 +1504,8 @@ class UsersController < ApplicationController
       # 减少数据库交互
       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}").map { |blog| blog.id}.join(",")
-      blog_ids = "(" + watched_user_blog_ids + ")"
+      watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}")
+      blog_ids = watched_user_blog_ids.empty? ? "(-1)" : "(" + watched_user_blog_ids.map { |blog| blog.id}.join(",") + ")"
 
       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
                                                 "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
@@ -3267,7 +3276,11 @@ class UsersController < ApplicationController
           @journals = obj.comments.reorder("created_on desc")
         when 'JournalsForMessage'
           obj = JournalsForMessage.where('id = ?', params[:id].to_i).first
-          @journals = obj.children.reorder("created_on desc")
+          journals = []
+          @journals = get_all_children(journals, obj)
+          @type = 'JournalsForMessage'
+          @user_activity_id = params[:div_id].to_i if params[:div_id]
+          @allow_delete = params[:allow_delete]
         when 'Issue'
           obj = Issue.where('id = ?', params[:id].to_i).first
           @journals = obj.journals.reorder("created_on desc")
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 169a33fce..4a79d6d93 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -3,10 +3,12 @@ class WechatsController < ActionController::Base
   wechat_responder
 
   include ApplicationHelper
-
+  ROOT_URL = ENV["wechat_url"]  || "#{Setting.protocol}://#{Setting.host_name}"
+  #ROOT_URL = "http://www.trustie.net"
   # default text responder when no other match
   on :text do |request, content|
-    request.reply.text "您的意见已收到，感谢您的反馈！" # Just echo
+      #邀请码
+    sendBindClass(request, {invite_code: content})
   end
 
   # When receive 'help', will trigger this responder
@@ -35,13 +37,13 @@ class WechatsController < ActionController::Base
 
   # When subscribe user scan scene_id in public account
   on :scan, with: 'scene_id' do |request, ticket|
-    request.reply.text "Subscribe user #{request[:FromUserName]} Ticket #{ticket}"
+    sendBindClass(request, {ticket: ticket})
   end
 
   # When no any on :scan responder can match subscribe user scaned scene_id
   on :event, with: 'scan' do |request|
     if request[:EventKey].present?
-      request.reply.text "event scan got EventKey #{request[:EventKey]} Ticket #{request[:Ticket]}"
+      sendBindClass(request, {ticket: request[:Ticket]})
     end
   end
 
@@ -62,6 +64,9 @@ class WechatsController < ActionController::Base
     request.reply.text "User: #{request[:FromUserName]} click #{key}"
   end
 
+  on :click, with: 'DEV' do |request, key|
+    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+  end
   # When user view URL in the menu button
   on :view, with: 'http://wechat.somewhere.com/view_url' do |request, view|
     request.reply.text "#{request[:FromUserName]} view #{view}"
@@ -128,12 +133,36 @@ class WechatsController < ActionController::Base
     default_msg(request)
   end
 
+  on :click, with: 'JOIN_CLASS' do |request, key|
+    uw = user_binded?(request[:FromUserName])
+    unless uw
+      sendBind(request)
+    else
+      request.reply.text "请直接回复5位班级邀请码\n(不区分大小写):"
+    end
+  end
+
+
+  def sendBindClass(request, params)
+    begin
+      uw = user_binded?(request[:FromUserName])
+      if !uw
+        return sendBind(request)
+      else
+        return join_class(params, uw.user, request)
+      end
+    rescue => e
+      logger.error e.inspect
+      logger.error e.backtrace.join("\n")
+      return request.reply.text e
+    end
+  end
+
   def default_msg(request)
     uw = user_binded?(request[:FromUserName])
     if uw && uw.user
       request.reply.text "欢迎回来, #{uw.user.show_name}"
     else
-      request.reply.text "欢迎关注Trustie创新实践社区"
       sendBind(request)
     end
   end
@@ -145,27 +174,61 @@ class WechatsController < ActionController::Base
 
 您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
-      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{login_wechat_url}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
-      pic_url = "#{Setting.protocol}://#{Setting.host_name}/images/weixin_pic.jpg"
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=login#wechat_redirect"
+      pic_url = "#{ROOT_URL}/images/weixin_pic.jpg"
+      article.item title: "#{n[:title]}",
+                   description: n[:content],
+                   pic_url: pic_url,
+                   url: url
+    end
+  end
+
+  def join_class(params, user, request)
+    course = nil
+    course = Course.where(qrcode: params[:ticket]).first if params[:ticket]
+    course = Course.where(invite_code: params[:invite_code]).first if params[:invite_code]
+    raise "班级不存在，请确认您的邀请码是否输入正确，谢谢！" unless course
+
+    cs = CoursesService.new
+    status = cs.join_course({invite_code: course.invite_code}, user)
+    logger.info status
+    if status[:state] != 0
+      raise CoursesService::JoinCourseError.message(status[:state])
+    end
+
+    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
+                                                             content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
+    return request.reply.news(news) do |article, n, index| # article is return object
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
+      pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],
                    pic_url: pic_url,
                    url: url
     end
+
   end
 
   ###  controller method
   module Controllers
-    def get_open_id
+    def get_bind
       begin
-
         code = params[:code] || session[:wechat_code]
         openid = get_openid_from_code(code)
 
         raise "无法获取到微信openid" unless openid
-        render :json => {status:0, openid: openid}
+
+        uw = UserWechat.where(openid: openid).first
+        raise "还未绑定trustie帐户" unless uw
+        logger.debug "get_bind ============= #{uw}"
+
+        user = uw.user
+        ::ApiKey.delete_all(user_id: user.id)
+        key = ::ApiKey.create!(user_id: user.id)
+
+        render :json =>{status: 0, token: key.access_token}
       rescue Exception=>e
-        render :json => {status: -1, msg: e.message}
+        render :json => {status: -1, message: e.message}
       end
     end
 
@@ -175,14 +238,14 @@ class WechatsController < ActionController::Base
         code = params[:code] || session[:wechat_code]
         openid = get_openid_from_code(code)
 
-        raise "无法获取到openid" unless openid
-        raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
+        raise "无法获取到openid，请在微信中打开本页面" unless openid
+        raise "此微信号已绑定用户，不能重复绑定" if user_binded?(openid)
 
         user, last_login_on = User.try_to_login(params[:username], params[:password])
-        raise "用户名或密码错误,请重新输入" unless user
+        raise "用户名或密码错误，请重新输入" unless user
         #补全用户信息
 
-        raise "此用户已经绑定过公众号, 请换一个帐户试试" if user.user_wechat
+        raise "此用户已经绑定过公众号，请换一个帐户试试" if user.user_wechat
 
         UserWechat.create!(
             openid: openid,
@@ -206,19 +269,26 @@ class WechatsController < ActionController::Base
 
     def user_activities
       session[:wechat_code] = params[:code] if params[:code]
-      code = params[:code] || session[:wechat_code]
-      openid = get_openid_from_code(code)
-      @wechat_user = user_binded?(openid)
-      unless @wechat_user
-        redirect_to login_wechat_path
-        return
+      @path = '/'+(params[:state] || '')
+      open_id = get_openid_from_code(params[:code]) rescue
+      unless open_id
+        render 'wechats/open_wechat', layout: nil and return
+      end
+      if params[:state] == 'myclass'
+        @course_id = params[:id];
       end
 
+      session[:wechat_openid] = open_id
+      if params[:code]
+        redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
+      end
       render 'wechats/user_activities', layout: nil
     end
 
+
     private
     def get_openid_from_code(code)
+      return 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg' if code =='only-for-test'
       openid = session[:wechat_openid]
 
       unless openid
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 1bbbb1190..93ba9e1ce 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -54,15 +54,16 @@ class WordsController < ApplicationController
               :reply_id => reply_user_id,
               :notes => content, 
               :is_readed => false}
-    @jfm = add_reply_adapter options
+    @activity = params[:activity_id].nil? ? JournalsForMessage.find(parent_id) : JournalsForMessage.find(params[:activity_id].to_i)
+    @jfm = add_reply_adapter(@activity, options)
     @save_succ = true if @jfm.errors.empty?
     if @save_succ
-      update_course_activity('JournalsForMessage',parent_id)
-      update_user_activity('JournalsForMessage',parent_id)
-      update_forge_activity('JournalsForMessage',parent_id)
-      update_org_activity('JournalsForMessage',parent_id)
-      update_principal_activity('JournalsForMessage',parent_id)
-      (JournalsForMessage.find parent_id).update_attribute(:updated_on,Time.now)
+      update_course_activity('JournalsForMessage',@activity.id)
+      update_user_activity('JournalsForMessage',@activity.id)
+      update_forge_activity('JournalsForMessage',@activity.id)
+      update_org_activity('JournalsForMessage',@activity.id)
+      update_principal_activity('JournalsForMessage',@activity.id)
+      @activity.update_attribute(:updated_on,Time.now)
     end
     respond_to do |format|
       # format.html {
@@ -76,8 +77,6 @@ class WordsController < ApplicationController
       format.js {
         #@reply_type = params[:reply_type]
         @user_activity_id = params[:user_activity_id]
-        @activity = JournalsForMessage.find(parent_id)
-        @is_activity = params[:is_activity] if params[:is_activity]
       }
     end
 
@@ -92,13 +91,14 @@ class WordsController < ApplicationController
       elsif @journal_destroyed.jour_type == "Course"
         @course = Course.find @journal_destroyed.jour_id
         @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
+        @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
+        @activity = JournalsForMessage.where("id = #{params[:activity_id].to_i}").first if params[:activity_id]
       elsif @journal_destroyed.jour_type == "Principal"
         @user = User.find(@journal_destroyed.jour_id)
         @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
         @is_user = true
         @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
-        @is_activity = params[:is_activity].to_i if params[:is_activity]
-        @activity = @journal_destroyed.parent if @journal_destroyed.parent
+        @activity = JournalsForMessage.where("id = #{params[:activity_id].to_i}").first if params[:activity_id]
         unless @activity
           redirect_to feedback_path(@user)
           return
@@ -395,28 +395,44 @@ class WordsController < ApplicationController
     obj
   end
 
-  def add_reply_adapter options
+  def add_reply_adapter obj, options
     #modify by nwb
     #添加对课程留言的支持
     #留言回复应该不关系其所属的Class，而关心的是其所属的父留言
-    obj = obj_distinguish_url_origin || User.find_by_id(2)
-    if obj.kind_of? User
-      obj.add_jour(nil, nil, nil, options)
-    elsif obj.kind_of? Project
-      Project.add_new_jour(nil, nil, obj.id, options)
-    elsif obj.kind_of? Course
-      Course.add_new_jour(nil, nil, obj.id, options)
-    elsif obj.kind_of? Bid
-      obj.add_jour(nil, nil, nil, options)
-    elsif obj.kind_of? Contest
-      obj.add_jour(nil, nil, obj.id, options)   #new added
-    elsif obj.kind_of? Softapplication
-      obj.add_jour(nil, nil, obj.id, options)   #new added
-    elsif obj.kind_of? HomeworkAttach
-      obj.add_jour(nil, nil, obj.id, options)   #new added
-    else
-      raise "create reply obj unknow type.#{obj.class}"
+    case obj.jour_type
+      when 'Principal'
+        obj.jour.add_jour(nil, nil, nil, options)
+      when 'Project'
+        Project.add_new_jour(nil, nil, obj.jour_id, options)
+      when 'Course'
+        Course.add_new_jour(nil, nil, obj.jour_id, options)
+      when 'Bid'
+        obj.jour.add_jour(nil, nil, nil, options)
+      when 'Contest'
+        obj.jour.add_jour(nil, nil, obj.jour_id, options)
+      when 'Softapplication'
+        obj.jour.add_jour(nil, nil, obj.jour_id, options)
+      when 'HomeworkAttach'
+        obj.jour.add_jour(nil, nil, obj.jour_id, options)
     end
+    # obj = obj_distinguish_url_origin || User.find_by_id(2)
+    # if obj.kind_of? User
+    #   obj.add_jour(nil, nil, nil, options)
+    # elsif obj.kind_of? Project
+    #   Project.add_new_jour(nil, nil, obj.id, options)
+    # elsif obj.kind_of? Course
+    #   Course.add_new_jour(nil, nil, obj.id, options)
+    # elsif obj.kind_of? Bid
+    #   obj.add_jour(nil, nil, nil, options)
+    # elsif obj.kind_of? Contest
+    #   obj.add_jour(nil, nil, obj.id, options)   #new added
+    # elsif obj.kind_of? Softapplication
+    #   obj.add_jour(nil, nil, obj.id, options)   #new added
+    # elsif obj.kind_of? HomeworkAttach
+    #   obj.add_jour(nil, nil, obj.id, options)   #new added
+    # else
+    #   raise "create reply obj unknow type.#{obj.class}"
+    # end
   end
   #######end of message
 end
diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb
index fb1231287..e993b120f 100644
--- a/app/helpers/api_helper.rb
+++ b/app/helpers/api_helper.rb
@@ -489,4 +489,26 @@ module ApiHelper
     self.update_attribute(:praise_num, self.praise_num.to_i - num)
   end
 
+
+  class Errors
+    def self.define_error(arr)
+      @errors = {}
+      arr.each_with_index { |item, index|
+        if index %2 == 1
+          @errors[arr[index-1]] = item
+        end
+      }
+      if arr.count % 2== 1
+        @default_error =  arr.last
+      else
+        @default_error =  "未知错误"
+      end
+
+    end
+
+    def self.message(msg_id)
+      @errors[msg_id] || @default_error
+    end
+  end
+
 end
\ No newline at end of file
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 46fdb02f3..ee2e2d74a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3127,6 +3127,26 @@ def get_reply_parents parents_rely, comment
   parents_rely
 end
 
+#获取回复的所有父节点(不包括根节点)
+def get_reply_parents_no_root parents_rely, comment
+  if !comment.parent.nil? && !comment.parent.parent.nil?
+    parents_rely << comment.parent
+    get_reply_parents_no_root parents_rely, comment.parent
+  end
+  parents_rely
+end
+
+#获取留言的所有子节点
+def get_all_children result, jour
+  if jour.kind_of? JournalsForMessage
+    jour.children.each do |jour_child|
+      result << jour_child
+      get_all_children result, jour_child
+    end
+  end
+  result.sort! { |a,b| b.created_on <=> a.created_on }
+end
+
 #将有置顶属性的提到数组前面
 def sort_by_sticky topics
   tmpTopics = []
@@ -3283,3 +3303,20 @@ def get_hw_index(hw,is_teacher)
   index = hw_ids.index(hw.id)
   return index
 end
+
+def get_group_member_names work
+  result = ""
+  unless work.nil?
+    work.student_work_projects.each do |member|
+      user = User.where(:id => member.user_id).first
+      unless user.nil?
+        if result != ""
+          result += "、#{user.show_name}"
+        else
+          result += user.show_name
+        end
+      end
+    end
+  end
+  result
+end
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index c10652c6f..bb144472b 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -44,9 +44,9 @@ module CoursesHelper
   def visible_excellent_course obj
     # if course.is_pu
   end
-  
+
   # 返回x项目成员数量，即roles表中定义的所有成员
-  def projectCount project    
+  def projectCount project
     #searchCountByRoles project, AllPeople
     project.members.count
   end
@@ -147,10 +147,10 @@ module CoursesHelper
 
   # 返回学生数量，即roles表中定义的Reporter
   #def studentCount project
-   # searchStudent(project).count
-    # or
-    # searchStudent(project).count
- # end
+  # searchStudent(project).count
+  # or
+  # searchStudent(project).count
+  # end
 
   # 判断用户是否是课程的管理员
   # add by nwb
@@ -225,11 +225,11 @@ module CoursesHelper
   #end
 
   # 注意：此方法有问题，速度慢且结果不准
- # alias studentCountOrigin studentCount
+  # alias studentCountOrigin studentCount
   #def studentCount course
-   # count = studentCountOrigin course
-    #garble count
- # end
+  # count = studentCountOrigin course
+  #garble count
+  # end
 
   #获取课程所有成员
   def course_all_member course
@@ -265,7 +265,7 @@ module CoursesHelper
   def garble count
     count = count.round( 1-count.to_s.size ).to_i
     return count.to_s if count.to_s.size.eql?(1)
-    count.to_s << '+' 
+    count.to_s << '+'
   end
 
   # =====================================================================================
@@ -274,7 +274,7 @@ module CoursesHelper
     #searchPeopleByRoles(project, TeacherRoles)
     members = []
     project.members.includes(:user).each do |m|
-       members << m  if m && m.user && m.user.allowed_to?(:as_teacher,project)
+      members << m  if m && m.user && m.user.allowed_to?(:as_teacher,project)
     end
     members
   end
@@ -304,8 +304,8 @@ module CoursesHelper
     members
   end
 
-  
- 
+
+
   def searchStudent_by_name  project, name
     #searchPeopleByRoles(project, StudentRoles)
     members = []
@@ -324,29 +324,29 @@ module CoursesHelper
     mems = []
     if name != ""
       name = name.to_s.downcase
-     members.each do |m|
+      members.each do |m|
         username = m.user[:lastname].to_s.downcase + m.user[:firstname].to_s.downcase
         if(m.user[:login].to_s.downcase.include?(name) ||  m.user.user_extensions[:student_id].to_s.downcase.include?(name) || username.include?(name))
           mems << m
         end
       end
     else
-     mems = members
-   end
+      mems = members
+    end
     mems
   end
   def searchgroupmember_by_name  members, name, group
     #searchPeopleByRoles(project, StudentRoles)
     mems = []
     if name != ""
-    members.each do |m|
-    if m.course_group_id == group.id
-      username = m.user[:lastname].to_s + m.user[:firstname].to_s
-      if(m.user[:login].to_s.include?(name) ||  m.user.user_extensions[:student_id].to_s.include?(name) || username.include?(name))
-        mems << m
+      members.each do |m|
+        if m.course_group_id == group.id
+          username = m.user[:lastname].to_s + m.user[:firstname].to_s
+          if(m.user[:login].to_s.include?(name) ||  m.user.user_extensions[:student_id].to_s.include?(name) || username.include?(name))
+            mems << m
+          end
+        end
       end
-    end
-    end
     else
       mems = members
     end
@@ -458,7 +458,7 @@ module CoursesHelper
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs")
   end
-  
+
   def findCourseTime project
     str = ""
     begin
@@ -683,9 +683,9 @@ module CoursesHelper
     #file_count
     Attachment.where(container_id: @course_ids, container_type: Course).where("created_on>?", date_from).each do |attachment|
       if attachment.is_public? || User.current.member_of_course?(@course) || User.current.admin?
-      activities[attachment.container_id]+=1
+        activities[attachment.container_id]+=1
       else
-      activities[attachment.container_id]
+        activities[attachment.container_id]
       end
     end
 
@@ -704,8 +704,8 @@ module CoursesHelper
     #news
     News.where(course_id: @course_ids).where("created_on>?",date_from).each do |news|
       if news.author.member_of_course?(@course)
-      activities[news.course_id]+=1
-      end  
+        activities[news.course_id]+=1
+      end
     end
 
     #homework_count
diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
new file mode 100644
index 000000000..9c6c07109
--- /dev/null
+++ b/app/helpers/quality_analysis_helper.rb
@@ -0,0 +1,97 @@
+# encoding: utf-8
+module QualityAnalysisHelper
+
+  def sqale_rating_status val
+    arr = []
+    if val.to_i > 0 && val.to_i < 5
+      arr << "很好"
+      arr << "b_green2"
+    elsif  val.to_i > 5  && val.to_i < 10
+      arr << "较好"
+      arr << "b_slow_yellow"
+    elsif  val.to_i > 10  && val.to_i < 20
+      arr << "中等"
+      arr << "b_yellow"
+    elsif  val.to_i > 20  && val.to_i < 50
+      arr << "较差"
+      arr << "b_slow_red"
+    elsif val.to_i > 20
+      arr << "很差"
+      arr << "b_red"
+    end
+  end
+
+  def complexity_status val
+    arr = []
+    if val.to_i < 10
+      arr << "良好"
+      arr << "b_green2"
+    elsif  val.to_i > 10  && val.to_i < 15
+      arr << "较高"
+      arr << "b_yellow"
+    elsif val.to_i > 15
+      arr << "很高"
+      arr << "b_red"
+    end
+  end
+
+  def duplicated_lines_density_status val
+    arr = []
+    if val.to_i < 30
+      arr << "良好"
+      arr << "b_green2"
+    elsif  val.to_i > 30  && val.to_i < 50
+      arr << "较高"
+      arr << "b_yellow"
+    elsif val.to_i > 50
+      arr << "很高"
+      arr << "b_red"
+    end
+  end
+
+  def comment_lines_density_status val
+    arr = []
+    if val.to_i < 20
+      arr << "较低"
+      arr << "b_yellow"
+    elsif  val.to_i > 20  && val.to_i < 50
+      arr << "正常"
+      arr << "b_green2"
+    elsif val.to_i > 50
+      arr << "较高"
+      arr << "b_red"
+    end
+  end
+
+  def score_sqale_rating val
+    if val.to_i > 0 && val.to_i < 5
+      "5"
+    elsif  val.to_i > 5  && val.to_i < 10
+      "4"
+    elsif  val.to_i > 10  && val.to_i < 20
+      "3"
+    elsif  val.to_i > 20  && val.to_i < 50
+      "2"
+    elsif val.to_i > 20
+      "1"
+    end
+  end
+
+  def lines_scale val
+    if val.to_i < 5000
+      "小型"
+    elsif val.to_i >5000 && val.to_i < 50000
+      "中型"
+    else
+      "大型"
+    end
+  end
+
+  #统计答题百分比，统计结果保留两位小数
+  def statistics_result_percentage(e, t)
+    e = e.to_f
+    t = t.to_f
+    t == 0 ? 0 : format("%.2f", e*100/t)
+  end
+
+end
diff --git a/app/models/course.rb b/app/models/course.rb
index e3a845b11..0c4acce97 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -1,3 +1,5 @@
+#coding=utf-8
+
 require 'elasticsearch/model'
 class Course < ActiveRecord::Base
   include Redmine::SafeAttributes
@@ -65,7 +67,7 @@ class Course < ActiveRecord::Base
   acts_as_attachable :view_permission => :view_course_files,
                      :delete_permission => :manage_files
   
-  validates_presence_of :password, :term,:name
+  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_length_of :description, :maximum => 10000
@@ -92,6 +94,7 @@ class Course < ActiveRecord::Base
 
   acts_as_customizable
 
+  scope :not_deleted, lambda{where(is_delete: 0)}
   scope :all_course
   scope :active, lambda { where(:status => STATUS_ACTIVE) }
   scope :status, lambda {|arg| where(arg.blank? ? nil : {:status => arg.to_i}) }
@@ -405,6 +408,7 @@ class Course < ActiveRecord::Base
     self.course_messages << CourseMessage.new(:user_id => self.tea_id, :course_id => self.id, :viewed => false)
   end
 
+
   #项目与课程分离后，很多课程的名称等信息为空，这些数据信息存储在项目表中！！就是数据兼容的问题
   #def name
   #  read_attribute('name') || Project.find_by_identifier(self.extra).try(:name)
@@ -422,12 +426,14 @@ class Course < ActiveRecord::Base
   #   __elasticsearch__.delete_document
   # end
   def create_course_ealasticsearch_index
+    return if Rails.env.development?
     if self.is_public == 1 and self.is_delete == 0  #公开 和 没有被删除的课程才被索引
       self.__elasticsearch__.index_document
     end
   end
 
   def update_course_ealasticsearch_index
+    return if Rails.env.development?
     if self.is_public == 1 and self.is_delete == 0 #如果是初次更新成为公开或者恢复被删除的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
       begin
         self.__elasticsearch__.update_document
@@ -444,6 +450,7 @@ class Course < ActiveRecord::Base
   end
 
   def delete_course_ealasticsearch_index
+    return if Rails.env.development?
     begin
         self.__elasticsearch__.delete_document
     rescue => e
@@ -451,6 +458,35 @@ class Course < ActiveRecord::Base
     end
   end
 
+  # 延迟生成邀请码
+  def invite_code
+    return generate_invite_code
+  end
+
+  # 生成邀请码
+  CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
+  def generate_invite_code
+    code = read_attribute(:invite_code)
+    if !code || code.size <5
+      code = CODES.sample(5).join
+      return generate_invite_code if Course.where(invite_code: code).present?
+      update_attribute(:invite_code, code)
+    end
+    code
+  end
+
+
+  def generate_qrcode
+    ticket = self.qrcode
+    if !ticket || ticket.size < 10
+      response = Wechat.api.qrcode_create_scene(invite_code)
+      logger.debug "response = #{response}"
+      self.qrcode = response['ticket']
+      save! && reload
+      ticket = qrcode
+    end
+    ticket
+  end
 
 end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index ceec0e182..bbc639f3d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -155,7 +155,7 @@ class Project < ActiveRecord::Base
   #ActiveModel::Dirty 这里有一个changed方法。对任何对象都可以用
   after_save :update_inherited_members, :if => Proc.new {|project| project.inherit_members_changed?}
   # 创建project之后默认创建一个board，之后的board去掉了board的概念
-  after_create :create_board_sync,:acts_as_forge_activities,:create_project_ealasticsearch_index
+  after_create :create_board_sync,:acts_as_forge_activities, :create_project_ealasticsearch_index
   before_destroy :delete_all_members,:delete_project_ealasticsearch_index
   after_update :update_project_ealasticsearch_index
   def remove_references_before_destroy
diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb
new file mode 100644
index 000000000..229be9826
--- /dev/null
+++ b/app/models/quality_analysis.rb
@@ -0,0 +1,7 @@
+class QualityAnalysis < ActiveRecord::Base
+  attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier, :language
+
+  def user_rep_name
+    self.author_login+":"+self.rep_identifier
+  end
+end
diff --git a/app/models/sonar_analysis.rb b/app/models/sonar_analysis.rb
new file mode 100644
index 000000000..0bb2089de
--- /dev/null
+++ b/app/models/sonar_analysis.rb
@@ -0,0 +1,3 @@
+class SonarAnalysis < ActiveRecord::Base
+  attr_accessible :author_login, :project_id, :rep_identifier
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 258fe2ea5..daf1237cf 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -145,6 +145,7 @@ class User < Principal
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   has_many :principal_acts, :class_name => 'PrincipalActivity',:as =>:principal_act ,:dependent => :destroy
   has_many :file_commit, :class_name => 'Attachment', :foreign_key => 'author_id', :conditions => "container_type = 'Project' or container_type = 'Version'"
+  has_many :course_attachments , :class_name => 'Attachment', :foreign_key => 'author_id', :conditions => "container_type = 'Course'"
 ####
 # added by bai
   has_many :join_in_contests, :dependent => :destroy
@@ -248,7 +249,7 @@ class User < Principal
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy,:delete_user_ealasticsearch_index
   # added by fq
-  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity,:create_user_ealasticsearch_index
+  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity,:create_user_ealasticsearch_index,:add_new_jour
   # end
   # 更新邮箱用户或用户名的同事，同步更新邀请信息
   after_update :update_invite_list,:update_user_ealasticsearch_index
@@ -1145,6 +1146,22 @@ class User < Principal
     end
   end
 
+  #为新注册用户发送留言
+  def add_new_jour
+     if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
+       lead_message1 = Message.find(19278)
+       notes1 = lead_message1.content
+    #   lead_message2 = Message.find(19292)
+    #   notes2 = lead_message2.content
+    #   lead_message3 = Message.find(19291)
+    #   notes3 = lead_message3.content
+    #   # user_id 默认为课程使者创建
+       self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+     end
+  end
+
   # 更新邮箱的同事，更新invite_lists表中的邮箱信息
   def update_invite_list
     invite_lists = InviteList.where("user_id =?",self.id).all
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 2c8387349..dce3e1f18 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -32,6 +32,18 @@ class CoursesService
     course_list
   end
 
+
+  def user_courses_list(current_user)
+    courses = current_user.courses.not_deleted
+    courses.inject([]) {|course_list, course|
+      course_list << {:course => course,:img_url => url_to_avatar(course),
+                      :current_user_is_member => current_user.member_of_course?(course),
+                      :current_user_is_teacher => is_course_teacher(current_user,course),
+                      course_student_num: searchStudent(course).count
+      }
+    }
+  end
+
   #搜索课程
   def search_course params,current_user
     courses_all = Course.all_course
@@ -68,7 +80,6 @@ class CoursesService
     if current_user.nil? || !(current_user.admin? || c.is_public == 1 || (c.is_public == 0 && current_user.member_of_course?(c)))
       raise '403'
     end
-    @teachers= searchTeacherAndAssistant(c)
     #@canShowCode = isCourseTeacher(User.current.id,course) && params[:role] != '1'
     case params[:role]
       when '1'
@@ -87,7 +98,11 @@ class CoursesService
       gender = m.user.user_extensions.gender.nil? ? 0 : m.user.user_extensions.gender
       work_unit = get_user_work_unit m.user
       location = get_user_location m.user
-      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender, :work_unit => work_unit, :mail => m.user.mail, :location => location, :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
+      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender,
+                :work_unit => work_unit, :mail => m.user.mail, :location => location,
+                role_name: m.roles.first.name,
+                name: m.user.show_name,
+                :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
     end
     users
   end
@@ -162,6 +177,9 @@ class CoursesService
   #显示课程
   def show_course(params,current_user)
     course = Course.find(params[:id])
+    course.generate_invite_code
+    course.generate_qrcode
+
     if course.school
       work_unit = course.school.name
     else
@@ -193,7 +211,7 @@ class CoursesService
       @course.extra = 'course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
       @course.send(:safe_attributes=, params[:course], current_user)
       #@course.safe_attributes(current_user,params[:course])
-      @course.password = params[:course][:password]
+      #@course.password = params[:course][:password]
       @course.tea_id = current_user.id
       @course.term = params[:term]
       @course.time = params[:time]
@@ -252,7 +270,7 @@ class CoursesService
   def edit_course(params,course,current_user)
     course.send(:safe_attributes=, params[:course], current_user)
     #course.safe_attributes = params[:course]
-    course.password = params[:course][:password]
+    #course.password = params[:course][:password]
     course.time = params[:time]
     course.term = params[:term]
     course.end_time = params[:end_time]
@@ -300,23 +318,27 @@ class CoursesService
     @state
   end
 
+  class JoinCourseError < Errors
+    define_error [
+        0, '加入成功',
+        1, '密码错误',
+        2, '课程已过期 请联系课程管理员重启课程。',
+        3, '您已经加入了课程',
+        4, '您加入的课程不存在',
+        5, '您还未登录',
+        6, '申请成功，请等待审核完毕',
+        7, '您已经发送过申请了，请耐心等待',
+        8, '您已经是该课程的教师了',
+        9, '您已经是该课程的教辅了',
+        10, '您已经是该课程的管理员了',
+        '未知错误，请稍后再试'
+    ]
+  end
   #加入课程
   #object_id：课程id
   #course_password ：加入课程的密码
-  #@state == 0 加入成功
-  #@state == 1 密码错误
-  #@state == 2 课程已过期 请联系课程管理员重启课程。(在配置课程处)
-  #@state == 3 您已经加入了课程
-  #@state == 4 您加入的课程不存在
-  #@state == 5 您还未登录
-  #@state == 6 申请成功，请等待审核完毕
-  #@state == 7 您已经发送过申请了，请耐心等待
-  #@state == 8 您已经是该课程的教师了
-  #@state == 9 您已经是该课程的教辅了
-  #@state == 10 您已经是该课程的管理员了
-  #@state 其他 未知错误，请稍后再试
   def join_course params,current_user
-    course = Course.find_by_id params[:object_id]
+    course = Course.find_by_invite_code(params[:invite_code]) if params[:invite_code]
 
     @state = 10
     if course
@@ -326,7 +348,7 @@ class CoursesService
         if current_user.member_of_course?(course) #如果已经是成员
           member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
           roleName = member.roles[0].name if member
-          if params[:course_password] == course.password
+          if params[:invite_code].present?
             #如果加入角色为学生 并且当前是学生
             if params[:role] == "10" && roleName == "Student"
               @state = 3
@@ -341,7 +363,7 @@ class CoursesService
               #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求
             elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" )
               #如果已经发送过消息了，那么就要给个提示
-              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0
+              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0
                 @state = 7
               else
                 Mailer.run.join_course_request(course, User.current, params[:role])
@@ -352,19 +374,19 @@ class CoursesService
             elsif params[:role] == "10" && roleName != "Student"
               member.role_ids = [params[:role]]
               member.save
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
               @state = 0
             end
           else
             @state = 1
           end
         else
-          if params[:course_password] == course.password
+          if params[:invite_code].present?
             if params[:role] == "10" || params[:role] == nil
               members = []
               members << Member.new(:role_ids => [10], :user_id => current_user.id)
               course.members << members
-              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
               @state = 0
             else
               #如果已经发送过消息了，那么就要给个提示
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 9617b7f76..7d8aaed86 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -87,11 +87,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @article.try(:author).try(:realname) == ' ' %>
-            <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
@@ -126,11 +122,6 @@
             </span>
           </div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @article.id %>">
           <%@article.children.reorder('created_on desc').each_with_index  do |reply,i| %>
@@ -146,11 +137,7 @@
                 </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 %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 3b6d55d96..dbe03d67f 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -1,6 +1,6 @@
 <script type="text/javascript">
     function submit_copy_course() {
-        if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new')&&regex_course_password('new'))
+        if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
         {
             $("#new_course").submit();
             document.getElementById("submit_copy_course").onclick = "";
@@ -79,15 +79,15 @@
       <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
     </li>
     <div class="cl"></div>
-    <li class="ml45 mb10">
-      <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+    <!--<li class="ml45 mb10">
+      <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
       <input type="text" style="display: none;">
-      <input  type="text" name="course[password]" id="new_course_course_password" class="hwork_input02 grey_border" onkeyup="regex_course_password('new');" value="<%=@course.password %>">
-      <!--<a id="psw_btn" href="javascript:void(0)">显示明码</a>-->
+      <input  type="text" name="course[password]" id="new_course_course_password" class="hwork_input02 grey_border" onkeyup="regex_course_password('new');" value="<%#=@course.password %>">
+      &lt;!&ndash;<a id="psw_btn" href="javascript:void(0)">显示明码</a>&ndash;&gt;
       <span class="c_red" id="new_course_course_password_notice"></span>
       <div class="cl"></div>
       <span class="ml95 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-    </li>
+    </li>-->
     <li class="ml50">
       <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
       <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl grey_border"  ><%= @course.description.nil? ? "" : @course.description %></textarea>
diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 873144afe..96c9a2b7d 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -49,8 +49,8 @@
 <div id="popbox">
   <div class="C"  >
     <div class="C_top">
-      <h2>快速进入课程通道</h2>
-      <p>只要持有课程ID和密码，就可快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
+      <h2>快速加入课程通道</h2>
+      <p>只要持有课程邀请码，就可以快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
     </div>
     <div class="C_form">
       <%= form_tag({:controller => 'courses',
@@ -62,17 +62,13 @@
             <li>
               <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
               <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-              <span class="tips" style="width: 68px; display: inline-block;">课&nbsp;程&nbsp;ID：</span>
-              <input class=" width190" name="object_id" id="object_id" type="text" value="" >
+              <span class="tips" style="width: 90px; display: inline-block;">课程邀请码：</span>
+              <input class="width190" style="margin-left: 0px;" name="invite_code" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>
             </li>
-            <li class="mB5">课程ID是所在课程网址中显示的序号</li>
-            <li>
-              <span class="tips" style="width: 68px; display: inline-block;">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
-              <input class=" width190" type="password" name="course_password" id="course_password" value="" >
-            </li>
-            <li style="margin-top: 30px;">
-              <span style="margin-right: 20px;">身&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份：</span>
+            <li class="mB5">课程邀请码是所在课程页面中显示的邀请码</li>
+            <li style="margin-top: 15px;">
+              <span style="margin-right: 5px;"><span style="margin-right:43px;">身</span><span>份</span>：</span>
               <% if User.current.logged? && User.current.extensions &&  User.current.extensions.identity == 0%>
                   <select name="role" class="IDType">
                     <option value="9">教师</option>
diff --git a/app/views/courses/course_outline.js.erb b/app/views/courses/course_outline.js.erb
index 490361a24..df968955a 100644
--- a/app/views/courses/course_outline.js.erb
+++ b/app/views/courses/course_outline.js.erb
@@ -6,4 +6,5 @@ $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before(' <a href="javascript:void(0);" onclick="hideModal()" class="resourceClose" style="margin-left: 285px"></a>');
 $('#ajax-modal').parent().css("top","30%").css("left","50%");
 $('#ajax-modal').parent().addClass("courseOutlinePopup");
+$('#ajax-modal').parent().removeClass("copyCoursePopup");
 $('#ajax-modal').css("padding-left","16px")//.css("padding-bottom","16px");
diff --git a/app/views/courses/join.js.erb b/app/views/courses/join.js.erb
index 8102098d5..04a77f87b 100644
--- a/app/views/courses/join.js.erb
+++ b/app/views/courses/join.js.erb
@@ -6,14 +6,14 @@ $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(@c
 alert("加入成功");
 hideModal();
 $("#try_join_course_link").replaceWith("<a href='<%=url_for(:controller => 'homework_common', :action => 'index',:course=>@course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品</a>");
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 1 %>
 alert("密码错误");
 <% elsif @state == 2 %>
 alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
 <% elsif @state == 3 %>
 alert("您已经加入了课程");
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 4 %>
 alert("您加入的课程不存在");
 <% elsif @state == 5 %>
@@ -27,15 +27,15 @@ hidden_join_course_form();
 <% elsif @state == 8%>
 alert("您已经是该课程的教师了");
 hidden_join_course_form();
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 9%>
 alert("您已经是该课程的教辅了");
 hidden_join_course_form();
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 10%>
 alert("您已经是该课程的管理员了");
 hidden_join_course_form();
-window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
+window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% else %>
 alert("未知错误，请稍后再试");
 <% end %>
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index ef1a0fc58..ddaf17ae8 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -32,15 +32,15 @@
           <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
         </li>
         <div class="cl"></div>
-        <li class="ml45 mb10">
-          <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+        <!--<li class="ml45 mb10">
+          <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
           <input type="text" style="display: none;">
           <input  type="password" name="course[password]" id="new_course_course_password" class="hwork_input02" onkeyup="regex_course_password('new');">
           <a id="psw_btn" href="javascript:void(0)">显示明码</a>
           <span class="c_red" id="new_course_course_password_notice"></span>
           <div class="cl"></div>
           <span class="ml80 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-        </li>
+        </li>-->
         <li class="ml45">
           <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
           <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl"  ></textarea>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 82123a767..3afa8387a 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -57,14 +57,14 @@
             <span class="c_red" id="edit_course_time_term_notice"></span>
           </li>
           <div class="cl"></div>
-          <li class="ml45 mb10">
-            <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
-            <input  type="password" name="course[password]" id="edit_course_course_password" class="hwork_input02" value="<%= @course.password%>" onkeyup="regex_course_password('edit');">
+          <!--<li class="ml45 mb10">
+            <label><span class="c_red">*</span>&nbsp;<%#= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
+            <input  type="password" name="course[password]" id="edit_course_course_password" class="hwork_input02" value="<%#= @course.password%>" onkeyup="regex_course_password('edit');">
             <a id="psw_btn" href="javascript:void(0)">显示明码</a>
             <span class="c_red" id="edit_course_course_password_notice"></span>
             <div class="cl"></div>
             <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
-          </li>
+          </li>-->
           <li class="ml45">
             <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
             <textarea  name="course[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl"  maxlength="6000"><%= @course.description%></textarea>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index f2d9cbdbd..f369f2b49 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -75,11 +75,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @article.try(:author).try(:realname) == ' ' %>
-            <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
@@ -109,11 +105,6 @@
         <div class="homepagePostReplyBanner">
           <div class="homepagePostReplyBannerCount">回复（<%=count %>）</div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @article.id %>">
           <%@article.children.reorder('created_on desc').each_with_index  do |reply,i| %>
@@ -129,11 +120,7 @@
                 </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 %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index cbb56025e..bdfd2c96f 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -1,23 +1,22 @@
-<table class="hwork-table-wrap">
-  <tr class="b_grey hworkH30" style="border-bottom:1px solid #eaeaea;">
-    <th class="hworkList340 width530" colspan="6">
-      <span class="c_dark f14 fb fl mr5">序号</span>
-      <span class="c_dark f14 fb fl mr55">&nbsp;&nbsp;</span>
-      <span class="c_dark f14 fb fl mr60">姓名</span>
-      <span class="c_dark f14 fb fl mr60">学号</span>
-      <span class="c_dark f14 fb fl">班级</span>
-    </th>
+<table class="hwork-table-wrap" style="border-bottom:1px solid #eaeaea;">
+  <tr class="b_grey hworkH30">
+    <th class="hworkList30 pl5 pr5"><span class="c_dark f14 fb">序号</span></th>
+    <th class="hworkList50">&nbsp;&nbsp;</th>
+    <th class="hworkList60"><span class="c_dark f14 fb">姓名</span></th>
+    <th class="hworkList80"><span class="c_dark f14 fb">学号</span></th>
+    <th class="hworkList80"><span class="c_dark f14 fb">班级</span></th>
+    <th width="230">&nbsp;&nbsp;</th>
     <th class="hworkList130">
-      <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+      <%= link_to "时间",'',:class => "c_dark f14 fb" ,:remote => true%>
     </th>
     <th class="hworkList50">
-      <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%>
+      <%= link_to "成绩",'',:class => "c_dark f14 fb",:remote => true%>
     </th>
   </tr>
 
   <% @exercise_users_list.each_with_index do |exercise, index|%>
       <tr class="hworkListRow" id="student_work_<%= exercise.id%>">
-        <td class="pl5 pr5" style="width:28px; text-align:center;"><%=index + 1 %></td>
+        <td class="pl5 pr5" style="text-align:center;"><%=index + 1 %></td>
         <td class="hworkPortrait pr10 float-none">
           <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;", :class => "mt15"),user_activities_path(exercise.user)) %>
         </td>
@@ -30,7 +29,7 @@
         <td class="hworkStID student_work_<%= exercise.id%> float-none" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
           --
         </td>
-        <td width="200">&nbsp;</td>
+        <td width="230">&nbsp;</td>
         <td class="hworkList130 c_grey">
           <% if exercise.created_at%>
               <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb
index bea3f3872..ee8172cbd 100644
--- a/app/views/forums/create.js.erb
+++ b/app/views/forums/create.js.erb
@@ -1,7 +1,7 @@
 <%if @save_flag%>
 //$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
 //$('#reorder_time').click();
-    window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
+    window.location.href= "<%= host_with_protocol %>"+"/forums/" + "<%= @forum.id%>"
 <%else%>
     $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 35f4658f9..167ae98f0 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -45,11 +45,15 @@
         <li>
           <a href="javascript:void(0);" class="menu_arrow" style="font-size:16px; color:#4b4b4b; font-weight: normal; padding-left: 0px;">作业</a>
           <ul style="max-height:240px; overflow-y:auto; overflow-x:hidden;">
-            <% @homework_commons.each_with_index do |homework_common,index |%>
-                <li class="pr10">
-                  <%= link_to "作业#{@homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id),:target=>"_blank"%>
-                </li>
-            <% end%>
+            <% if @homework_commons.empty? %>
+                <li class="pr10" style="font-weight: normal; color: #888888; width: 120px; padding-left: 15px; padding-bottom: 5px;">目前尚未发布作业</li>
+            <% else %>
+                <% @homework_commons.each_with_index do |homework_common,index |%>
+                    <li class="pr10">
+                      <%= link_to "作业#{@homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id),:target=>"_blank"%>
+                    </li>
+                <% end%>
+            <% end %>
           </ul>
         </li>
       </ul>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 7ba0a23be..d8adece15 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -91,6 +91,8 @@
 </div>
 
 <script type="text/javascript">
+    var onUserMessages = false;
+    var onNotice = false;
     //搜索相关
     $("#navHomepageSearch").mouseover(function(){
         $("#navHomepageSearchType").show();
@@ -99,13 +101,28 @@
     });
 
     $("#user_messages").mouseenter(function(){
+        onNotice = true;
         $("#user_messages_list").show();
-        $.get('<%=user_messages_unviewed_users_path %>');
-        $("#ajax-indicator").hide();
+        if($("#message_list_detail").length == 0){
+            $.get('<%=user_messages_unviewed_users_path %>');
+            $("#ajax-indicator").hide();
+        }
+        var obj = $("#user_messages_list");
+        clearTimeout(obj.timer);
     }).mouseleave(function(){
-        $("#user_messages_list").hide();
-        $("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
-
+        onNotice = false;
+        var obj = $("#user_messages_list");
+        setTimeout(function(){
+            if(!onNotice && !onUserMessages) {
+                obj.hide();
+                obj.html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
+            } }, 500);
+    });
+    $("#message_list_detail").mouseenter(function(event){
+        event.stopPropagation();
+        onUserMessages = true;
+    }).mouseleave(function(){
+        onUserMessages = false;
     });
 
     $("#navHomepageProfile").mouseenter(function(){
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index addd04815..a4df961d3 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -1,20 +1,24 @@
 <font></font>
+<div id="message_list_detail">
 <h4 class="shadowbox_news_title">未读消息</h4>
+<p style="display: none;" id="none_message" class="shadowbox_news_p text_c">无未读消息</p>
 <ul class="shadowbox_news_list">
   <% messages.each do |ma| %>
     <% if ma.class == SystemMessage %>
-      <li><a href="<%=user_system_messages_path(User.current) %>" target="_blank" title="Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>"><span class="shadowbox_news_user">Trustie平台 </span>发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%></a></li>
+        <li><a href="<%=user_system_messages_path(User.current) %>" target="_blank" title="Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>"><span class="shadowbox_news_user">Trustie平台 </span>发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%></a></li>
     <% elsif ma.class == CourseMessage %>
       <% if ma.course_message_type == "News" %>
-        <li><a href="<%=news_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 发布了通知：<%= ma.course_message.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>发布了通知：<%= ma.course_message.title%></a></li>
+          <li><a href="<%=news_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 发布了通知：<%= ma.course_message.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>发布了通知：<%= ma.course_message.title%></a></li>
       <% elsif ma.course_message_type == "Comment" %>
-        <li><a href="<%=news_path(ma.course_message.commented.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 评论了通知：<%=ma.course_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>评论了通知：<%= ma.course_message.commented.title%></a></li>
+          <li><a href="<%=news_path(ma.course_message.commented.id) %>" target="_blank" title="<%=ma.course_message.author.show_name %> 评论了通知：<%=ma.course_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span>评论了通知：<%= ma.course_message.commented.title%></a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
           <li><a href="<%= (!User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil?) ? new_student_work_path(:homework => ma.course_message.id) : student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程作业：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程作业：作业标题：<%= ma.course_message.name%></a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了</a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 启动了作业匿评：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>启动了作业匿评：作业标题：<%= ma.course_message.name%></a></li>
+      <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
+          <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 关闭了作业匿评：作业标题：<%= ma.course_message.name%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>关闭了作业匿评：作业标题：<%= ma.course_message.name%></a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 启动作业匿评失败：<%= ma.course_message.name%>(失败原因：提交作品的人数低于2人)"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>启动作业匿评失败：<%= ma.course_message.name%>(失败原因：提交作品的人数低于2人)</a></li>
       <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 5 %>
@@ -32,104 +36,133 @@
               <% href = 'javascript:void(0)' %>
           <% end %>
           <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.user.show_name %> 申请引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>申请引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
-          <% elsif ma.course_message_type == "ApplyResource" && ma.status == 1 %>
-              <% if ma.course_message.container_type == "Course" %>
-                  <% href = course_files_path(ma.course_message.container_id) %>
-              <% elsif ma.course_message.container_type == "Project" %>
-                  <% href = project_files_path(ma.course_message.container_id) %>
-              <% elsif ma.course_message.container_type == "OrgSubfield" %>
-                  <% href = org_subfield_files_path(ma.course_message.container_id) %>
-              <% else %>
-                  <% href = 'javascript:void(0)' %>
-              <% end %>
-              <li><a href="<%= href %>" target="_blank" title="<%=User.find(ma.course_message.apply_user_id).show_name %> <%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=User.find(ma.course_message.apply_user_id).show_name %> </span><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
-          <% elsif ma.course_message_type == "Poll" %>
-              <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) %>
-              <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>
-          <% elsif ma.course_message_type == "JournalsForMessage" %>
-              <% if ma.course_message.jour_type == 'Course' %>
-                  <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在课程中留言了：<%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在课程中留言了：<%= ma.course_message.notes.html_safe%></a></li>
-              <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
-                  <li><a href="<%= homework_common_index_url_in_org(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%></a></li>
-              <% else %>
-                  <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> </span>回复了作品评论：<%= ma.course_message.notes%></a></li>
-              <% end %>
-          <% elsif ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
-              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id) %>" target="_blank" title="<%=ma.course_message.homework_common.user.show_name %>老师 发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评"><span class="shadowbox_news_user"><%=ma.course_message.homework_common.user.show_name %>老师 </span>发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评</a></li>
-          <% elsif ma.course_message_type == "StudentWork" && ma.status == 1 %>
-              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 重新提交了作品：<%=ma.course_message.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>重新提交了作品：<%=ma.course_message.name %></a></li>
-          <% elsif ma.course_message_type == "StudentWork" && ma.status == 2 %>
-              <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 追加新附件了：作业标题：<%=ma.course_message.homework_common.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>追加新附件了：作业标题：<%=ma.course_message.homework_common.name %></a></li>
-          <% elsif ma.course_message_type == "Course" %>
-              <li><a href="<%=course_path(ma.course_message) %>" target="_blank" title="系统提示 您成功创建了课程：课程名称：<%=ma.course_message.name %>"><span class="shadowbox_news_user">系统提示 </span>您成功创建了课程：课程名称：<%=ma.course_message.name %></a></li>
-          <% elsif ma.course_message_type == "JoinCourseRequest" %>
-              <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}" %>
-              <li><a href="<%=user_path(User.find(ma.course_message_id), :course_id => ma.course_id) %>" target="_blank" title="系统提示 您有了新的课程成员申请：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>您有了新的课程成员申请：<%=content %></a></li>
-          <% elsif ma.course_message_type == "CourseRequestDealResult" %>
-              <% content = ma.status == 1 ? '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
-              <li><a href="<%=course_path(Course.find(ma.course_id)) %>" target="_blank" title="系统提示 课程申请进度反馈：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>课程申请进度反馈：<%=content %></a></li>
-          <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
-              <li><a href="<%=course_member_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您加入了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您加入了课程：<%=ma.course.name %></a></li>
-          <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %>
-              <li><a href="<%=user_path(ma.course_message_id) %>" target="_blank" title="系统提示 您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>"><span class="shadowbox_news_user">系统提示 </span>您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %></a></li>
-          <% elsif ma.course_message_type == "RemoveFromCourse" %>
-              <li><a href="<%=member_course_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您移出了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您移出了课程：<%=ma.course.name %></a></li>
-          <% elsif ma.course_message_type == "Exercise" && ma.status == 2 %>
-              <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程测验：测验题目:<%=ma.course_message.exercise_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程测验：测验题目:<%=ma.course_message.exercise_name %></a></li>
-          <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
-              <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
-          <% end %>
-      <% elsif ma.class == ForgeMessage %>
-          <% if ma.forge_message_type == "AppliedProject" %>
-              <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>
-          <% elsif ma.forge_message_type == "JoinProject" %>
-              <li><a href="<%=project_member_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您加入了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您加入了项目：<%= ma.project.name%></a></li>
-          <% elsif ma.forge_message_type == "RemoveFromProject" %>
-              <li><a href="<%=member_project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您移出了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您移出了项目：<%= ma.project.name%></a></li>
-          <% elsif ma.forge_message_type == "RemoveFromProject" %>
-              <li><a href="<%=project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 邀请你加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>邀请你加入项目：<%= ma.project.name%></a></li>
-          <% elsif ma.forge_message_type == "Issue" && ma.status == 1 %>
-              <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！</a></li>
-          <% elsif ma.forge_message_type == "Issue" && ma.status != 1 %>
-              <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%></a></li>
-          <% 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>
-          <% 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" %>
-              <li><a href="<%=news_path(ma.forge_message.commented.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>评论了新闻：<%= ma.forge_message.commented.title%></a></li>
-          <% end %>
-      <% elsif ma.class == MemoMessage %>
-          <% if ma.memo_type == "Memo" %>
-              <li><a href="<%=forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id) %>" target="_blank" title="<%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%>"><span class="shadowbox_news_user"><%=ma.memo.author.show_name %> </span><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%></a></li>
-          <% end %>
-      <% elsif ma.class == UserFeedbackMessage %>
-          <% if ma.journals_for_message_type == "JournalsForMessage" %>
-              <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.journals_for_message.user.show_name %> <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%>"><span class="shadowbox_news_user"><%=ma.journals_for_message.user.show_name %> </span><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%></a></li>
-          <% end %>
-      <% elsif ma.class == OrgMessage %>
-          <% if ma.message_type == 'ApplySubdomain' %>
-              <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><span class="shadowbox_news_user"><%=ma.organization.name %> </span>申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%></a></li>
-          <% elsif ma.message_type == 'AgreeApplySubdomain' %>
-              <li><a href="javascript:void(0)" target="_blank" title="系统提示 管理员同意了您的子域名申请：<%= ma.content%>"><span class="shadowbox_news_user">系统提示 </span>管理员同意了您的子域名申请：<%= ma.content%></a></li>
+      <% elsif ma.course_message_type == "ApplyResource" && ma.status == 1 %>
+          <% if ma.course_message.container_type == "Course" %>
+              <% href = course_files_path(ma.course_message.container_id) %>
+          <% elsif ma.course_message.container_type == "Project" %>
+              <% href = project_files_path(ma.course_message.container_id) %>
+          <% elsif ma.course_message.container_type == "OrgSubfield" %>
+              <% href = org_subfield_files_path(ma.course_message.container_id) %>
+          <% else %>
+              <% href = 'javascript:void(0)' %>
           <% end %>
-      <% elsif AtMessage === ma && ma.at_valid? %>
-          <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
-            <% href = course_boards_path(ma.at_message.course,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
-          <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
-              <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+          <li><a href="<%= href %>" target="_blank" title="<%=User.find(ma.course_message.apply_user_id).show_name %> <%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%>"><span class="shadowbox_news_user"><%=User.find(ma.course_message.apply_user_id).show_name %> </span><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：<%= ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)%></a></li>
+      <% elsif ma.course_message_type == "Poll" %>
+          <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) %>
+          <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>
+      <% elsif ma.course_message_type == "JournalsForMessage" %>
+          <% if ma.course_message.jour_type == 'Course' %>
+              <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在课程中留言了：<%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在课程中留言了：<%= ma.course_message.notes.html_safe%></a></li>
+          <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
+              <li><a href="<%= homework_common_index_url_in_org(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= ma.course_message.notes.html_safe%></a></li>
           <% else %>
-            <% href = ma.url %>
+              <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> </span>回复了作品评论：<%= ma.course_message.notes%></a></li>
           <% end %>
-          <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
+      <% elsif ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
+          <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id) %>" target="_blank" title="<%=ma.course_message.homework_common.user.show_name %>老师 发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评"><span class="shadowbox_news_user"><%=ma.course_message.homework_common.user.show_name %>老师 </span>发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评</a></li>
+      <% elsif ma.course_message_type == "StudentWork" && ma.status == 1 %>
+          <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 重新提交了作品：<%=ma.course_message.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>重新提交了作品：<%=ma.course_message.name %></a></li>
+      <% elsif ma.course_message_type == "StudentWork" && ma.status == 2 %>
+          <li><a href="<%=student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>同学 追加新附件了：作业标题：<%=ma.course_message.homework_common.name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>同学 </span>追加新附件了：作业标题：<%=ma.course_message.homework_common.name %></a></li>
+      <% elsif ma.course_message_type == "Course" %>
+          <li><a href="<%=course_path(ma.course_message) %>" target="_blank" title="系统提示 您成功创建了课程：课程名称：<%=ma.course_message.name %>"><span class="shadowbox_news_user">系统提示 </span>您成功创建了课程：课程名称：<%=ma.course_message.name %></a></li>
+      <% elsif ma.course_message_type == "JoinCourseRequest" %>
+          <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}" %>
+          <li><a href="<%=user_path(User.find(ma.course_message_id), :course_id => ma.course_id) %>" target="_blank" title="系统提示 您有了新的课程成员申请：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>您有了新的课程成员申请：<%=content %></a></li>
+      <% elsif ma.course_message_type == "CourseRequestDealResult" %>
+          <% content = ma.status == 1 ? '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
+          <li><a href="<%=course_path(Course.find(ma.course_id)) %>" target="_blank" title="系统提示 课程申请进度反馈：<%=content %>"><span class="shadowbox_news_user">系统提示 </span>课程申请进度反馈：<%=content %></a></li>
+      <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
+          <li><a href="<%=course_member_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您加入了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您加入了课程：<%=ma.course.name %></a></li>
+      <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %>
+          <li><a href="<%=user_path(ma.course_message_id) %>" target="_blank" title="系统提示 您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>"><span class="shadowbox_news_user">系统提示 </span>您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %></a></li>
+      <% elsif ma.course_message_type == "RemoveFromCourse" %>
+          <li><a href="<%=member_course_path(ma.course) %>" target="_blank" title="<%=User.find(ma.course_message_id).show_name %> 将您移出了课程：<%=ma.course.name %>"><span class="shadowbox_news_user"><%=User.find(ma.course_message_id).show_name %> </span>将您移出了课程：<%=ma.course.name %></a></li>
+      <% elsif ma.course_message_type == "Exercise" && ma.status == 2 %>
+          <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布了课程测验：测验题目:<%=ma.course_message.exercise_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布了课程测验：测验题目:<%=ma.course_message.exercise_name %></a></li>
+      <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
+          <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
+      <% end %>
+    <% elsif ma.class == ForgeMessage %>
+      <% if ma.forge_message_type == "AppliedProject" %>
+          <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>
+      <% elsif ma.forge_message_type == "JoinProject" %>
+          <li><a href="<%=project_member_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您加入了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您加入了项目：<%= ma.project.name%></a></li>
+      <% elsif ma.forge_message_type == "RemoveFromProject" %>
+          <li><a href="<%=member_project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 将您移出了项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>将您移出了项目：<%= ma.project.name%></a></li>
+      <% elsif ma.forge_message_type == "RemoveFromProject" %>
+          <li><a href="<%=project_path(ma.project) %>" target="_blank" title="<%=User.find(ma.forge_message_id).show_name %> 邀请你加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=User.find(ma.forge_message_id).show_name %> </span>邀请你加入项目：<%= ma.project.name%></a></li>
+      <% elsif ma.forge_message_type == "Issue" && ma.status == 1 %>
+          <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！</a></li>
+      <% elsif ma.forge_message_type == "Issue" && ma.status != 1 %>
+          <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%></a></li>
+      <% 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>
+      <% 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" %>
+          <li><a href="<%=news_path(ma.forge_message.commented.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>评论了新闻：<%= ma.forge_message.commented.title%></a></li>
+      <% end %>
+    <% elsif ma.class == MemoMessage %>
+      <% if ma.memo_type == "Memo" %>
+          <li><a href="<%=forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id) %>" target="_blank" title="<%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%>"><span class="shadowbox_news_user"><%=ma.memo.author.show_name %> </span><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%></a></li>
+      <% end %>
+    <% elsif ma.class == UserFeedbackMessage %>
+      <% if ma.journals_for_message_type == "JournalsForMessage" %>
+          <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.journals_for_message.user.show_name %> <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%>"><span class="shadowbox_news_user"><%=ma.journals_for_message.user.show_name %> </span><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe%></a></li>
+      <% end %>
+    <% elsif ma.class == OrgMessage %>
+      <% if ma.message_type == 'ApplySubdomain' %>
+          <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><span class="shadowbox_news_user"><%=ma.organization.name %> </span>申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%></a></li>
+      <% elsif ma.message_type == 'AgreeApplySubdomain' %>
+          <li><a href="javascript:void(0)" target="_blank" title="系统提示 管理员同意了您的子域名申请：<%= ma.content%>"><span class="shadowbox_news_user">系统提示 </span>管理员同意了您的子域名申请：<%= ma.content%></a></li>
+      <% end %>
+    <% elsif AtMessage === ma && ma.at_valid? %>
+      <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
+        <% href = course_boards_path(ma.at_message.course,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+        <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
+      <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+        <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+        <li><a href="<%=href %>" target="_blank" title="<%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>"><span class="shadowbox_news_user"><%=ma.author.show_name %> </span>提到了你：<%= ma.subject.html_safe%></a></li>
+      <% else %>
+        <% content = '<span class="shadowbox_news_user">'+ma.author.show_name+' </span>提到了你：'+ma.subject.html_safe %>
+        <li><%=link_to content.html_safe, ma.url, :title => ma.author.show_name+' 提到了你：'+ma.subject.html_safe, :target => '_blank' %></li>
       <% end %>
+    <% end %>
   <% end %>
 </ul>
-<%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>
\ No newline at end of file
+  <a onclick = "show_more();" id = "show_more_messages" style="display: none; cursor: pointer;" class = "shadowbox_news_all">展开更多</a>
+<%= link_to '查看全部', user_message_path(User.current),:id =>'show_all_messages', :class => "shadowbox_news_all", :style => "display:none", :target =>"_Blank" %>
+</div>
+
+<script type="text/javascript">
+    $(function(){
+        if($(".shadowbox_news_list li").length > 5) {
+            $(".shadowbox_news_list li").hide();
+            $(".shadowbox_news_list li").eq(0).show();
+            $(".shadowbox_news_list li").eq(1).show();
+            $(".shadowbox_news_list li").eq(2).show();
+            $(".shadowbox_news_list li").eq(3).show();
+            $(".shadowbox_news_list li").eq(4).show();
+            $("#show_more_messages").show();
+        } else if ($(".shadowbox_news_list li").length == 0) {
+            $("#none_message").show();
+            $("#show_all_messages").show();
+        }
+        else {
+            $("#show_all_messages").show();
+        }
+    });
+    function show_more() {
+        $(".shadowbox_news_list li").show();
+        $("#show_more_messages").hide();
+        $("#show_all_messages").show();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 181eefb98..62ccb3a86 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -57,6 +57,12 @@
       <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
         <%=render :partial=>'layouts/project_info' %>
       </div><!--课程信息 end-->
+      <% if (User.current.logged? && User.current.member_of_course?(@course)) || is_teacher %>
+          <div class="info_box mb10">
+            <p class="f14">邀请码</p>
+            <p class="f14 fontBlue2"><%=@course.generate_invite_code %></p>
+          </div>
+      <% end %>
       <div class="info_box">
         <ul>
           <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 9b3e82447..69e36ca34 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -81,11 +81,6 @@
     <div class="homepagePostReplyBanner">
       <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
       <div class="homepagePostReplyBannerTime"></div>
-      <!--<div class="homepagePostReplyBannerMore">-->
-        <!--<%# if @reply_count > 2%>-->
-        <!--<a# href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @memo.id%>" onclick="expand_reply('#reply_div_<%#= @memo.id %>','#reply_btn_<%#= @memo.id%>')" data-count="<%= @reply_count %>" data-init="0" >点击展开更多回复</a>-->
-        <!--<%# end %>-->
-      <!--</div>-->
     </div>
     <div class="" id="reply_div_<%=  @memo.id %>">
     <% @replies.each_with_index  do |reply,i| %>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 746881bdc..560925070 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -71,11 +71,7 @@
       </div>
       <div class="cl"></div>
       <div class="postDetailCreater">
-        <% if @topic.try(:author).try(:realname) == ' ' %>
-            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
       <div class="cl"></div>
@@ -114,11 +110,7 @@
             </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 %>
+                <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
               </div>
               <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 145afcfd7..e5455bc85 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -103,11 +103,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @topic.try(:author).try(:realname) == ' ' %>
-            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
       <div class="cl"></div>
@@ -127,11 +123,6 @@
         <div class="homepagePostReplyBanner">
           <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @topic.id %>">
           <% @replies.each_with_index  do |reply,i| %>
@@ -147,11 +138,7 @@
                 </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 %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/org_member/deleteOrgMember.js.erb b/app/views/org_member/deleteOrgMember.js.erb
new file mode 100644
index 000000000..d87e62c17
--- /dev/null
+++ b/app/views/org_member/deleteOrgMember.js.erb
@@ -0,0 +1,3 @@
+$("#org_members_count_id").html("");
+$("#org_members_count_id").html("<%= @org.org_members.count %>")
+$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
\ No newline at end of file
diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb
index 8e8a23b60..8af7986fc 100644
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@@ -1,6 +1,7 @@
 <% members.each do |member|%>
     <ul class="orgListRow">
-      <li class="orgListUser hidden"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname  %></a></li>
+      <% username = User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %>
+      <li class="orgListUser hidden"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= username %></a></li>
       <li class="orgListRole">
         <%= get_org_member_role_name member %>
         <%= form_for(member, {:as => :org_member, :remote => true, :url => Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,
@@ -32,7 +33,8 @@
       </li>
         <% if ( (User.current.id == member.organization.creator_id || User.current.admin_of_org?(member.organization) ) && member.user_id != member.organization.creator_id )%>
         <a href="javascript:void(0);" style="color: #0781B4;margin-left: 30px;float: left"  onclick="$(this).parent().height();$('#org-member-<%= member.id%>-roles-form').show();">编辑</a>
-            <%= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
+          <a href="javascript:void(0)" style = "color: #0781B4;margin-left: 30px;float: left" onclick = "ifDeleteOrgMember('<%= member.id %>','<%= username %>')" >删除</a>
+          <%#= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
       <div class="cl"></div>
     </ul>
     <div class="cl"></div>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 245651daf..19a6f0eaa 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",organization_path(activity.board.org_subfield.organization, :org_subfield_id => activity.board.org_subfield.id), :class => "newsBlue ml15 mr5"%>
       </div>
@@ -80,17 +76,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <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>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 22f88e91b..d6e27daf1 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+         <%= link_to activity.author.show_name, user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.org_subfield.name.to_s+" | 帖子栏目通知", organization_path(activity.org_subfield.organization, :org_subfield_id => activity.org_subfield.id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -60,22 +57,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <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_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index cfbbcb5e6..06950258e 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -71,21 +71,8 @@
   <% count = document.children.count() %>
 
   <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=document.id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
-        </span>
-      </div>
-      <% if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>',<%= document.id %>,'OrgDocumentComment',<%= document.id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => document, :user_activity_id => document.id} %>
+
     <div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
       <%= render :partial => 'users/all_replies', :locals => {:comments => comments_for_doc}%>
     </div>
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index ebf3f5445..a2f8a8f29 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -112,7 +112,8 @@
             <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                 <%# if @organization.secdomain_name.nil? %>
-                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %>
                 <%# else %>
                     <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <%# end %>
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 0ca46e59b..2d498e827 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO
         <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -40,22 +37,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <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_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb
new file mode 100644
index 000000000..fb60eaed3
--- /dev/null
+++ b/app/views/quality_analysis/_hightchars.html.erb
@@ -0,0 +1,483 @@
+<script>
+    //    sqale_rating
+    $(function () {
+        $('#container_sqale_rating').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+                    title: false,
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 100,
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+//                        title: {
+//                            text: 'km/h'
+//                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 5,
+                            color: '#55BF3B' // green
+                        }, {
+                            from: 6,
+                            to: 10,
+                            color: '#adde18' // yellow
+                        }, {
+                            from: 11,
+                            to: 20,
+                            color: '#DDDF0D' // red
+                        }, {
+                            from: 21,
+                            to: 50,
+                            color: '#df8538' // yellow
+                        }, {
+                            from: 51,
+                            to: 100,
+                            color: '#DF5353' // yellow
+                        }]
+                    },
+
+//                  delete hightcharts.com
+                    credits:{
+                        enabled: false
+                    },
+                    series: [{
+                        name: '代码质量',
+                        data: [<%= @complexity["msr"][9]["val"] %>]
+//                        tooltip: {
+//                            valueSuffix: ' km/h'
+//                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+//                    if (!chart.renderer.forExport) {
+//                        setInterval(function () {
+//                            var point = chart.series[0].points[0],
+//                                    newVal,
+//                                    inc = Math.round((Math.random() - 0.5) * 20);
+//
+//                            newVal = point.y + inc;
+//                            if (newVal < 0 || newVal > 200) {
+//                                newVal = point.y - inc;
+//                            }
+//
+//                            point.update(newVal);
+//
+//                        }, 3000);
+//                    }
+                });
+    });
+
+
+//    function_complexity
+    $(function () {
+        $('#container_function_complexity').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+                    title: false,
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 30,
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+//                        title: {
+//                            text: 'km/h'
+//                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 10,
+                            color: '#55BF3B' // green
+                        }, {
+                            from: 11,
+                            to: 15,
+                            color: '#DDDF0D' // yellow
+                        }, {
+                            from: 16,
+                            to: 30,
+                            color: '#DF5353' // red
+                        }]
+                    },
+
+//                  delete hightcharts.com
+                    credits:{
+                        enabled: false
+                    },
+                    series: [{
+                        name: '复杂度',
+                        data: [<%= @complexity["msr"][6]["val"] %>]
+//                        tooltip: {
+//                            valueSuffix: ' km/h'
+//                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+//                    if (!chart.renderer.forExport) {
+//                        setInterval(function () {
+//                            var point = chart.series[0].points[0],
+////                                    newVal,
+////                                    inc = Math.round((Math.random() - 0.5) * 20);
+//
+////                            newVal = point.y + inc;
+////                            if (newVal < 0 || newVal > 200) {
+////                                newVal = point.y - inc;
+////                            }
+//
+////                            point.update(newVal);
+//
+//                        }, 3000);
+//                    }
+                });
+    });
+
+//    duplicated_lines_density
+    $(function () {
+        $('#container_duplicated_lines_density').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+                    title: false,
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    xAxis: {
+                        style:{
+                            fontSize: '18px'
+                        }
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 100,
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+//                        title: {
+//                            text: 'km/h'
+//                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 30,
+                            color: '#55BF3B' // green
+                        }, {
+                            from: 31,
+                            to: 50,
+                            color: '#DDDF0D' // red
+                        }, {
+                            from: 51,
+                            to: 100,
+                            color: '#DF5353' // yellow
+                        }]
+                    },
+
+//                  delete hightcharts.com
+                    credits:{
+                        enabled: false
+                    },
+                    series: [{
+                        name: '重复率',
+                        data: [<%= @complexity["msr"][7]["val"] %>]
+//                        tooltip: {
+//                            valueSuffix: ' km/h'
+//                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+//                    if (!chart.renderer.forExport) {
+//                        setInterval(function () {
+//                            var point = chart.series[0].points[0],
+//                                    newVal,
+//                                    inc = Math.round((Math.random() - 0.5) * 20);
+//
+//                            newVal = point.y + inc;
+//                            if (newVal < 0 || newVal > 200) {
+//                                newVal = point.y - inc;
+//                            }
+//
+//                            point.update(newVal);
+//
+//                        }, 3000);
+//                    }
+                });
+    });
+
+//    comment_lines_density
+    $(function () {
+        $('#container_comment_lines_density').highcharts({
+
+                    chart: {
+                        type: 'gauge',
+                        plotBackgroundColor: null,
+                        plotBackgroundImage: null,
+                        plotBorderWidth: 0,
+                        plotShadow: false
+                    },
+                    title: false,
+                    pane: {
+                        startAngle: -150,
+                        endAngle: 150,
+                        background: [{
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#FFF'],
+                                    [1, '#333']
+                                ]
+                            },
+                            borderWidth: 0,
+                            outerRadius: '109%'
+                        }, {
+                            backgroundColor: {
+                                linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+                                stops: [
+                                    [0, '#333'],
+                                    [1, '#FFF']
+                                ]
+                            },
+                            borderWidth: 1,
+                            outerRadius: '107%'
+                        }, {
+                            // default background
+                        }, {
+                            backgroundColor: '#DDD',
+                            borderWidth: 0,
+                            outerRadius: '105%',
+                            innerRadius: '103%'
+                        }]
+                    },
+
+                    xAxis: {
+                        title: {
+                            text: '复杂度',
+                            x: -23, //center设置标题的位置
+                            y: 6
+                        },
+                        style:{
+                            fontSize: '18px'
+                        }
+                    },
+
+                    // the value axis
+                    yAxis: {
+                        min: 0,
+                        max: 100,
+                        minorTickInterval: 'auto',
+                        minorTickWidth: 1,
+                        minorTickLength: 10,
+                        minorTickPosition: 'inside',
+                        minorTickColor: '#666',
+                        tickPixelInterval: 30,
+                        tickWidth: 2,
+                        tickPosition: 'inside',
+                        tickLength: 10,
+                        tickColor: '#666',
+                        labels: {
+                            step: 2,
+                            rotation: 'auto'
+                        },
+//                        title: {
+//                            text: 'km/h'
+//                        },
+                        plotBands: [{
+                            from: 0,
+                            to: 20,
+                            color: '#DDDF0D' // green
+                        }, {
+                            from: 21,
+                            to: 50,
+                            color: '#55BF3B' // red
+                        }, {
+                            from: 51,
+                            to: 100,
+                            color: '#DF5353' // yellow
+                        }]
+                    },
+
+//                  delete hightcharts.com
+                    credits:{
+                        enabled: false
+                    },
+                    series: [{
+                        name: '质量等级',
+                        data: [<%= @complexity["msr"][5]["val"] %>]
+//                        tooltip: {
+//                            valueSuffix: ' km/h'
+//                        }
+                    }]
+
+                },
+                // Add some life
+                function (chart) {
+//                    if (!chart.renderer.forExport) {
+//                        setInterval(function () {
+//                            var point = chart.series[0].points[0],
+//                                    newVal,
+//                                    inc = Math.round((Math.random() - 0.5) * 20);
+//
+//                            newVal = point.y + inc;
+//                            if (newVal < 0 || newVal > 200) {
+//                                newVal = point.y - inc;
+//                            }
+//
+//                            point.update(newVal);
+//
+//                        }, 3000);
+//                    }
+                });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
new file mode 100644
index 000000000..507ded0fe
--- /dev/null
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -0,0 +1,25 @@
+<div class="project_r_h">
+  <h2 class="project_h2">分析结果</h2>
+</div>
+<ul class="analysis-result-list">
+  <li class="analysis-result-name fl fontBlue2" >名称</li>
+  <li class="analysis-result-version fl fontBlue2" >版本</li>
+  <li class="analysis-result-loc fl fontBlue2" >分支</li>
+  <li class="analysis-result-debt fl fontBlue2" >语言</li>
+  <li class="analysis-result-time fl fontBlue2" >时间</li>
+  <div class="cl"></div>
+</ul>
+<% 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.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %></li>
+          <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
+          <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
+          <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
+          <li class="analysis-result-time fl fontBlue2" title="时间"><%= format_time(qa.created_at) %></li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+<% end %>
+
+
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
new file mode 100644
index 000000000..8f1cb8443
--- /dev/null
+++ b/app/views/quality_analysis/_show.html.erb
@@ -0,0 +1,114 @@
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+  <%= render :partial => "hightchars" %>
+  <div class="project_r_h">
+    <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>
+  <div class="analysis-block mt10 mb40 f14">
+    <div class="flex">
+      <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]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= sqale_rating_status(@complexity["msr"][9]["val"])[1] %> borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"])[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]["val"] %><span class="f8 c_white analysis-genral-icon <%= complexity_status(@complexity["msr"][6]["val"])[1] %> borderRadius"><%= complexity_status(@complexity["msr"][6]["val"])[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]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= duplicated_lines_density_status(@complexity["msr"][7]["val"])[1] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"])[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]["frmt_val"] %><span class="f8 c_white analysis-genral-icon <%= comment_lines_density_status(@complexity["msr"][5]["val"])[1] %> borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"])[0] %></span></p>
+      </div>
+    </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;"><%= score_sqale_rating(@complexity["msr"][9]["val"]) %></span>/5分</span><span class="fontGrey2">可定性评价为：<span class="c_red">质量<%= 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="fontBlue2 w70 pInline"><%= @complexity["msr"][8]["frmt_val"] %></span><span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
+    <div><span class="fontGrey3 mr30">质量问题</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]["frmt_val"] %></a></span><span class="fontGrey2">问题分类如下：</span></div>
+    <div class="ml90 mt15">
+      <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][4]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+      <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span><span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= 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"><%= lines_scale(@complexity["msr"][0]["frmt_val"]) %></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]["frmt_val"] %></p>
+    </div>
+    <div class="analysis-genral">
+      <p class="fontGrey3">文件</p>
+      <p class="fontBlue2"><%= @complexity["msr"][2]["frmt_val"] %></p>
+    </div>
+    <div class="analysis-genral">
+      <p class="fontGrey3">目录</p>
+      <p class="fontBlue2"><%= @complexity["msr"][3]["frmt_val"] %></p>
+    </div>
+    <div class="analysis-genral">
+      <p class="fontGrey3">类</p>
+      <p class="fontBlue2"><%= @complexity["msr"][1]["frmt_val"] %></p>
+    </div>
+    <div class="analysis-genral">
+      <p class="fontGrey3">方法</p>
+      <p class="fontBlue2"><%= @complexity["msr"][4]["frmt_val"] %></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/index.html.erb b/app/views/quality_analysis/index.html.erb
new file mode 100644
index 000000000..9b06e6483
--- /dev/null
+++ b/app/views/quality_analysis/index.html.erb
@@ -0,0 +1,6 @@
+<% if @name_flag %>
+    <%= render :partial => "result_list" %>
+<% else %>
+    <%= render "show" %>
+<% end %>
+
diff --git a/app/views/quality_analysis/show.html.erb b/app/views/quality_analysis/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
new file mode 100644
index 000000000..f9726fb9b
--- /dev/null
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -0,0 +1,23 @@
+<div class="f16 fb fontBlue mb10">代码质量分析</div>
+<div>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
+      <div class="ui form">
+        <div class="mb10" style="margin-right:13px;">
+          <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
+        </div>
+        <div class="mb10">
+          <div>
+            <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch', :class => "analysis-option-box" %>
+          </div>
+        </div>
+        <div class="mb10">
+          <div>
+            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
+          </div>
+        </div>
+        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#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>
+  <% end %>
+</div>
diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb
new file mode 100644
index 000000000..69dae2629
--- /dev/null
+++ b/app/views/repositories/quality_analyses.html.erb
@@ -0,0 +1,76 @@
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_quality_analyses) %></h2>
+</div>
+
+<div class="repository_con " style="line-height:1.9;">
+  <%#= render :partial => 'navigation' %>
+  <div class="cl"></div>
+</div>
+
+<div id = "container">
+</div>
+<div id = "container_quality" class="mt30">
+</div>
+
+<script>
+    $(function () {
+        $('#container').highcharts({
+            chart: {
+                type: 'pie',
+                options3d: {
+                    enabled: true,
+                    alpha: 45,
+                    beta: 0
+                }
+            },
+            title: {
+                text: 'Browser market shares at a specific website, 2014'
+            },
+            tooltip: {
+                pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+            },
+            plotOptions: {
+                pie: {
+                    allowPointSelect: true,
+                    cursor: 'pointer',
+                    depth: 35,
+                    dataLabels: {
+                        enabled: true,
+                        format: '{point.name}'
+                    }
+                }
+            },
+            series: [{
+                type: 'pie',
+                name: 'Browser share',
+                data: [
+                    ['Firefox',   45.0],
+                    ['IE',       26.8],
+                    {
+                        name: 'Chrome',
+                        y: 12.8,
+                        sliced: true,
+                        selected: true
+                    },
+                    ['Safari',    8.5],
+                    ['Opera',     6.2],
+                    ['Others',   0.7]
+                ],
+                dataLabels: {
+                    enabled: true,
+                    style: {
+                        fontSize: '13px',
+                        color: '#aaa',
+                        fontFamily: 'Arial',
+                        textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                        fontWeight: 'normal'
+                    }
+                }
+            }]
+        });
+    });
+</script>
+
+<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
+<% html_title(l(:label_repository), l(:label_statistics)) -%>
\ No newline at end of file
diff --git a/app/views/repositories/quality_analysis.js.erb b/app/views/repositories/quality_analysis.js.erb
new file mode 100644
index 000000000..bafe28cdf
--- /dev/null
+++ b/app/views/repositories/quality_analysis.js.erb
@@ -0,0 +1,8 @@
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/quality_analysis', :locals => {}) %>');
+showModal('ajax-modal', '615px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","20%").css("left","32%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 43be57760..22a64a219 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,7 +2,13 @@
 <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>
   <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) %>
+      <%#= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+  <%# end %>
+  <%# else %>
+      <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
+  <%# end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>
@@ -45,7 +51,7 @@
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
             <% else %>
-                 <span class="fl"><div class="fb fontGrey3 mr5 fl hidden maxwidth150"><%=@changesets_latest_coimmit.author_email %></div>
+                <span class="fl"><div class="fb fontGrey3 mr5 fl hidden maxwidth150"><%=@changesets_latest_coimmit.author_email %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
@@ -57,7 +63,6 @@
 
          <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font> 提交
-
         </span>
       </div>
   <% end %>
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 419407eae..9875a4cc6 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,7 +1,3 @@
-<!--
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%#= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,1,1)' %>">
--->
-
 <table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index c4a6a3e9b..1b3683506 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,7 +1,3 @@
-<!--
-<table class="hwork-table-wrap" id="homework_table" onmouseenter="<%#= @homework.homework_type == 3 ? '' : 'resizeable_table(2,4,11,11)' %>">
--->
-
 <table class="hwork-table-wrap" id="homework_table">
   <tr class="b_grey hworkH30">
     <th class="hworkList30 hworkH30 pl5 pr5">序号</th>
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 4ca5a8f2d..c4df9e715 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -4,6 +4,7 @@
         <li class="fl" >
           <span class="tit_fb">上交时间：</span>
           <%=format_time work.created_at %>
+          <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:165px; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
         </li>
 
         <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 5d9df57c1..6bdc3753e 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -118,12 +118,14 @@
                                     remote: true, class: "hworkExport resourcesGrey", :id => "download_homework_attachments" %>
                     <% end%>
                   </li>
-                  <li>
-                    <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
-                  </li>
-                  <li>
-                    <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
-                  </li>
+                  <% if @homework.anonymous_comment == 0 %>
+                      <li>
+                        <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
+                      </li>
+                      <li>
+                        <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
+                      </li>
+                  <% end %>
                   <li>
                     <a href="javascript:void(0);" class="hworkSetting resourcesGrey" onclick="set_score_rule();">评分设置</a>
                   </li>
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
index da2428316..16aac9945 100644
--- a/app/views/student_work/index.js.erb
+++ b/app/views/student_work/index.js.erb
@@ -1,4 +1,2 @@
 $("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
 $("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
-/*
-$("th").each(function(){$(this).css("width",$(this).width()-1);});*/
diff --git a/app/views/student_work/search_course_students.js.erb b/app/views/student_work/search_course_students.js.erb
index 2ac4eeaab..65179317f 100644
--- a/app/views/student_work/search_course_students.js.erb
+++ b/app/views/student_work/search_course_students.js.erb
@@ -8,19 +8,19 @@ $("#all_students_list").empty();
     $("#all_students_list").append(link);
 
     var str = $("#group_member_ids").val();
-    /*var str = "";
+    var choose_str = "";
     var lists = $("#choose_students_list li");
     if(lists.length > 0) {
         for(var i=0; i<lists.length; i++) {
             var id = $(lists[i]).attr("id").replace(/[^0-9]/ig,"");
-            str += id;
+            choose_str += id;
             if (i != lists.length -1) {
-                str += ",";
+                choose_str += ",";
         }
     }
-}*/
+}
     <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? && user.member_of_course?(@course) %>
-        if (str.indexOf(<%=user.id.to_s %>) < 0) {
+        if (str.indexOf(<%=user.id.to_s %>) < 0 && choose_str.indexOf(<%=user.id.to_s %>) < 0) {
             $("#student_<%=user.id %>").one("click",function choose_student() {
                 var li = "<li id='choose_student_<%=user.id %>'";
                 <% if user.id.to_i != User.current.id.to_i %>
diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
index 20a3289ff..a74acc77c 100644
--- a/app/views/users/_all_replies.html.erb
+++ b/app/views/users/_all_replies.html.erb
@@ -13,7 +13,7 @@
         <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" %>
-            <%= format_activity_day(comment.created_time) %> <%= format_time(comment.created_time, false) %>
+            <%= time_from_now(comment.created_time) %>
             <span id="reply_praise_count_<%=comment.id %>">
                  <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
             </span>
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index caac3ee62..4ced798d0 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -1,20 +1,9 @@
-<!--<span id="reply_praise_count_<%#=comment.id %>" class="orig_index">
-  <%# if comment.user == User.current %>
-    <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-  <%# else %>
-    <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-  <%# end %>
-</span>-->
 <div class="orig_user fl">
 <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
 </div>
 <div class="orig_right fl">
-<% if comment.try(:user).try(:realname) == ' ' %>
-    <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
-<% else %>
-    <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
-<% end %>
-<span class="orig_area"><%= time_from_now(comment.created_on) %></span>
-<div class="orig_content "><%= comment.notes.html_safe %></div>
+  <%= link_to comment.user.show_name, user_path(comment.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>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 8de9b3dce..ee12c04dd 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -7,11 +7,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% end %> TO <!--+"(课程名称)" -->
+        <%= link_to activity.user.show_name, user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+         TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 9ed7e6e76..83519b1b1 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
-        <% end %> TO
+        <%= link_to activity.user.show_name, user_path(activity.user_id), :class => "newsBlue mr15" %>
+         TO
         <% course=Course.find(activity.jour_id) %>
         <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
       </div>
@@ -41,29 +38,18 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count = fetch_user_leaveWord_reply(activity).count %>
+  <% 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">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'JournalsForMessage',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/journal_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :allow_delete => allow_delete} %>
 
-    <% 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/journal_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :allow_delete => allow_delete, :activity_id =>activity.id}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 88fbcef6c..135013a62 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
@@ -89,22 +85,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <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_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent ? activity.parent : activity%>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index dd234ac90..efd3770aa 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+         <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -67,22 +64,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <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_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_homework_replies.html.erb b/app/views/users/_homework_replies.html.erb
index 7f4dc379b..285d464b1 100644
--- a/app/views/users/_homework_replies.html.erb
+++ b/app/views/users/_homework_replies.html.erb
@@ -12,11 +12,7 @@
         </div>
         <div class="homepagePostReplyDes">
           <div class="homepagePostReplyPublisher">
-            <% if comment.try(:user).try(:realname) == ' ' %>
-                <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-            <% else %>
-                <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-            <% end %>
+            <%= link_to comment.user.show_name, user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
             <%= time_from_now(comment.created_on) %>
           </div>
           <% unless comment.m_parent_id.nil? %>
@@ -37,7 +33,7 @@
                       <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),:remote=>true %>
+                        <%= 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>
@@ -45,7 +41,8 @@
               </div>
           <% end %>
           <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth t_txt" id="reply_content_<%= comment.id %>">
-            <%= comment.notes.html_safe %></div>
+            <%= comment.notes.html_safe %>
+          </div>
           <div class="orig_reply mb10 mt-10">
             <div class="reply">
                 <span class="reply-right">
diff --git a/app/views/users/_journal_comment_reply.html.erb b/app/views/users/_journal_comment_reply.html.erb
new file mode 100644
index 000000000..9906abeb5
--- /dev/null
+++ b/app/views/users/_journal_comment_reply.html.erb
@@ -0,0 +1,8 @@
+<div class="orig_cont clearfix">
+  <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+      <div>
+        <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+      </div>
+  <% end %>
+  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => comment} %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_journal_replies.html.erb b/app/views/users/_journal_replies.html.erb
new file mode 100644
index 000000000..7fc708ebb
--- /dev/null
+++ b/app/views/users/_journal_replies.html.erb
@@ -0,0 +1,85 @@
+<ul>
+  <% comments.each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
+        <div class="homepagePostReplyPortrait">
+          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+            <%= time_from_now(comment.created_on) %>
+          </div>
+          <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+              <% parents_rely = [] %>
+              <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
+              <% length = parents_rely.length %>
+              <div id="comment_reply_<%=comment.id %>">
+                <% if length <= 3 %>
+                    <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+                <% else %>
+                    <div class="orig_cont clearfix">
+                      <div class="orig_cont clearfix">
+                        <div>
+                          <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+                        </div>
+                        <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+                      </div>
+                      <div class="orig_cont_hide clearfix">
+                        <span class="orig_icon" >&darr; </span>
+                        <span class="orig_icon" style="display:none;" > &uarr;</span>
+                        <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
+                      </div>
+                      <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                    </div>
+                <% end %>
+              </div>
+          <% end %>
+          <% if !comment.content_detail.blank? || comment.class == Journal %>
+              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                <% if comment.class == Journal %>
+                    <% if comment.details.any? %>
+                        <% details_to_strings(comment.details).each do |string| %>
+                            <p><%= string %></p>
+                        <% end %>
+                    <% end %>
+                    <P><%= comment.notes.html_safe %></P>
+                <% else %>
+                    <%= comment.content_detail.html_safe %>
+                <% end %>
+              </div>
+              <div class="orig_reply mb10 mt-10">
+                <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%=comment.id %>">
+                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                    </span>
+                    <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                  <% if allow_delete %>
+                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                    <% end %>
+                </span>
+                  <div class="cl"></div>
+                </div>
+              </div>
+              <p id="reply_message_<%= comment.id%>"></p>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_journal_reply_banner.html.erb b/app/views/users/_journal_reply_banner.html.erb
new file mode 100644
index 000000000..c231f473d
--- /dev/null
+++ b/app/views/users/_journal_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_journal_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>,<%=allow_delete %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+          展开更多
+        </a>
+      </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index d1f7363a7..3dac8026a 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -1,21 +1,6 @@
 <% count = activity.journals.count %>
 <div class="homepagePostReply">
-  <div class="homepagePostReplyBanner">
-    <div class="homepagePostReplyBannerCount">回复
-      <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_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Issue',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-            展开更多
-          </a>
-        </div>
-    <% end %>
-  </div>
+  <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
   <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
   <% if count > 0 %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 502706289..1abc36a31 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
@@ -88,18 +84,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <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_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 04edc05e0..cdceb490d 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(名称)"-->
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(名称)"-->
         <%= link_to activity.project.name.to_s+" | 新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -64,23 +61,8 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <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_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
diff --git a/app/views/users/_reply_banner.html.erb b/app/views/users/_reply_banner.html.erb
new file mode 100644
index 000000000..25175542f
--- /dev/null
+++ b/app/views/users/_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_all_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+          展开更多
+        </a>
+      </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index a7034ffc7..621b56fbd 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -2,23 +2,38 @@
   <% if User.current.logged? %>
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
       <div class="orig_textarea mb10 fl">
-      <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
-          <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
-          <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
-          <input type="hidden" name="course_activity" value=<%=@course_activity %>>
-          <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="reply_message"></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%>
+        <div nhname='new_message_<%= reply.id%>'>
+          <% if @type == 'HomeworkCommon' %>
+              <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
+                  <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
+                  <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
+                  <input type="hidden" name="course_activity" value=<%=@course_activity %>>
+                  <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="reply_message"></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%>
+          <% elsif @type == 'JournalsForMessage' %>
+              <%= 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 %>
+                  <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <%= hidden_field_tag 'activity_id',params[:activity_id],:value =>@activity_id %>
+                  <div nhname='toolbar_container_<%= reply.id%>'></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="user_notes"></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>
+              <% end%>
+          <% end %>
+        </div>
+        <div class="cl"></div>
       </div>
   <% else %>
     <%= render :partial => "users/show_unlogged_reply" %>
   <% end %>
-    <div class="cl"></div>
-  </div>
   <div class="cl"></div>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 3b327c080..5d06a7001 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -86,7 +86,7 @@
                         <% case user_activity.act_type.to_s %>
                             <% when 'JournalsForMessage' %>
                             <% unless act.private == 1 && (!User.current || (User.current && act.jour_id != User.current.id && act.user_id != User.current.id)) %>
-                                <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>1} %>
+                                <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                             <% end %>
                         <% end %>
                     <% when 'Blog'%>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index f0761ff78..77510c858 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author_id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word"> <!--+"(通知标题)"-->
@@ -46,22 +43,7 @@
   </div>
   <% count=activity.children.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <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_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'BlogComment',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index b84adf5fe..4fb79ee2d 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -50,7 +50,7 @@
                 <ul class="homepagePostSettiongText">
                   <li>
                     <%= link_to(l(:label_bid_respond_delete),
-                                {:controller => 'words', :action => 'destroy', :object_id => activity, :user_id => activity.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
+                                {:controller => 'words', :action => 'destroy', :object_id => activity, :user_id => activity.user,:user_activity_id => user_activity_id, :activity_id => activity.id},
                                 :confirm => l(:text_are_you_sure), :method => 'delete',
                                 :class => "postOptionLink", :title => l(:button_delete))  %>
                   </li>
@@ -62,29 +62,17 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count=fetch_user_leaveWord_reply(activity).count %>
+  <% all_comments = []%>
+  <% count=get_all_children(all_comments, activity).count %>
+  <% allow_delete = (activity.user == User.current || User.current.admin?) %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'JournalsForMessage',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/journal_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :allow_delete => allow_delete} %>
 
-    <% 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/journal_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :allow_delete => allow_delete, :activity_id =>activity.id}%>
         </div>
     <% end %>
 
@@ -99,7 +87,6 @@
                   <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
                   <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
                   <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-                  <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
                   <div nhname='toolbar_container_<%= user_activity_id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_notes"></textarea>
                   <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index 6211aac7d..517d66038 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -11,7 +11,7 @@
                     sd_create_editor_from_data(<%= jour.id%>, null, "100%", "<%=jour.class.to_s%>");
                 });
             </script>
-            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>0} %>
+            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id} %>
             <%#= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
         <% end %>
     <%end%>
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index c18c6aae4..6d227e93b 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -1,5 +1,7 @@
 <% if params[:type] == 'HomeworkCommon' %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/homework_replies', :locals => {:comments => @journals, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
+<% 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}) %>');
 <% 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 99ab73b46..5f5ea6c3f 100644
--- a/app/views/users/show_all_replies.js.erb
+++ b/app/views/users/show_all_replies.js.erb
@@ -1,3 +1,7 @@
 <% unless @comment.parent.nil? %>
-$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
+    <% 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})%>");
+    <% else %>
+        $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/wechats/open_wechat.html.erb b/app/views/wechats/open_wechat.html.erb
new file mode 100644
index 000000000..4584e81b5
--- /dev/null
+++ b/app/views/wechats/open_wechat.html.erb
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0">
+</head>
+<body>
+<script type="text/javascript">
+    var ua = navigator.userAgent.toLowerCase();
+    var isWeixin = ua.indexOf('micromessenger') != -1;
+    var isAndroid = ua.indexOf('android') != -1;
+    var isIos = (ua.indexOf('iphone') != -1) || (ua.indexOf('ipad') != -1);
+    if (!isWeixin) {
+        document.head.innerHTML = '<title>抱歉，出错了</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0"><link rel="stylesheet" type="text/css" href="https://res.wx.qq.com/connect/zh_CN/htmledition/style/wap_err1a9853.css">';
+        document.body.innerHTML = '<div class="page_msg"><div class="inner"><span class="msg_icon_wrp"><i class="icon80_smile"></i></span><div class="msg_content"><h4>请在微信客户端打开链接</h4></div></div></div>';
+    }
+</script>
+</body>
+</html>
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 3d61d8fcf..1e3957ea9 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -2,17 +2,23 @@
 <html ng-app="wechat">
 <head>
   <base href="/">
-  <title>我的动态</title>
+  <title>Trustie平台</title>
   <meta charset='utf-8' />
   <meta name="keywords" content="" />
   <meta name="description" content="" />
   <meta name="apple-mobile-web-app-capable" content="no" />
   <meta content='True' name='HandheldFriendly' />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
 
   <script type="text/javascript">
-    window.g_openid = '<%= @wechat_user.openid %>';
+    window.g_debug = false; //调试标志,如果在本地请置为true
+    window.apiUrl = '/api/v1/';
+    window.g_redirect_path = '<%= @path %>';
+    <% if @course_id %>
+    window.g_courseid = <%= @course_id %>;
+    <% end %>
   </script>
 
 </head>
@@ -20,8 +26,31 @@
 <div ng-view>
 </div>
 
-<script src="/javascripts/wechat/build/angular.all.min.js"></script>
-<script src="/javascripts/wechat/app.js"></script>
+<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>-->
 </body>
 
 </html>
\ No newline at end of file
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb
index ded05887f..9f3b0164e 100644
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@@ -1,8 +1,8 @@
 <% if @save_succ %>
     <% if @user_activity_id %>
-        <% if @is_activity %>
-            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
-        <% else %>
+        <% if @activity.jour_type == 'Principal' %>
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
+        <% elsif @activity.jour_type == 'Course' %>
             $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
         <% end %>
         //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index a2d606e76..c527474cd 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -3,8 +3,7 @@
 <% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication','HomeworkCommon'].include? @journal_destroyed.jour_type)%>
   <% if @is_user%>
     <% if @activity %>
-        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
-        //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
+        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
         sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
     <% else %>
         $("#user_activity_<%= @user_activity_id%>").hide();
@@ -20,7 +19,12 @@
       <% if @bid && @jours_count %>
         $('#jours_count').html("<%= @jours_count %>");
       <% elsif @course && @jours_count%>
-        $('#course_jour_count').html("(<%= @jours_count %>)");
+        <% if @user_activity_id %>
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
+            sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
+        <% else %>
+            $('#course_jour_count').html("(<%= @jours_count %>)");
+        <% end %>
       <% elsif @user && @jours_count%>
         $('#jour_count').html("<%= @jours_count %>");
       <% elsif @homework%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 033f12ad2..98d02cdb6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -602,6 +602,7 @@ en:
   label_time_tracking: Time tracking
   label_change_plural: Changes
   label_statistics: Statistics
+  label_quality_analyses: Quality Analyses
   label_commits_per_month: Commits per month
   label_commits_per_author: Commits per author
   label_diff: diff
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 94be8af6d..3dbd2e8ef 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -732,6 +732,7 @@ zh:
   label_time_tracking: 时间跟踪
   label_change_plural: 变更
   label_statistics: 统计
+  label_quality_analyses: 质量分析
 
   label_commits_per_month: 每月提交次数
   label_commits_per_author: 每用户提交次数
@@ -1864,12 +1865,18 @@ zh:
   excel_nickname: 登录名
   excel_student_id: 学号
   excel_mail: 电子邮箱
+  excel_rank: 排名
   excel_homework_name: 作品名
   excel_homework_des: 作品描述
+  excel_homework_project: 关联项目
+  excel_no_project: 无关联项目
+  excel_group_member: 组员
   excel_t_score: 教师评分
   excel_ta_score: 教辅评分
   excel_n_score: 匿名评分
   excel_s_score: 系统评分
+  excel_a_penalty: 缺评扣分
+  excel_l_penalty: 迟交扣分
   excel_f_score: 成绩
   excel_commit_time: 提交时间
   excel_homework_score: 作业积分
diff --git a/config/menu.yml b/config/menu.yml
index c2579d8e6..213130240 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,30 +2,26 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.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=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   name: "我的课程"
   sub_button:
   -
-    type: "view"
+    type: "click"
     name: "课程"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+    key: "DEV"
   -
-    type: "view"
+    type: "click"
     name: "资源"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+    key: "DEV"
 
  -
   name: "更多"
   sub_button:
   -
-    type: "view"
+    type: "click"
     name: "加入班级"
-    url:  "https://www.trustie.net/"
-  -
-    type: "view"
-    name: "点名"
-    url:  "https://www.trustie.net/organizations/1/downloads"
+    key:  "JOIN_CLASS"
   -
     type: "click"
     name: "反馈"
diff --git a/config/routes.rb b/config/routes.rb
index 8d822aafc..14ee3f0b8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -116,6 +116,7 @@ RedmineApp::Application.routes.draw do
     end
     collection do
       get 'org_member_autocomplete'
+      get 'deleteOrgMember'
     end
   end
 
@@ -788,6 +789,13 @@ RedmineApp::Application.routes.draw do
       end
     end
 
+    resources :quality_analysis, :only => [:index, :new, :create] do
+      collection do
+      end
+      member do
+
+      end
+    end
     # resources :files, :only => [:index, :new, :create] do
     #   member do
     #     match "quote_resource_show_project",:via => [:get]
@@ -908,6 +916,7 @@ RedmineApp::Application.routes.draw do
 
   # repositories routes
   get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats', :as => "stats_repository_project"
+  get 'projects/:id/repository/:repository_id/quality_analysis', :to => 'repositories#quality_analysis', :as => "quality_analysis"
   get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
 
   get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))', :to => 'repositories#changes'
@@ -926,6 +935,7 @@ RedmineApp::Application.routes.draw do
       }
 
   get 'projects/:id/repository/statistics', :to => 'repositories#stats'
+
   get 'projects/:id/repository/graph', :to => 'repositories#graph'
 
   get 'projects/:id/repository/changes(/*path(.:ext))', :to => 'repositories#changes'
@@ -1256,7 +1266,7 @@ RedmineApp::Application.routes.draw do
       get :login
       get :user_activities
       post :bind
-      post :get_open_id
+      post :get_bind
     end
   end
 
diff --git a/config/wechat.yml b/config/wechat.yml
index cf5be1f2b..9bc33029e 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -12,10 +12,10 @@ default: &default
   secret: "beb4d3bc4b32b3557811680835357841"
 
   token:    "123456"
-  access_token: "1234567"
+  access_token: ".access_token"
   encrypt_mode: false # if true must fill encoding_aes_key
   encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
-  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
+  jsapi_ticket: "tmp/wechat_jsapi_ticket"
 
   #template
   binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
@@ -30,4 +30,4 @@ development:
   <<: *default
 
 test:
-  <<: *default
\ No newline at end of file
+  <<: *default
diff --git a/db/migrate/20160614072229_add_invite_code_to_course.rb b/db/migrate/20160614072229_add_invite_code_to_course.rb
new file mode 100644
index 000000000..8f7bb8da1
--- /dev/null
+++ b/db/migrate/20160614072229_add_invite_code_to_course.rb
@@ -0,0 +1,5 @@
+class AddInviteCodeToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :invite_code, :string
+  end
+end
diff --git a/db/migrate/20160622033322_create_quality_analyses.rb b/db/migrate/20160622033322_create_quality_analyses.rb
new file mode 100644
index 000000000..6316d5764
--- /dev/null
+++ b/db/migrate/20160622033322_create_quality_analyses.rb
@@ -0,0 +1,11 @@
+class CreateQualityAnalyses < ActiveRecord::Migration
+  def change
+    create_table :quality_analyses do |t|
+      t.integer :project_id
+      t.string :author_login
+      t.string :rep_identifier
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb b/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb
new file mode 100644
index 000000000..838d6d896
--- /dev/null
+++ b/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb
@@ -0,0 +1,5 @@
+class AddJkVersionToQualityAnalysis < ActiveRecord::Migration
+  def change
+    add_column :quality_analyses, :sonar_version, :integer, :default => false
+  end
+end
diff --git a/db/migrate/20160624032138_add_index_to_invite_code.rb b/db/migrate/20160624032138_add_index_to_invite_code.rb
new file mode 100644
index 000000000..420951874
--- /dev/null
+++ b/db/migrate/20160624032138_add_index_to_invite_code.rb
@@ -0,0 +1,6 @@
+class AddIndexToInviteCode < ActiveRecord::Migration
+  def change
+    add_column :courses, :qrcode, :string
+    add_index :courses, :invite_code, unique: true
+  end
+end
diff --git a/db/migrate/20160624054614_add_column_to_quality_analyses.rb b/db/migrate/20160624054614_add_column_to_quality_analyses.rb
new file mode 100644
index 000000000..ed3e6b137
--- /dev/null
+++ b/db/migrate/20160624054614_add_column_to_quality_analyses.rb
@@ -0,0 +1,6 @@
+class AddColumnToQualityAnalyses < ActiveRecord::Migration
+  def change
+    add_column :quality_analyses, :path, :string
+    add_column :quality_analyses, :branch, :string
+  end
+end
diff --git a/db/migrate/20160624055127_add_languae_to_quality_analyses.rb b/db/migrate/20160624055127_add_languae_to_quality_analyses.rb
new file mode 100644
index 000000000..de531b1db
--- /dev/null
+++ b/db/migrate/20160624055127_add_languae_to_quality_analyses.rb
@@ -0,0 +1,5 @@
+class AddLanguaeToQualityAnalyses < ActiveRecord::Migration
+  def change
+    add_column :quality_analyses, :language, :string
+  end
+end
diff --git a/db/migrate/20160624103411_add_name_to_quality_analyses.rb b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
new file mode 100644
index 000000000..a40342b42
--- /dev/null
+++ b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
@@ -0,0 +1,5 @@
+class AddNameToQualityAnalyses < ActiveRecord::Migration
+  def change
+    # add_column :quality_analyses, :language, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 95ffceef1..148a6e21b 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 => 20160612043259) do
+ActiveRecord::Schema.define(:version => 20160624032138) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -550,8 +550,14 @@ ActiveRecord::Schema.define(:version => 20160612043259) 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"
   end
 
+  add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+  add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
+
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
     t.string  "name",            :limit => 30, :default => "",    :null => false
@@ -1119,6 +1125,23 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.integer  "viewed_count",  :default => 0
   end
 
+  create_table "mess", :id => false, :force => true do |t|
+    t.string   "课程名"
+    t.integer  "课程ID",                    :default => 0,  :null => false
+    t.string   "教师姓",                     :default => "", :null => false
+    t.string   "教师名",       :limit => 30, :default => "", :null => false
+    t.string   "主贴名",                     :default => "", :null => false
+    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
+    t.integer  "回帖对应主贴ID"
+    t.integer  "帖子点赞数"
+    t.integer  "主贴回复数",                   :default => 0,  :null => false
+    t.text     "主贴或回帖内容"
+    t.datetime "发帖时间",                                    :null => false
+    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
+    t.string   "发帖或回帖用户姓",                :default => "", :null => false
+    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
+  end
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1826,6 +1849,16 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "syllabuses", :force => true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 0354ed467..c78fd430e 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -300,8 +300,8 @@ K.options = {
 			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
 			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.text-overflow','.overflow','.white-space'
 		],
-		a : ['id', 'class', 'href', 'target', 'name'],
-		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+        a : ['id', 'class', 'href', 'target', 'name','data-method','data-remote','rel'],
+        embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
 		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
 		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
 			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 479b1101a..9f848b8e2 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -328,27 +328,27 @@ function enablePasteImg(_editor) {
 
     $(nodeBody).on('pasteImage', function(ev, data) {
         //粘贴图片时走这里会出现两张图片走df()即可
-//        console.log('pasteImage');
-//        console.log("dataURL: " + data.dataURL);
-//        console.log("width: " + data.width);
-//        console.log("height: " + data.height);
-//        var blob = dataURItoBlob(data.dataURL);
-//        if (data.blob !== null) {
-//            var data = new FormData();
-//            data.append("imgFile",blob, "imageFilename.png");
-//            console.log(data);
-//            $.ajax({
-//                url: '/kindeditor/upload?dir=image',
-//                contentType: false,
-//                type: 'POST',
-//                data: data,
-//                processData: false,
-//                success: function(data) {
-//                    console.log(data);
-//                    editor.exec('insertimage', JSON.parse(data).url);
-//                }
-//            });
-//        }
+        console.log('pasteImage');
+        console.log("dataURL: " + data.dataURL);
+        console.log("width: " + data.width);
+        console.log("height: " + data.height);
+        var blob = dataURItoBlob(data.dataURL);
+        if (data.blob !== null) {
+            var data = new FormData();
+            data.append("imgFile",blob, "imageFilename.png");
+            console.log(data);
+            $.ajax({
+                url: '/kindeditor/upload?dir=image',
+                contentType: false,
+                type: 'POST',
+                data: data,
+                processData: false,
+                success: function(data) {
+                    console.log(data);
+                    editor.exec('insertimage', JSON.parse(data).url);
+                }
+            });
+        }
     });
     return;
 };
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 69ea8f1fa..f042daba7 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -20,23 +20,25 @@
                   <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-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <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>
-                <span ng-if="act.homework_common_detail.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
-                <span ng-if="act.homework_common_detail.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
-                <span ng-if="act.homework_common_detail.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
-                <span class="c-grey f12 fl mt2">{{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" /><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" /><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" /><span style="vertical-align:top;">赞</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" /><span style="vertical-align:top;">{{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" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="cl"></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>
               </div>
             </div>
           </div>
@@ -58,14 +60,16 @@
                   <!--<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>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f13 fl mt2">{{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" /><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" /><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" /><span style="vertical-align:top;">赞</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" /><span style="vertical-align:top;">{{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" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="cl"></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>
               </div>
             </div>
           </div>
@@ -87,14 +91,16 @@
                   <!--<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>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f13 fl mt2">{{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" /><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" /><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" /><span style="vertical-align:top;">赞</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" /><span style="vertical-align:top;">{{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" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="cl"></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>
               </div>
             </div>
           </div>
@@ -127,21 +133,23 @@
                   <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-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <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>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f13 fl mt2">{{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" /><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" /><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" /><span style="vertical-align:top;">赞</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" /><span style="vertical-align:top;">{{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" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="cl"></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>
               </div>
             </div>
           </div>
@@ -164,14 +172,16 @@
                   <!--<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>
-                <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
-                <span  class="c-grey f13 fl mt2">{{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" /><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" /><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" /><span style="vertical-align:top;">赞</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" /><span style="vertical-align:top;">{{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" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="cl"></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>
               </div>
             </div>
           </div>
@@ -208,13 +218,15 @@
                   <!--<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>
-                <span  class="c-grey f13 fl mt2">{{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" /><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" /><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" /><span style="vertical-align:top;">赞</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" /><span style="vertical-align:top;">{{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" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-                <div class="cl"></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>
               </div>
             </div>
           </div>
@@ -237,13 +249,15 @@
                 <!--<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>
-              <span  class="c-grey f13 fl mt2">{{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" /><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" /><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" /><span style="vertical-align:top;">赞</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" /><span style="vertical-align:top;">{{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" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
-              <div class="cl"></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>
             </div>
           </div>
         </div>
@@ -254,6 +268,7 @@
   <div ng-if="has_more">
     <div id="more_activities" class="more-events mt10" ng-click="loadActData(page+1);">更多</div>
   </div>
+  <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible"></my-alert>
 
 </div>
 
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 5059c41ab..a3977ec5c 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -2,7 +2,7 @@
 <html ng-app="wechat">
 <head>
     <base href="/">
-    <title>我的动态</title>
+    <title>仅供本地调试使用</title>
     <meta charset='utf-8' />
     <meta name="keywords" content="" />
     <meta name="description" content="" />
@@ -10,6 +10,7 @@
     <meta content='True' name='HandheldFriendly' />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 
+    <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
     <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
 
 </head>
@@ -17,8 +18,38 @@
 <div ng-view>
 </div>
 
+
+<script type="text/javascript">
+    window.g_openid = 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg';
+    window.g_debug = true; //调试标志,如果在本地请置为true
+    window.apiUrl = 'http://localhost:3000/api/v1/';
+</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/login.js"></script>
+<script src="/javascripts/wechat/controllers/activity.js"></script>
+<script src="/javascripts/wechat/controllers/add_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/others/routes.js"></script>
+
+
+
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 509e0171a..762bd090e 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -39,7 +39,7 @@
                         <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="addBlogReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <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>
diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html
new file mode 100644
index 000000000..dc575dc64
--- /dev/null
+++ b/public/assets/wechat/class.html
@@ -0,0 +1,55 @@
+<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 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="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="输入关键词进行搜索" />
+        </div>
+    </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 />
+            请登录Trustie网站,在PC浏览器中上传课件。</p>
+    </div>
+    <div ng-class="{'undis': !showClassMate}">
+        <div class="member-banner f13 c-grey3">授课老师</div>
+
+        <div class="class-detail-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
+            <img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{teacher.name}}</span><span class="fr mr10 c-grey2">{{teacher.role_name|identify}}</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
+        </div>
+        <div class="member-banner f13 mt10 c-grey3">我的同学</div>
+        <div class="class-detail-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
+            <img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl ml10">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
+        </div>
+    </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 />
+            请登录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 />
+            请登录Trustie网站,在PC浏览器中上传小测验。</p>
+    </div>
+
+
+
+
+</div>
diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
new file mode 100644
index 000000000..8ec8bcaa5
--- /dev/null
+++ b/public/assets/wechat/class_list.html
@@ -0,0 +1,21 @@
+<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 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="goResource()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">我的资源</a>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 2e7ed3151..cc188f978 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -15,7 +15,7 @@
                         <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" ng-bind-html="discussion.content|safeHtml"></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="cl"></div>
@@ -46,7 +46,7 @@
                             <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="addDiscussionReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <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>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index cca135681..e3346ea93 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -14,7 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程通知</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="news.description|safeHtml"></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="cl"></div>
@@ -45,7 +45,7 @@
                         <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="addNoticeReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <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>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 0fc39c735..387b69867 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -18,13 +18,13 @@
                     </tr>
                     <tr>
                         <td class="text-nowrap v-top">类&nbsp;&nbsp;&nbsp;别：</td>
-                        <td><span ng-if="homework.homework_type == 1" class="c-grey f12 fl mr15 mt2">普通作业</span>
-                            <span ng-if="homework.homework_type == 2" class="c-grey f12 fl mr15 mt2">编程作业</span>
-                            <span ng-if="homework.homework_type == 3" class="c-grey f12 fl mr15 mt2">分组作业</span>
+                        <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="f13 c-grey3 mt10 mb10 text-control" ng-bind-html="homework.description|safeHtml"></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>
@@ -59,7 +59,7 @@
                         <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="addHomeworkReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <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>
diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html
new file mode 100644
index 000000000..1aa0c8830
--- /dev/null
+++ b/public/assets/wechat/invite_code.html
@@ -0,0 +1,16 @@
+<div class="post-container">
+    <div class="qr-code-wrap">
+        <div class="qr-code-box">
+            <div class="share-class-name">{{course.name}}</div>
+            <div class="qr-img-wrap"><img ng-src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket={{course.qrcode}}" width="152" class="qr-code-img" /></div>
+            <div class="invitation-code-wrap">邀请码：{{course.invite_code}}</div>
+        </div>
+    </div>
+    <div class="share-code-wrap">
+        <!--<a ng-click="share()" href="javascript:void(0);" class="share-code-btn">分享邀请码</a>-->
+        <p/>
+        <div class="share-code-instruction"> 1.将此页面分享给好友，邀请好友加入班级<br />
+            2.通过微信扫一扫加入班级<br />
+            3.输入邀请码加入班级</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/issue.html b/public/assets/wechat/issue.html
deleted file mode 100644
index 558496ef0..000000000
--- a/public/assets/wechat/issue.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>react js</title>
-  <meta charset='utf-8' />
-  <meta name="keywords" content="" />
-  <meta name="description" content="" />
-  <meta name="apple-mobile-web-app-capable" content="no">
-  <meta content='True' name='HandheldFriendly' />
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-
-  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
-
-</head>
-<body>
-<div id="container"></div>
-
-<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<script id="t:result-list" type="text/html">
-
-  <! for(var i =0; i < issues.length; ++i){ !>
-  <div class="post-container">
-    <div class="post-wrapper">
-      <div class="post-main">
-        <div class="post-avatar fl"><img src="<!=issues[i].author.img_url!>" width="45" height="45" class="border-radius" /></div>
-        <div class="post-title hidden mb5"><span class="c-grey3 f15 fb"><!=issues[i].subject!></span></div>
-        <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10"><!=issues[i].author.nickname!></a>项目问题</div>
-        <div class="cl"></div>
-        <div class="post-content c-grey2 mt10">
-          <div class="post-all-content"><!=issues[i].description!></div>
-        </div>
-        <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more " style="text-decoration:underline">点击展开</a>
-        <div class="cl"></div>
-        <span  class="c-grey f13 mt10 fl"><!=issues[i].created_on!></span>
-        <div class="cl"></div>
-      </div>
-    </div>
-  </div>
-  <! } !>
-
-
-
-</script>
-
-<script src="/javascripts/jquery-1.3.2.js"></script>
-<script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/auth.js"></script>
-<script src="/javascripts/wechat/wechat-dev.js"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 1d7f9a536..4fc085b7e 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -14,7 +14,7 @@
                         <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
                         <td>{{issue.project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目问题</td>
                     </tr></table>
-                <div class="f13 c-grey3 mt10 mb10 text-control" ng-bind-html="issue.description|safeHtml"></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 />
@@ -49,7 +49,7 @@
                             <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="addIssueReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <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>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index dc6b1409f..9fd09de2c 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -37,7 +37,7 @@
                         <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="addJournalReply(formData)" ng-hide="formData.disabled" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <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>
diff --git a/public/assets/wechat/login.html b/public/assets/wechat/login.html
new file mode 100644
index 000000000..309db29de
--- /dev/null
+++ b/public/assets/wechat/login.html
@@ -0,0 +1,25 @@
+<div class="post-container">
+    <div loading-spinner></div>
+
+    <form name="loginFrm" novalidate>
+    <div class="blue-title">绑定<span class="f13 blue-title-sub" ng-click="goReg()">注册</span></div>
+    <div class="input-box-wrap login-wrap mt30">
+        <input name="login" ng-model="user.login" required class="input-box f12" placeholder="请输入电子邮箱地址或登录名" />
+        <div ng-show="loginFrm.$submitted || loginFrm.login.$touched">
+            <span ng-show="loginFrm.login.$error.required" class="c-red fl f12">电子邮箱地址或登录名不能为空</span>
+        </div>
+    </div>
+    <div class="input-box-wrap login-wrap mt10 mb20">
+        <input class="input-box f12" placeholder="请输入密码" name="password" type="password" ng-model="user.password" required />
+        <div ng-show="loginFrm.$submitted || loginFrm.password.$touched">
+            <span ng-show="loginFrm.password.$error.required" class="c-red fl f12">密码不能为空</span>
+        </div>
+
+    </div>
+    <div class="login-wrap mt5"><a href="javascript:void(0);" ng-class="['btn1', 'bg-blue', 'f18', {'btn-disabled':!loginFrm.$valid} ]" ng-click="login(loginFrm, user)">确定绑定</a></div>
+    <div class="forget-psw-wrap"><a href="javascript:void(0);" class="f12 forget-psw" ng-click="showBox()">忘记密码？</a></div>
+        <my-alert message="findPwdDialog.message" title="findPwdDialog.title" visible="findPwdDialog.visible"></my-alert>
+    </form>
+</div>
+
+<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
\ No newline at end of file
diff --git a/public/assets/wechat/myresource.html b/public/assets/wechat/myresource.html
new file mode 100644
index 000000000..9d3bf0fda
--- /dev/null
+++ b/public/assets/wechat/myresource.html
@@ -0,0 +1,26 @@
+<div class="post-container">
+    <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="输入关键词进行搜索" />
+        </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 />
+            请登录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 />
+            请登录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 />
+            请登录Trustie网站,在PC浏览器中创建测验。</p>
+    </div>
+</div>
diff --git a/public/assets/wechat/new_class.html b/public/assets/wechat/new_class.html
new file mode 100644
index 000000000..2bb5d2aac
--- /dev/null
+++ b/public/assets/wechat/new_class.html
@@ -0,0 +1,7 @@
+<div class="post-container">
+    <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>
+</div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 4831e1521..8be12c403 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -14,7 +14,7 @@
                         <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" ng-bind-html="discussion.content|safeHtml"></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="cl"></div>
@@ -45,7 +45,7 @@
                         <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="addDiscussionReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <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>
diff --git a/public/assets/wechat/reg.html b/public/assets/wechat/reg.html
new file mode 100644
index 000000000..9184fd0ed
--- /dev/null
+++ b/public/assets/wechat/reg.html
@@ -0,0 +1,43 @@
+<div class="post-container">
+    <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"/>
+        <div class="input-box-wrap login-wrap mt10 mb20">
+            <input class="input-box f12" type="email" ng-model="user.email" name="email" required placeholder="请输入电子邮箱地址"/>
+            <div ng-show="regFrm.$submitted || regFrm.email.$touched">
+                <span class="f12 c-red fl" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span>
+                <span class="f12 c-red fl" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
+            </div>
+        </div>
+        <div class="input-box-wrap login-wrap mb20">
+            <input class="input-box f12" type="password" ng-model="user.password" name="password" ng-maxlength="20" ng-minlength="8" required placeholder="请输入密码"/>
+            <div ng-show="regFrm.$submitted || regFrm.password.$touched">
+                <span class="f12 c-red fl" ng-show="regFrm.password.$error.required">密码不能为空</span>
+                <span class="f12 c-red fl" ng-show="regFrm.password.$error.minlength">密码长度为8-20位</span>
+                <span class="f12 c-red fl" ng-show="regFrm.password.$error.maxlength">密码长度为8-20位</span>
+            </div>
+        </div>
+        <div class="input-box-wrap login-wrap mb20">
+            <input class="input-box f12" type="password" ng-model="user.password_confirm" name="password_confirm"  required placeholder="请再次输入密码" pwdconfirm/>
+            <div ng-show="regFrm.$submitted || regFrm.password_confirm.$touched">
+                <span class="f12 c-red fl" ng-show="regFrm.password_confirm.$error.pwdconfirm">两次密码不一致</span>
+            </div>
+        </div>
+        <div class="input-box-wrap login-wrap mb20">
+            <input class="input-box f12" required ng-model="user.username" name="username" placeholder="输入用户登录名"/>
+            <div ng-show="regFrm.$submitted || regFrm.username.$touched">
+                <span class="f12 c-red fl" ng-show="regFrm.username.$error.required">用户名不能为空</span>
+            </div>
+        </div>
+
+        <div class="login-op-wrap login-wrap f12 c-grey3">
+            <span ng-class="['login-box', 'mr5',{'checked': isagreed}]"
+                                                                ng-click="agreed(isagreed)"></span>我已阅读并接受<a
+                href="javascript:void(0);" class="link-blue2">Trustie服务协议</a>条款
+        </div>
+        <div class="login-wrap mt5"><a href="javascript:void(0);" ng-class="['btn1', 'bg-blue', 'f18', {'btn-disabled':!regFrm.$valid} ]" ng-click="reg(regFrm, user)">确定注册</a></div>
+
+    </form>
+</div>
+
+<my-alert message="errDialog.message" title="errDialog.title" visible="errDialog.visible"></my-alert>
\ No newline at end of file
diff --git a/public/assets/wechat/templates/alert.html b/public/assets/wechat/templates/alert.html
new file mode 100644
index 000000000..b59a1b87f
--- /dev/null
+++ b/public/assets/wechat/templates/alert.html
@@ -0,0 +1,12 @@
+<!--BEGIN dialog2-->
+<div class="weui_dialog_alert" id="dialog2" 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"><span class="weui_dialog_info">{{message}}</span></div>
+        <div class="weui_dialog_ft">
+            <a href="javascript:;" class="weui_btn_dialog primary" ng-click="dismiss()">确定</a>
+        </div>
+    </div>
+</div>
+<!--END dialog2-->
\ No newline at end of file
diff --git a/public/images/code-analysis-icon.png b/public/images/code-analysis-icon.png
new file mode 100644
index 000000000..18869da0e
Binary files /dev/null and b/public/images/code-analysis-icon.png differ
diff --git a/public/images/wechat/QR-code.jpg b/public/images/wechat/QR-code.jpg
new file mode 100644
index 000000000..ba2a9e6a3
Binary files /dev/null and b/public/images/wechat/QR-code.jpg differ
diff --git a/public/images/wechat/arrow.png b/public/images/wechat/arrow.png
new file mode 100644
index 000000000..f9f9b18c5
Binary files /dev/null and b/public/images/wechat/arrow.png differ
diff --git a/public/images/wechat/checked.png b/public/images/wechat/checked.png
new file mode 100644
index 000000000..77986d62e
Binary files /dev/null and b/public/images/wechat/checked.png differ
diff --git a/public/images/wechat/class.jpg b/public/images/wechat/class.jpg
new file mode 100644
index 000000000..e3eebb977
Binary files /dev/null and b/public/images/wechat/class.jpg differ
diff --git a/public/images/wechat/dot.png b/public/images/wechat/dot.png
new file mode 100644
index 000000000..bf1c0104e
Binary files /dev/null and b/public/images/wechat/dot.png differ
diff --git a/public/images/wechat/female.jpg b/public/images/wechat/female.jpg
new file mode 100644
index 000000000..219865572
Binary files /dev/null and b/public/images/wechat/female.jpg differ
diff --git a/public/images/wechat/female.png b/public/images/wechat/female.png
new file mode 100644
index 000000000..a13733ffc
Binary files /dev/null and b/public/images/wechat/female.png differ
diff --git a/public/images/wechat/male.jpg b/public/images/wechat/male.jpg
new file mode 100644
index 000000000..46d58f26e
Binary files /dev/null and b/public/images/wechat/male.jpg differ
diff --git a/public/images/wechat/male.png b/public/images/wechat/male.png
new file mode 100644
index 000000000..9f1214a4c
Binary files /dev/null and b/public/images/wechat/male.png differ
diff --git a/public/images/wechat/minus.png b/public/images/wechat/minus.png
new file mode 100644
index 000000000..32d82ea84
Binary files /dev/null and b/public/images/wechat/minus.png differ
diff --git a/public/images/wechat/plus.png b/public/images/wechat/plus.png
new file mode 100644
index 000000000..e5d83d212
Binary files /dev/null and b/public/images/wechat/plus.png differ
diff --git a/public/images/wechat/post-avatar.jpg b/public/images/wechat/post-avatar.jpg
new file mode 100644
index 000000000..bd2597dd2
Binary files /dev/null and b/public/images/wechat/post-avatar.jpg differ
diff --git a/public/images/wechat/search.png b/public/images/wechat/search.png
new file mode 100644
index 000000000..a04c1496c
Binary files /dev/null and b/public/images/wechat/search.png differ
diff --git a/public/images/wechat/setting.png b/public/images/wechat/setting.png
new file mode 100644
index 000000000..3c1159fc9
Binary files /dev/null and b/public/images/wechat/setting.png differ
diff --git a/public/images/wechat/tr-like.png b/public/images/wechat/tr-like.png
new file mode 100644
index 000000000..9d9d38dc3
Binary files /dev/null and b/public/images/wechat/tr-like.png differ
diff --git a/public/images/wechat/tr-reply.png b/public/images/wechat/tr-reply.png
new file mode 100644
index 000000000..aef9cffcf
Binary files /dev/null and b/public/images/wechat/tr-reply.png differ
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 22483c1d5..d56b5f940 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -547,6 +547,7 @@ function observeSearchfield(fieldId, targetId, url) {
         $.ajax({
           url: url,
           type: 'get',
+          dataType: 'jsonp',
           data: {q: $this.val()},
           success: function(data){ if(targetId) $('#'+targetId).html(data); },
           beforeSend: function(){ $this.addClass('ajax-loading'); },
@@ -1289,7 +1290,24 @@ function clear_data(k,mdu){
     }
 }
 
-function expand_reply(container, btnid, id, type, div_id) {
+function expand_reply(container,btnid){
+    var target = $(container).children();
+    var btn = $(btnid);
+    if(btn.data('init')=='0'){
+        btn.data('init',1);
+        btn.html('收起回复');
+        target.show();
+    }else{
+        btn.data('init',0);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+}
+
+function expand_all_reply(container, btnid, id, type, div_id) {
     var target = $(container);
     var btn = $(btnid);
     if (btn.data('init') == '0') {
@@ -1322,6 +1340,40 @@ function expand_reply(container, btnid, id, type, div_id) {
     }
 }
 
+function expand_journal_reply(container, btnid, id, type, div_id, allow_delete) {
+    var target = $(container);
+    var btn = $(btnid);
+    if (btn.data('init') == '0') {
+        btn.data('init', 1);
+        $.get(
+            '/users/all_journals',
+            {
+                type: type,
+                id: id,
+                div_id: div_id,
+                allow_delete: allow_delete
+            },
+            function(data) {
+
+            }
+        );
+        btn.html('收起回复');
+        //target.show();
+    } else if(btn.data('init') == '1') {
+        btn.data('init', 3);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+    else {
+        btn.data('init', 1);
+        btn.html('收起回复');
+        target.show();
+    }
+}
+
 function expand_reply_homework(container, btnid, id, type, div_id, is_in_course, course_activity, user_activity_id) {
     var target = $(container);
     var btn = $(btnid);
@@ -1503,4 +1555,18 @@ function edit_file_description(url,id){
         }
     );
 }
+//删除组织成员
+function ifDeleteOrgMember(id,name){
+    var htmlvalue = "</br><div style='width:550px;text-align:center'>您确定要删除"+name+"吗?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn fl' onclick='deleteOrgMember("+id+")'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div>" +
+        "<script>function deleteOrgMember(id){" +
+        "$.ajax({\n\
+            url: '/org_member/deleteOrgMember',\n\
+            type: 'get',\n\
+            dataType: 'jsonp',\n\
+            data: {id:id},\n\
+            success: function(data){},\n\
+        });\n\
+        hideModal();}</script>";
+    pop_up_box(htmlvalue,580,30,50);
+}
 
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 6fbf9f8c4..8b5e58618 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -185,7 +185,7 @@ function regex_course_password(str)
 //提交新建课程
 function submit_new_course()
 {
-    if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new')&&regex_course_password('new'))
+    if(regex_course_name('new')&&regex_course_class_period('new')&&regex_time_term('new'))
     {
         $("#new_course").submit();
     }
@@ -193,7 +193,7 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit')&&regex_course_password('edit'))
+    if(regex_course_name('edit')&&regex_course_class_period('edit')&&regex_time_term('edit'))
     {
         $("#edit_course_"+id).submit();
     }
diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js
index a43078dee..e5b57844a 100644
--- a/public/javascripts/resizeable_table.js
+++ b/public/javascripts/resizeable_table.js
@@ -1,7 +1,7 @@
 /**
  * Created by ttang on 2016/5/24.
  */
-    /*$(document).ready(function(){
+   /* $(document).ready(function(){
         $("th").each(function(){
             $(this).css("width",$(this).width()-1);
         });
@@ -38,7 +38,7 @@
                if (mousedown == true){
                    var width = (tdWidth + (evt.screenX - screenXStart)) - p1 + "px";//计算后的新的宽度
                    var width2 = (tdWidth2 - (evt.screenX - screenXStart)) - p2 + "px";
-                   if (parseInt(width)<0  || parseInt(width2)<0 || tdWidth > totalWidth || tdWidth2 > totalWidth){
+                   if (parseInt(width)<5  || parseInt(width2)<5 || tdWidth > totalWidth || tdWidth2 > totalWidth){
                        tartgetTd = null;
                        resizeable = false;
                        mousedown = false;
diff --git a/public/javascripts/wechat/CommentBox.jsx b/public/javascripts/wechat/CommentBox.jsx
deleted file mode 100644
index 7f30b38b1..000000000
--- a/public/javascripts/wechat/CommentBox.jsx
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Created by guange on 16/3/19.
- */
-
-
-
-
-var CommentBox = React.createClass({
-
-    loadFromServer: function(){
-        $.ajax({
-            url: this.props.url,
-            dataType: 'json',
-            success: function(data){
-                this.setState({data: data});
-            }.bind(this),
-            error: function(xhr,status,err){
-                console.error(this.props.url, status, err.toString());
-            }.bind(this)
-        });
-    },
-    onCommentSubmit: function(comment){
-        console.log(comment);
-    },
-    getInitialState: function(){
-        return {data: []};
-    },
-    componentDidMount: function(){
-        this.loadFromServer();
-        setInterval(this.loadFromServer, 2000);
-    },
-    render: function(){
-        return(
-        <div className="commentBox">
-            <CommentForm onCommentSubmit={this.onCommentSubmit}/>
-            <CommentList data={this.state.data}/>
-        </div>
-        );
-    }
-});
-
-var CommentList = React.createClass({
-    render: function(){
-
-        var commentNodes = this.props.data.map(function(comment){
-            return (
-                <Comment author={comment.author}>
-                    {comment.text}
-                </Comment>
-            )
-        });
-
-        return (
-            <div className="commentList">
-                {commentNodes}
-            </div>
-        );
-    }
-});
-
-var CommentForm = React.createClass({
-    handleSubmit: function(e){
-        e.preventDefault();
-
-        var author = this.refs.author.value.trim();
-        var text = this.refs.text.value.trim();
-        if(!text || !author){
-            return;
-        }
-
-        this.props.onCommentSubmit({author: author, text: text});
-
-        this.refs.author.value = '';
-        this.refs.text.value = '';
-        return;
-    },
-    render: function(){
-        return (
-            <form className="commentForm" onSubmit={this.handleSubmit}>
-                <input type="text" placeholder="Your name" ref="author" />
-                <input type="text" placeholder="Say something..." ref="text" />
-                <input type="submit" value="Post" />
-            </form>
-        );
-    }
-});
-
-
-var Comment = React.createClass({
-
-    rawMarkup: function() {
-        var rawMarkup = marked(this.props.children.toString(), {sanitize: true});
-        return { __html: rawMarkup };
-    },
-
-    render: function(){
-        return (
-            <div className="comment">
-                <h2 className="commentAuthor">
-                    {this.props.author}
-                </h2>
-                <span dangerouslySetInnerHTML={this.rawMarkup()}></span>
-            </div>
-        )
-    }
-})
-
-React.render(<CommentBox url="api/comment.json"/>, document.getElementById("example"));
\ No newline at end of file
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index ca9682db2..00d6bf3bc 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,546 +1,29 @@
 var app = angular.module('wechat', ['ngRoute']);
-var apiUrl = '/api/v1/';
-var debug = false; //调试标志,如果在本地请置为true
 
-if(debug===true){
-    //apiUrl = 'http://localhost:3000/api/v1/';
-    apiUrl = 'http://www.trustie.net/api/v1/';
-}
-
-
-app.factory('auth', function($http,$routeParams, $q){
-    var _openid = '';
-
-    if(typeof g_openid !== 'undefined'){
-        _openid = g_openid;
-    }
-
-    if(debug===true){
-        _openid = "orgVLv8TlS6e7FDiI6xdTGHRaaRo"; //guange的帐号
-    }
-
-    var getOpenId = function() {
-        var deferred = $q.defer();
-        if (typeof _openid !== 'undefined' && _openid.length > 0){
-            deferred.resolve(_openid);
-        } else {
-            var code = $routeParams.code;
-            $http({
-                url: '/wechat/get_open_id',
-                data: {code: code},
-                method: 'POST'
-            }).then(function successCallback(response) {
-                _openid = response.data.openid;
-                deferred.resolve(_openid);
-            }, function errorCallback(response) {
-                deferred.reject(response);
-            });
-        }
-        return deferred.promise;
-    };
-    var openid = function(){
-        return _openid;
-    };
-    return {getOpenId: getOpenId, openid: openid};
-});
-
-
-app.factory('rms', function(){
-    var _saveStorage = {};
-    var save = function(key, value){
-        _saveStorage[key] = value;
-    };
-
-    var get = function(key){
-        return _saveStorage[key];
-    };
-
-    return {save: save, get: get};
+app.constant('config', {
+    rootPath: '/assets/wechat/',
+    rootUrl: '/',
+    apiUrl: '/api/v1/'
 });
 
-app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common){
-    $scope.replaceUrl = function(url){
-        return url;
-    };
-
-    console.log("ActivityController load");
-
-    $scope.page = rms.get('page') || 0;
-    $scope.activities = rms.get("activities") || [];
-    $scope.has_more = rms.get("has_more");
-
-    $scope.loadActData = function(page){
-
-        $scope.page = page;
-        $http({
-            method: 'POST',
-            url: apiUrl+ "activities",
-            data: {openid: auth.openid(), page: page}
-        }).then(function successCallback(response) {
-            if(response.data.page >0) {
-                $scope.activities = $scope.activities.concat(response.data.data);
-            } else {
-                $scope.activities = response.data.data;
-            }
-
-            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);
 
-            console.log(response.data);
-
-        }, function errorCallback(response) {
-        });
-    };
-
-    if($scope.activities.length<=0){
-        auth.getOpenId().then(
-            function successCallback(response){
-                $scope.loadActData(0);
-            }, function errorCallback(response) {
-                alert("获取openid出错:"+response);
-            }
-        );
-    } else {
-        $timeout(function(){
-            window.scrollTo(0, rms.get("yoffset"));
-        });
+app.run(['$rootScope', 'auth', '$location', '$routeParams', function($rootScope, auth, $location, $routeParams){
 
+    if(g_redirect_path && g_redirect_path.length>1){
+        $location.path(g_redirect_path);
+        g_redirect_path = null;
     }
 
-    //跳到详情页
-    $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset", window.document.body.scrollTop);
-        $location.path('/'+type+'/'+act_id);
-    }
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
+    $rootScope.$on('$routeChangeError', function(event, next, current){
 
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.factory('common', function($http, auth, $routeParams){
-    var addCommonReply = function(id, type, data, cb){
-
-        if(!data.comment || data.comment.length<=0){
-            return;
-        }
-
-        var temp =  data.comment.replace(/\n/g,'<br/>');
-
-        var userInfo = {
-            type: type,
-            content: temp,
-            openid: auth.openid()
-        };
-        //回复按钮禁用
-        data.disabled = true;
-
-        $http({
-            method: 'POST',
-            url: apiUrl+ "new_comment/"+id,
-            data: userInfo
-        }).then(function successCallback(response) {
-            //alert("提交成功");
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
-            if(typeof cb === 'function'){
-                cb();
+        if(next && next.templateUrl){
+            if(!next.templateUrl.endsWith("login.html") && !next.templateUrl.endsWith("reg.html")){
+                $location.path("/login");
             }
-        }, function errorCallback(response) {
-        });
-    };
-
-    var loadCommonData = function(id, type){
-        return $http({
-            method: 'GET',
-            url: apiUrl+ type + "/" + id+"?openid="+auth.openid()
-        })
-    };
-
-    var addCommonPraise = function(act){
-        act.praise_count += 1;
-        act.has_praise = true;
-
-        $http({
-            method: 'POST',
-            url: apiUrl + "praise/" + act.act_id,
-            data:{openid:auth.openid(),type:act.act_type}
-        }).then(function successCallback(response) {
-            console.log(response.data);
-        }, function errorCallback(response) {
-        });
-
-    };
-
-    var decreaseCommonPraise = function(act){
-        act.praise_count -= 1;
-        act.has_praise = false;
-
-        $http({
-            method: 'POST',
-            url: apiUrl + "praise/" + act.act_id,
-            data:{openid:auth.openid(),type:act.act_type}
-        }).then(function successCallback(response) {
-            console.log(response.data);
-        }, function errorCallback(response) {
-        });
-    };
-
-    return {addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
-});
-
-app.controller('IssueController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'issues').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.issue = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
         }
-    );
-
-    $scope.addIssueReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'Issue', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-
-    };
+    });
 
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('HomeworkController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'whomeworks').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.homework = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addHomeworkReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'HomeworkCommon', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('CourseNoticeController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'newss').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.news = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addNoticeReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'News', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('DiscussionController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'messages').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.discussion = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addDiscussionReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'Message', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('JournalsController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'journal_for_messages').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.message = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addJournalReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'JournalsForMessage', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        console.log(act);
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        console.log(act);
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.controller('BlogController', function($scope, $http, $routeParams, auth, common){
-    $scope.formData = {comment: ''};
-
-    var loadData = function(id){
-        common.loadCommonData(id, 'blog_comments').then(function successCallback(response) {
-            console.log(response.data);
-            $scope.blog = response.data.data;
-        }, function errorCallback(response) {
-        });
-    };
-
-    auth.getOpenId().then(
-        function successCallback(response){
-            loadData($routeParams.id);
-        }, function errorCallback(response) {
-            alert("获取openid出错:"+response);
-        }
-    );
-
-    $scope.addBlogReply = function(data){
-        console.log(data.comment);
-        common.addCommonReply($routeParams.id, 'BlogComment', data, function(){
-            $scope.formData = {comment: ''};
-            loadData($routeParams.id);
-        });
-    };
-
-    $scope.addPraise = function(act){
-        console.log(act);
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        console.log(act);
-        common.decreaseCommonPraise(act);
-    };
-});
-
-app.filter('safeHtml', function ($sce) {
-    return function (input) {
-        return $sce.trustAsHtml(input);
-    }
-});
-
-//app.directive('textAutoHeight', function($timeout){
-//    return {
-//        restrict: 'A',
-//        scope: {},
-//        link: function(scope, element, attr){
-//            scope.text = '点击展开';
-//            $timeout(function(){
-//                var e = element.parent().children().eq(5);
-//                var height = e[0].scrollHeight;
-//                if(height>90){
-//                    element.css('display', 'block');
-//                    element.on('click', function(){
-//                        if(element.text() == "点击展开"){
-//                            e.css("height", height+'px');
-//                            element.text("点击隐藏");
-//                        } else {
-//                            e.css("height", '90px');
-//                            element.text("点击展开");
-//                        }
-//
-//                    });
-//                }
-//            }, false);
-//
-//        }
-//    }
-//});
-
-app.directive('inputAuto',function(){
-    return{
-        restrict: 'A',
-        scope: {},
-        link: function(scope, element){
-                var copyContainer = element.parent().children().eq(0);
-                var sendButton = element.parent().next();
-                element.on('input',function(){
-                    console.log(sendButton);
-                    copyContainer.html(element[0].value);
-                    var textHeight = copyContainer[0].scrollHeight;
-                    element.css('height', textHeight + 'px');
-                });
-                sendButton.on('click',function(){
-                    element.css('height','28px');
-                });
-            }
-    }
-});
-
-app.directive('loadingSpinner', ['$http', function ($http) {
-    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>',
-    };
-}]);
-
-app.config(['$routeProvider',"$httpProvider", "$locationProvider",function ($routeProvider, $httpProvider, $locationProvider) {
-    var rootPath = '/assets/wechat/'
-    //$locationProvider.html5Mode(true);
-    $routeProvider
-        .when('/activites', {
-            templateUrl: rootPath + 'activities.html',
-            controller: 'ActivityController'
-        })
-        .when('/issues/:id', {
-            templateUrl: rootPath + 'issue_detail.html',
-            controller: 'IssueController'
-        })
-        .when('/project_discussion/:id', {
-            templateUrl: rootPath + 'project_discussion.html',
-            controller: 'DiscussionController'
-        })
-        .when('/homework/:id', {
-            templateUrl: rootPath + 'homework_detail.html',
-            controller: 'HomeworkController'
-        })
-        .when('/course_notice/:id', {
-            templateUrl: rootPath + 'course_notice.html',
-            controller: 'CourseNoticeController'
-        })
-        .when('/course_discussion/:id', {
-            templateUrl: rootPath + 'course_discussion.html',
-            controller: 'DiscussionController'
-        })
-        .when('/journal_for_message/:id', {
-            templateUrl: rootPath + 'jour_message_detail.html',
-            controller: 'JournalsController'
-        })
-        .when('/blog_comment/:id', {
-            templateUrl: rootPath + 'blog_detail.html',
-            controller: 'BlogController'
-        })
-        .otherwise({
-            redirectTo: '/activites'
-        });
-
-        //监听异步请求,实现加载中显隐标记
-        $httpProvider.interceptors.push(function ($q, $rootScope) {
-            if ($rootScope.activeCalls == undefined) {
-                $rootScope.activeCalls = 0;
-            }
-
-            return {
-                request: function (config) {
-                    $rootScope.activeCalls += 1;
-                    return config;
-                },
-                requestError: function (rejection) {
-                    $rootScope.activeCalls -= 1;
-                    return rejection;
-                },
-                response: function (response) {
-                    $rootScope.activeCalls -= 1;
-                    return response;
-                },
-                responseError: function (rejection) {
-                    $rootScope.activeCalls -= 1;
-                    return rejection;
-                }
-            };
-        });
-}]);
+    $rootScope.$on('$routeChangeStart', function(event, next, current){
+    });
+}
+]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/auth.js b/public/javascripts/wechat/auth.js
deleted file mode 100644
index f9c2917fc..000000000
--- a/public/javascripts/wechat/auth.js
+++ /dev/null
@@ -1,36 +0,0 @@
-$(function(){
-    //获取url中的参数
-    function getUrlParam(name) {
-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
-        var r = window.location.search.substr(1).match(reg);  //匹配目标参数
-        if (r != null) return unescape(r[2]); return null; //返回参数值
-    }
-
-
-    var debug = false;
-
-    var g_openid = "";
-    if(debug){
-        g_openid = "填写要调试的openid即可";
-    }
-
-    window.getOpenId = function(cb){
-        if (g_openid.length>0){
-            cb(g_openid);
-        }
-        var code = getUrlParam("code");
-        $.ajax({
-            url: '/wechat/get_open_id',
-            data: {code: code},
-            type: 'post',
-            dataType: 'json',
-            success: function(data){
-                g_openid = data.openid;
-                cb(g_openid);
-            },
-            error: function(xhr,err){
-                alert("认证失败: "+err);
-            }
-        });
-    }
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/blog_detail.js b/public/javascripts/wechat/blog_detail.js
deleted file mode 100644
index 44121f83c..000000000
--- a/public/javascripts/wechat/blog_detail.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:blog-detail',{blog: data});
-        $('#blog-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        $('post-interactive-praise').click(function(){
-            praiseClick();
-        });
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'blog_comments/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            $(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "replyType" : "homework_assignment",
-                "replyContent" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: "前台地址/后台方法",    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    alert(data.d);        //用data.d来获取后台传过来的json语句，或者是单纯的语句
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    //点赞效果
-    var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
new file mode 100644
index 000000000..1fea6f08a
--- /dev/null
+++ b/public/javascripts/wechat/build/app.min.js
@@ -0,0 +1,22 @@
+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("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("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("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.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
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
new file mode 100644
index 000000000..73bd09f26
--- /dev/null
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -0,0 +1,62 @@
+
+app.controller('ActivityController',
+    ['$anchorScroll', '$location','$scope', '$http', '$timeout', 'auth', 'rms', 'common','alertService',
+    function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common, alertService){
+    $scope.replaceUrl = function(url){
+        return url;
+    };
+
+    $scope.alertService = alertService.create();
+    console.log("ActivityController load");
+
+    $scope.page = rms.get('page') || 0;
+    $scope.activities = rms.get("activities") || [];
+    $scope.has_more = rms.get("has_more");
+
+    $scope.loadActData = function(page){
+
+        $scope.page = page;
+        $http({
+            method: 'POST',
+            url: apiUrl+ "activities",
+            data: {token: auth.token(), page: page}
+        }).then(function successCallback(response) {
+            if(response.data.page >0) {
+                $scope.activities = $scope.activities.concat(response.data.data);
+            } else {
+                $scope.activities = response.data.data;
+            }
+
+            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);
+
+            console.log(response.data);
+
+        }, function errorCallback(response) {
+        });
+    };
+
+    if($scope.activities.length<=0){
+        $scope.loadActData(0);
+    } else {
+        $timeout(function(){
+            window.scrollTo(0, rms.get("yoffset"));
+        });
+    }
+
+    //跳到详情页
+    $scope.goDetail = function(type, act_id,id){
+        rms.save("yoffset", window.document.body.scrollTop);
+        $location.path('/'+type+'/'+act_id);
+    }
+
+    $scope.addPraise = function(act){
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        common.decreaseCommonPraise(act);
+    };
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
new file mode 100644
index 000000000..4c2403944
--- /dev/null
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -0,0 +1,16 @@
+app.controller('BlogController',
+    ['$scope', '$http', '$routeParams', 'auth', 'common',
+    function($scope, $http, $routeParams, auth, common){
+
+    common.init({
+            id: $routeParams.id,
+            scope: $scope,
+            type: 'blog_comments',
+            replyType: 'BlogComment',
+            loadCallback: function(data){
+                $scope.blog = data.data;
+            },
+            replyCallback: function(){
+            }
+        });
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
new file mode 100644
index 000000000..c2281be88
--- /dev/null
+++ b/public/javascripts/wechat/controllers/class.js
@@ -0,0 +1,128 @@
+app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams', function($scope, config, $http, auth, $location, $routeParams){
+
+    var vm = $scope;
+    var courseid = $routeParams.id;
+
+
+
+    var getUsers = function(){
+        if(vm.teachers.length<=0){
+            $http.get(config.apiUrl + 'courses/teachers?token='+auth.token()+'&course_id='+courseid).then(
+                function(response) {
+                    console.log(response.data);
+                    vm.teachers = response.data.data;
+                }
+            )
+        }
+
+        if(vm.students.length<=0){
+            $http.get(config.apiUrl + 'courses/students?token='+auth.token()+'&course_id='+courseid).then(
+                function(response) {
+                    console.log(response.data);
+                    vm.students = response.data.data;
+                }
+            )
+        }
+    }
+
+    var getResources = function(){
+        if(vm.resources.length<=0){
+            $http.post(config.apiUrl + "courses/"+courseid+"/attachments",
+                {token: auth.token(), name: ''}
+            ).then(function(response){
+                vm.resources = response.data.data;
+            });
+        }
+    }
+
+    var getHomeworks = function(){
+        if(vm.homeworks.length <=0){
+            $http.get(config.apiUrl + "courses/homeworks/"+courseid+"?token="+auth.token()).then(function(response){
+                vm.homeworks = response.data.data;
+                console.log(response.data);
+            });
+        }
+    }
+
+    var getExercises = function(){
+        if(vm.exercises.length <=0){
+            $http.get(config.apiUrl + "courses/"+courseid+"/exercises?token="+auth.token()).then(function(response){
+                vm.exercises = response.data.data;
+                console.log(response.data);
+            });
+        }
+    }
+
+
+    vm.isTeacher = false;
+    vm.currentTab = 1;
+    vm.tab = function(index){
+       vm.currentTab = index;
+       vm.searchText = '';
+
+        vm.showClassMate = false;
+        vm.showResources = false;
+        vm.showHomework = false;
+        vm.showTestcase = false;
+
+        if(vm.isTeacher){
+            if(index == 1){ //课件
+                getResources();
+                vm.showResources = true;
+            } else if(index==2){ //作业
+                getHomeworks();
+                vm.showHomework = true;
+            } else if(index==3){ //小测验
+                getExercises();
+                vm.showTestcase = true;
+            } else if(index==4){ //学生管理
+                getUsers();
+                vm.showClassMate = true;
+            }
+
+        } else {
+            if(index == 2){
+                getUsers();
+                vm.showClassMate = true;
+            } else if(index==1){
+                getResources();
+                vm.showResources = true;
+            }
+        }
+    }
+
+
+
+
+    vm.course = {};
+    vm.students = [];
+    vm.teachers = [];
+    vm.resources = [];
+    vm.homeworks = [];
+    vm.exercises = [];
+    
+    vm.invite = function(){
+       $location.path("/invite_code").search({id: courseid}); 
+    };
+
+    $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
+        function(response) {
+            console.log(response.data);
+            vm.course = response.data.data;
+            resetMenu(vm.course.current_user_is_teacher);
+            vm.tab(1);
+        }
+    );
+
+
+    var resetMenu = function(is_teacher){
+        vm.isTeacher = is_teacher;
+        if(is_teacher){
+            vm.menus = ["课件", "作业", "小测验", "学生管理"];
+        } else {
+            vm.menus = ['课堂资源', "我的同学"];
+        }
+
+    }
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
new file mode 100644
index 000000000..4484ff834
--- /dev/null
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -0,0 +1,30 @@
+/**
+ * Created by guange on 16/6/27.
+ */
+
+
+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;
+        }
+    );
+
+    vm.goClass = function(course_id){
+        console.log(course_id);
+        $location.path("/class").search({id: course_id});
+    }
+
+    vm.newClass = function(){
+        $location.path("/new_class");
+    }
+
+    vm.goResource =function(){
+        $location.path("/myresource");
+    }
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/course_notice.js b/public/javascripts/wechat/controllers/course_notice.js
new file mode 100644
index 000000000..77d2e6ab0
--- /dev/null
+++ b/public/javascripts/wechat/controllers/course_notice.js
@@ -0,0 +1,16 @@
+app.controller('CourseNoticeController', ['$scope', '$http', '$routeParams', 'auth', 'common',
+    function($scope, $http, $routeParams, auth, common){
+
+    common.init({
+            id: $routeParams.id,
+            scope: $scope,
+            type: 'newss',
+            replyType: 'News',
+            loadCallback: function(data){
+                $scope.news = data.data;
+            },
+            replyCallback: function(){
+            }
+        });
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/discussion.js b/public/javascripts/wechat/controllers/discussion.js
new file mode 100644
index 000000000..7e0811a0d
--- /dev/null
+++ b/public/javascripts/wechat/controllers/discussion.js
@@ -0,0 +1,14 @@
+
+app.controller('DiscussionController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
+    common.init({
+        id: $routeParams.id,
+        scope: $scope,
+        type: 'messages',
+        replyType: 'Message',
+        loadCallback: function(data){
+            $scope.discussion = data.data;
+        },
+        replyCallback: function(){
+        }
+    });
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/homework.js b/public/javascripts/wechat/controllers/homework.js
new file mode 100644
index 000000000..58f70db5a
--- /dev/null
+++ b/public/javascripts/wechat/controllers/homework.js
@@ -0,0 +1,16 @@
+
+app.controller('HomeworkController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
+    common.init({
+        id: $routeParams.id,
+        scope: $scope,
+        type: 'whomeworks',
+        replyType: 'HomeworkCommon',
+        loadCallback: function(data){
+            console.log(data);
+            $scope.homework = data.data;
+        },
+        replyCallback: function(){
+        }
+    });
+
+}]);
diff --git a/public/javascripts/wechat/controllers/invite_code.js b/public/javascripts/wechat/controllers/invite_code.js
new file mode 100644
index 000000000..1b92f592c
--- /dev/null
+++ b/public/javascripts/wechat/controllers/invite_code.js
@@ -0,0 +1,34 @@
+/**
+ * Created by guange on 16/6/22.
+ */
+
+
+app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config','auth', function($scope, $http, $routeParams, config, auth){
+    var vm = $scope;
+    
+    vm.course = {};
+    var courseid = $routeParams.id;
+    $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
+        function(response){
+            console.log(response.data);
+            vm.course = response.data.data;
+        }
+    );
+    
+    vm.share = function(){
+        window.WeixinJSBridge.invoke('sendAppMessage',{
+            'appid': 'wxf694495398c7d470', // 公众号appID
+            'type': 'link', // 非必填，music,vido或link,默认为link。
+            'data_url': '', // 非必填，连接地址,如音乐的mp3数据地址,供内置播放器使用
+            '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(res){
+            //alert(res.err_msg);
+        });
+    }
+    
+}]);
diff --git a/public/javascripts/wechat/controllers/issue.js b/public/javascripts/wechat/controllers/issue.js
new file mode 100644
index 000000000..ae0cc4450
--- /dev/null
+++ b/public/javascripts/wechat/controllers/issue.js
@@ -0,0 +1,15 @@
+app.controller('IssueController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
+
+    common.init({
+        id: $routeParams.id,
+        scope: $scope,
+        type: 'issues',
+        replyType: 'Issue',
+        loadCallback: function(data){
+            console.log(data);
+            $scope.issue = data.data;
+        },
+        replyCallback: function(){
+        }
+    });
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/journals.js b/public/javascripts/wechat/controllers/journals.js
new file mode 100644
index 000000000..76b4f8cf6
--- /dev/null
+++ b/public/javascripts/wechat/controllers/journals.js
@@ -0,0 +1,13 @@
+app.controller('JournalsController', ['$scope', '$http', '$routeParams', 'auth', 'common', function($scope, $http, $routeParams, auth, common){
+    common.init({
+        id: $routeParams.id,
+        scope: $scope,
+        type: 'journal_for_messages',
+        replyType: 'JournalsForMessage',
+        loadCallback: function(data){
+            $scope.message = data.data;
+        },
+        replyCallback: function(){
+        }
+    });
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
new file mode 100644
index 000000000..1dbf804ed
--- /dev/null
+++ b/public/javascripts/wechat/controllers/login.js
@@ -0,0 +1,53 @@
+app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams', 'alertService', 'config','auth','session',
+    function ($scope, $http, $location, $routeParams, alertService, config, auth,session) {
+        if(auth.get_bind().then(function(){
+                $location.path("/activities");
+         }));
+
+        if($routeParams.code){
+            session.save('code', $routeParams.code);
+        }
+
+        var vm = $scope;
+        vm.loginFailed = false;
+        vm.alertService = alertService.create();
+        vm.findPwdDialog = alertService.create();
+
+        vm.login = function (frm, user) {
+            frm.$setSubmitted();
+            console.log(user);
+
+            if (!frm.$valid) {
+                console.log(frm.$error);
+                return;
+            }
+
+            console.log(apiUrl + "auth");
+
+            $http.post(
+                config.apiUrl + "users/wxbind",
+                {login: user.login, password: user.password}
+            ).then(
+                function(response) {
+                    console.log(response.data);
+                    vm.loginFailed = (response.data.status != 0);
+                    if (!$scope.loginFailed) { //绑定成功
+                        vm.alertService.showMessage('提示', response.data.message, function(){
+                            $location.path("/activities");
+                        });
+                    } else {
+                        vm.alertService.showMessage('出错了', response.data.message);
+                    }
+                }
+            ).catch(function(e){
+                vm.alertService.showMessage('出错了', e);
+            });
+        };
+
+        vm.showBox = function () {
+            vm.findPwdDialog.showMessage("提示", "请访问www.trustie.net获取密码，谢谢！");
+        }
+        vm.goReg = function () {
+            $location.path('/reg');
+        }
+    }]);
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
new file mode 100644
index 000000000..87b2a4d82
--- /dev/null
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -0,0 +1,30 @@
+app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', function($scope, $http, auth, config){
+    var vm = $scope;
+    vm.menus = ['课件', '作业', '测验'];
+
+    vm.resources = [];
+    vm.homeworks = [];
+    vm.exercise  = [];
+
+    vm.tab = function(index){
+        vm.currentTab = index;
+        if(index==1){
+            $http.get(config.apiUrl + "resources?token="+auth.token()).then(function(response){
+                console.log(response.data);
+                vm.resources = response.data.data;
+            });
+        } else if(index==2){
+            $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){
+            $http.get(config.apiUrl + "resources/exercies?token="+auth.token()).then(function(response){
+                console.log(response.data);
+                vm.exercise = response.data.data;
+            });
+        }
+    }
+
+    vm.tab(1);
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/new_class.js b/public/javascripts/wechat/controllers/new_class.js
new file mode 100644
index 000000000..488db31c6
--- /dev/null
+++ b/public/javascripts/wechat/controllers/new_class.js
@@ -0,0 +1,12 @@
+
+
+app.controller('NewClassController', ['$scope', '$http', 'auth', 'config', function($scope, $http, auth, config){
+    var vm = $scope;
+
+    vm.resources = [];
+    vm.homeworks = [];
+    vm.exercises = [];
+
+    
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/reg.js b/public/javascripts/wechat/controllers/reg.js
new file mode 100644
index 000000000..dfa010ad7
--- /dev/null
+++ b/public/javascripts/wechat/controllers/reg.js
@@ -0,0 +1,42 @@
+app.controller('RegController', ['$scope', '$http', '$location', 'alertService',
+    function ($scope, $http, $location, alertService) {
+
+        var vm = $scope;
+        vm.errDialog = alertService.create();
+
+        vm.goLogin = function () {
+            $location.path("/login");
+        }
+
+        vm.isagreed = true;
+        vm.agreed = function (_isagreed) {
+            vm.isagreed = !_isagreed;
+        };
+
+        vm.reg = function (frm, user) {
+
+            frm.$setSubmitted();
+
+            console.log(frm);
+            if (!frm.$valid) {
+                console.log(frm.$error);
+                return;
+            }
+
+            console.log(user);
+
+            $http.post(
+                apiUrl + "users",
+                {login: user.username, password: user.password, mail: user.email}
+            ).then(function (response) {
+                if (response.data.status != 0) {
+                    vm.errDialog.showMessage('出错了',response.data.message);
+                } else {
+                    vm.errDialog.showMessage("提示","注册且绑定微信成功");
+                }
+            }, function (response) {
+                vm.errDialo.showMessage('出错了',response.data);
+            });
+        }
+
+    }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/course_discussion.js b/public/javascripts/wechat/course_discussion.js
deleted file mode 100644
index e01b6b451..000000000
--- a/public/javascripts/wechat/course_discussion.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:c-message-detail-reply',{reply: data});
-        $('#all_course_message_reply').prepend(html);
-    };
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:course-discussion',{discussion: data});
-        $('#c-discussion-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'messages/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            /*$(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "Type" : "Message",
-                "Content" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: apiUrl + 'new_comment/' + homeworkID,    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    setReplyTemplate(data.data);
-                    alert("6");
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    /*//点赞效果
-    var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }*/
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/course_notice.js b/public/javascripts/wechat/course_notice.js
deleted file mode 100644
index 546aac385..000000000
--- a/public/javascripts/wechat/course_notice.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:news-detail-reply',{reply: data});
-        $('#all_news_reply').prepend(html);
-    };
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:course-notice',{course: data});
-        $('#c-notice-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'newss/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            /*$(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "type" : "News",
-                "content" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: apiUrl + 'new_comment/' + homeworkID,    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    setReplyTemplate(data.data);
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    //点赞效果
-    var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/alert.js b/public/javascripts/wechat/directives/alert.js
new file mode 100644
index 000000000..f53ecdb5a
--- /dev/null
+++ b/public/javascripts/wechat/directives/alert.js
@@ -0,0 +1,19 @@
+app.directive('myAlert', ['config', function(config){
+    return {
+        templateUrl: config.rootPath+ 'templates/alert.html',
+        scope: {
+            title: "=",
+            message: "=",
+            visible: "=",
+            cb: "="
+        },
+        link: function(scope){
+            scope.dismiss = function(){
+                scope.visible = false;
+                if(typeof scope.cb === 'function'){
+                    scope.cb();
+                }
+            };
+        }
+    }
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/form_validate.js b/public/javascripts/wechat/directives/form_validate.js
new file mode 100644
index 000000000..553560c56
--- /dev/null
+++ b/public/javascripts/wechat/directives/form_validate.js
@@ -0,0 +1,10 @@
+app.directive('pwdconfirm', function(){
+   return {
+       require: 'ngModel',
+       link: function(scope, elm, attrs, ctrl){
+           ctrl.$validators.pwdconfirm = function(modelValue, viewValue) {
+               return scope.user && scope.user.password == viewValue;
+           }
+       }
+   }
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/input_auto.js b/public/javascripts/wechat/directives/input_auto.js
new file mode 100644
index 000000000..bcb44141e
--- /dev/null
+++ b/public/javascripts/wechat/directives/input_auto.js
@@ -0,0 +1,19 @@
+app.directive('inputAuto',function(){
+    return{
+        restrict: 'A',
+        scope: {},
+        link: function(scope, element){
+            var copyContainer = element.parent().children().eq(0);
+            var sendButton = element.parent().next();
+            element.on('input',function(){
+                console.log(sendButton);
+                copyContainer.html(element[0].value);
+                var textHeight = copyContainer[0].scrollHeight;
+                element.css('height', textHeight + 'px');
+            });
+            sendButton.on('click',function(){
+                element.css('height','28px');
+            });
+        }
+    }
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/loading_spinner.js b/public/javascripts/wechat/directives/loading_spinner.js
new file mode 100644
index 000000000..780056828
--- /dev/null
+++ b/public/javascripts/wechat/directives/loading_spinner.js
@@ -0,0 +1,7 @@
+app.directive('loadingSpinner', ['$http', function ($http) {
+    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>',
+    };
+}]);
diff --git a/public/javascripts/wechat/gulpfile.js b/public/javascripts/wechat/gulpfile.js
index 439b6ae5d..ea0649376 100644
--- a/public/javascripts/wechat/gulpfile.js
+++ b/public/javascripts/wechat/gulpfile.js
@@ -8,3 +8,10 @@ gulp.task('minify', function () {
   .pipe(concat('angular.all.min.js'))
   .pipe(gulp.dest('build'))
 });
+
+gulp.task("default", function(){
+  gulp.src(['app.js','others/factory.js','others/filter.js', 'controllers/*.js', 'directives/*.js', 'others/routes.js'])
+      .pipe(uglify())
+      .pipe(concat('app.min.js'))
+      .pipe(gulp.dest('build'))
+});
diff --git a/public/javascripts/wechat/homework_detail.js b/public/javascripts/wechat/homework_detail.js
deleted file mode 100644
index 166ed20bf..000000000
--- a/public/javascripts/wechat/homework_detail.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Created by root on 3/31/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:homework-detail-reply',{reply: data});
-        $('#all_homework_reply').prepend(html);
-    };
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:homework-detail',{homework: data});
-        $('#homework-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'whomeworks/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            /*//将用户输入内容插入最后一条回复
-            $(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            getOpenId(function(openid) {
-                //获取并传送回复用户数据
-                var userInfo = {
-                    "type": "HomeworkCommon",
-                    "content": postInput,
-                    openid: openid
-                };
-
-                $.ajax({
-                    type: "POST",     //提交方式
-                    dataType: "json",     //类型
-                    url: apiUrl + 'new_comment/' + homeworkID,    //提交的页面，方法名
-                    data: userInfo,    //参数，如果没有，可以为null
-                    success: function (data) { //如果执行成功，那么执行此方法
-                        setReplyTemplate(data.data);
-                    },
-                    error: function (err) { //如果执行不成功，那么执行此方法
-                        alert("err:" + err);
-                    }
-                })
-            });
-        }
-
-    };
-
-    //点赞效果
-    /*var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    };*/
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/issue_detail.js b/public/javascripts/wechat/issue_detail.js
deleted file mode 100644
index 2b2766d29..000000000
--- a/public/javascripts/wechat/issue_detail.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-/**
- * Created by root on 3/31/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:issue-detail-reply',{issue_reply: data});
-        $('#all_issue_reply').prepend(html);
-    };
-
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:issue-detail',{issues: data});
-        $('#issue-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            IssueReplyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'issues/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var IssueUrl = window.location.search;
-    var IssueID = IssueUrl.split("=")[1];
-
-    loadDataFromServer(IssueID);
-
-    //点击回复按钮，插入回复内容
-    var IssueReplyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            /*$(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            getOpenId(function(openid) {
-                //获取并传送回复用户数据
-                var userInfo = {
-                    "type": "Issue",
-                    "content": postInput,
-                    openid: openid,
-                };
-
-                $.ajax({
-                    type: "POST",     //提交方式
-                    dataType: "json",     //类型
-                    url: apiUrl + 'new_comment/' + IssueID,    //提交的页面，方法名
-                    data: userInfo,    //参数，如果没有，可以为null
-                    success: function (data) { //如果执行成功，那么执行此方法
-                        setReplyTemplate(data.data);
-                    },
-                    error: function (err) { //如果执行不成功，那么执行此方法
-                        alert("err:" + err);
-                    }
-                })
-            });
-        }
-
-    };
-
-    //点赞效果
-    /*var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    };*/
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/message_detail.js b/public/javascripts/wechat/message_detail.js
deleted file mode 100644
index 279da05d9..000000000
--- a/public/javascripts/wechat/message_detail.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:message-detail',{message: data});
-        $('#message-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        $('post-interactive-praise').click(function(){
-            praiseClick();
-        });
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'journal_for_messages/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            //将用户输入内容插入最后一条回复
-            $(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "replyType" : "homework_assignment",
-                "replyContent" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: "前台地址/后台方法",    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    alert(data.d);        //用data.d来获取后台传过来的json语句，或者是单纯的语句
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    //点赞效果
-    var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
new file mode 100644
index 000000000..6acf25c59
--- /dev/null
+++ b/public/javascripts/wechat/others/factory.js
@@ -0,0 +1,182 @@
+app.factory('alertService', function(){
+    function Alert(){
+        this.title = null;
+        this.message = null;
+        this.visible = null;
+        this.cb = null;
+    }
+
+    Alert.prototype.showMessage = function(title, msg, cb){
+        this.message = msg;
+        this.title = title;
+        this.visible = true;
+        this.cb = cb;
+    }
+
+    Alert.prototype.dismiss = function(){
+        this.message = null;
+        this.title = null;
+        this.visible = false;
+        if(this.cb) {this.cb();}
+    }
+
+    return {
+        create: function(){
+            return new Alert();
+        }
+    }
+});
+
+
+app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function($http,$routeParams, $q, session,config){
+    //是否已经绑定
+    var isBind = function(){
+        var defer = $q.defer();
+
+        var token = getToken();
+        if(token && token.length>10){
+            defer.resolve(token);
+        } else {
+            var code = window.g_code || $routeParams.code || session.get("code");
+            $http.post(
+                '/wechat/get_bind',
+                {}  ///不用传code了,都由服务器来处理
+            ).then(function(response){
+                if(response.data.status!=0){
+                    defer.reject(response.data.message);
+                }else {
+                    session.save("token", response.data.token);
+                    defer.resolve(response.data.token);
+                }
+            }).catch(function(e){
+                defer.reject(e);
+            });
+        }
+
+        return defer.promise;
+    }
+
+    var getToken = function(){
+        return session.get("token");
+    }
+    return {get_bind: isBind, token: getToken};
+}]);
+
+app.factory("session", function(){
+    return {
+        save: function(key,value){
+            sessionStorage.setItem(key,value);
+        },
+        get: function(key){
+            return sessionStorage.getItem(key);
+        }
+    }
+});
+
+app.factory('rms', function(){
+    var _saveStorage = {};
+    var save = function(key, value){
+        _saveStorage[key] = value;
+    };
+
+    var get = function(key){
+        return _saveStorage[key];
+    };
+
+    return {save: save, get: get};
+});
+
+app.factory('common', ['$http', 'auth', '$routeParams', function($http, auth, $routeParams){
+    var addCommonReply = function(id, type, data, cb){
+
+        if(!data.comment || data.comment.length<=0){
+            return;
+        }
+
+        var temp =  data.comment.replace(/\n/g,'<br/>');
+
+        var userInfo = {
+            type: type,
+            content: temp,
+            token: auth.token()
+        };
+        //回复按钮禁用
+        data.disabled = true;
+
+        $http({
+            method: 'POST',
+            url: apiUrl+ "new_comment/"+id,
+            data: userInfo
+        }).then(function successCallback(response) {
+            //alert("提交成功");
+            //数据提交完成,回复按钮启用
+            data.disabled = false;
+            if(typeof cb === 'function'){
+                cb();
+            }
+        }, function errorCallback(response) {
+        });
+    };
+
+    var loadCommonData = function(id, type){
+        return $http({
+            method: 'GET',
+            url: apiUrl+ type + "/" + id+"?token="+auth.token()
+        })
+    };
+
+    var addCommonPraise = function(act){
+        act.praise_count += 1;
+        act.has_praise = true;
+
+        $http({
+            method: 'POST',
+            url: apiUrl + "praise/" + act.act_id,
+            data:{token:auth.token(),type:act.act_type}
+        }).then(function successCallback(response) {
+            console.log(response.data);
+        }, function errorCallback(response) {
+        });
+
+    };
+
+    var decreaseCommonPraise = function(act){
+        act.praise_count -= 1;
+        act.has_praise = false;
+
+        $http({
+            method: 'POST',
+            url: apiUrl + "praise/" + act.act_id,
+            data:{token:auth.token(),type:act.act_type}
+        }).then(function successCallback(response) {
+            console.log(response.data);
+        }, function errorCallback(response) {
+        });
+    };
+
+    var init = function(args){
+        args.scope.formData = {comment: ''};
+        var loadData = function(id){
+            loadCommonData(id, args.type).then(function successCallback(response) {
+                args.loadCallback(response.data);
+            }, function errorCallback(response) {
+            });
+        };
+
+        loadData(args.id);
+        args.scope.addReply = function(data){
+            console.log(data.comment);
+            addCommonReply(args.id, args.replyType, data, function(){
+                args.scope.formData = {comment: ''};
+                loadData(args.id);
+                if(typeof args.replyCallback === 'function'){
+                    args.replyCallback();
+                }
+            });
+        };
+        args.scope.addPraise = addCommonPraise;
+        args.scope.decreasePraise = decreaseCommonPraise;
+    }
+
+    return {init: init, addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/filter.js b/public/javascripts/wechat/others/filter.js
new file mode 100644
index 000000000..96007958d
--- /dev/null
+++ b/public/javascripts/wechat/others/filter.js
@@ -0,0 +1,14 @@
+app.filter('safeHtml', ['$sce',function ($sce) {
+    return function (input) {
+        return $sce.trustAsHtml(input);
+    }
+}]);
+
+app.filter('identify', function () {
+    return function(input){
+        if (input == 'TeachingAsistant'){
+            return '教辅'
+        }
+        return '';
+    }
+})
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
new file mode 100644
index 000000000..80efa71e9
--- /dev/null
+++ b/public/javascripts/wechat/others/routes.js
@@ -0,0 +1,67 @@
+app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', function ($routeProvider, $httpProvider, $locationProvider, config) {
+    var rootPath = config.rootPath;
+    var resolve = {
+        delay: ['auth',function(auth){
+            return auth.get_bind();
+        }]
+    };
+    var makeRoute = function(path, ctrl){
+        return {
+            templateUrl: rootPath + path,
+            controller: ctrl,
+            resolve: resolve
+        }
+    }
+    //$locationProvider.html5Mode(true);
+    $routeProvider
+        .when('/login', {
+            templateUrl: rootPath + 'login.html',
+            controller: 'LoginController'
+        })
+        .when('/reg', {
+            templateUrl: rootPath + 'reg.html',
+            controller: 'RegController'
+        })
+        .when('/activites', makeRoute('activities.html', 'ActivityController'))
+        .when('/issues/:id', makeRoute('issue_detail.html', 'IssueController'))
+        .when('/project_discussion/:id', makeRoute('project_discussion.html', 'DiscussionController'))
+        .when('/homework/:id', makeRoute('homework_detail.html', 'HomeworkController'))
+        .when('/course_notice/:id', makeRoute('course_notice.html', 'CourseNoticeController'))
+        .when('/course_discussion/:id', makeRoute('course_discussion.html', 'DiscussionController'))
+        .when('/journal_for_message/:id', makeRoute('jour_message_detail.html', 'JournalsController'))
+        .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
+        .when('/class', makeRoute('class.html', 'ClassController'))
+        .when('/new_class', makeRoute('new_class.html', 'NewClassController'))
+        .when('/class_list', makeRoute('class_list.html', 'ClassListController'))
+        .when('/myresource', makeRoute('myresource.html', 'MyResourceController'))
+        .when('/invite_code', makeRoute('invite_code.html', 'InviteCodeController'))
+        .otherwise({
+            redirectTo: '/activites'
+        });
+
+    //监听异步请求,实现加载中显隐标记
+    $httpProvider.interceptors.push(['$q', '$rootScope', function ($q, $rootScope) {
+        if ($rootScope.activeCalls == undefined) {
+            $rootScope.activeCalls = 0;
+        }
+
+        return {
+            request: function (config) {
+                $rootScope.activeCalls += 1;
+                return config;
+            },
+            requestError: function (rejection) {
+                $rootScope.activeCalls -= 1;
+                return rejection;
+            },
+            response: function (response) {
+                $rootScope.activeCalls -= 1;
+                return response;
+            },
+            responseError: function (rejection) {
+                $rootScope.activeCalls -= 1;
+                return rejection;
+            }
+        };
+    }]);
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/project_discussion.js b/public/javascripts/wechat/project_discussion.js
deleted file mode 100644
index 94cdcea10..000000000
--- a/public/javascripts/wechat/project_discussion.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Created by root on 4/1/16.
- */
-/**
- * Created by root on 4/1/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-
-    var apiUrl = '/api/v1/';
-
-    var setReplyTemplate = function(data){
-        console.log(data);
-        var html=bt('t:homework-detail-reply',{reply: data});
-        $('#all_homework_reply').prepend(html);
-    };
-
-
-    var setTemplate = function(data){
-        console.log(data);
-        var html=bt('t:project-discussion',{discussion: data});
-        $('#p-discussion-container').prepend(html);
-        $('.post-reply-submit').click(function(){
-            replyInsert();
-        });
-        /*$('post-interactive-praise').click(function(){
-            praiseClick();
-        });*/
-    };
-
-    var loadDataFromServer = function(id){
-        //getOpenId(function(openid){
-        $.ajax({
-            url: apiUrl + 'messages/' + id,
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
-        });
-        //})
-
-
-    };
-
-    var homeworkUrl = window.location.search;
-    var homeworkID = homeworkUrl.split("=")[1];
-
-    loadDataFromServer(homeworkID);
-
-    //点击回复按钮，插入回复内容
-    var replyInsert = function(){
-        var replyContent = $("#postInput").val();
-        if (!replyContent){
-            alert("请输入回复");
-        }else{
-
-            /*//将用户输入内容插入最后一条回复
-            $(".post-reply-wrap:last").after('<div class="post-reply-wrap border-bottom"><div class="post-reply-row"><div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="45" height="45"  /></div><div class="ml55"><div class="post-reply-user hidden">Mrs. Ashford</div><div class="post-reply-content c-grey2 mb10"></div><div class="post-reply-date fl"></div><div class="post-reply-trigger fr undis">回复</div></div><div class="cl"></div></div> </div>');
-            $(".post-reply-content:last").append(replyContent);
-            $(".post-reply-date:last").append(Date());*/
-            var postInput = $("#postInput").val();
-            $("#postInput").val("");
-            //回复数目+1
-            var replyNum = $(".post-interactive-reply").text().match(/\d+/g);
-            replyNum++;
-            $(".reply-num").text("(" + replyNum + ")");
-
-            //获取并传送回复用户数据
-            var userInfo = {
-                "type" : "Message",
-                "content" : postInput
-            };
-
-            $.ajax({
-                type: "POST",     //提交方式
-                dataType: "json",     //类型
-                url: apiUrl + 'new_comment/' + homeworkID,    //提交的页面，方法名
-                data: userInfo,    //参数，如果没有，可以为null
-                success: function (data) { //如果执行成功，那么执行此方法
-                    setReplyTemplate(data.data);        //用data.d来获取后台传过来的json语句，或者是单纯的语句
-                },
-                error: function (err) { //如果执行不成功，那么执行此方法
-                    alert("err:" + err);
-                }
-            });
-        }
-
-    }
-
-    //点赞效果
-    /*var praiseClick = function(){
-        var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
-        praiseNum++;
-        $(".praise-num").text("(" + praiseNum + ")");
-    }*/
-
-
-});
\ No newline at end of file
diff --git a/public/javascripts/wechat/wechat_dev.js b/public/javascripts/wechat/wechat_dev.js
deleted file mode 100644
index 36529e0b8..000000000
--- a/public/javascripts/wechat/wechat_dev.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Created by root on 3/25/16.
- */
-$(document).ready(function(){
-
-    var bt=baidu.template;
-    bt.LEFT_DELIMITER='<!';
-    bt.RIGHT_DELIMITER='!>';
-
-    var apiUrl = '/api/v1/';
-    var loadDataFromServer = function(id, page){
-        getOpenId(function(openid){
-            $.ajax({
-                url: apiUrl + 'activities',
-                data: {openid: openid, page: page},
-                type: 'POST',
-                dataType: 'json',
-                success: function(data){
-                    setTemplate(data.data, data.all_count, data.count, data.page);
-                },
-                error: function(xhr,status,err){
-                    console.log(err);
-                }
-            });
-        })
-
-    };
-    var setTemplate = function(data, all_count, count, page){
-        console.log(data);
-        var html=bt('t:result-list',{activities: data, all_count: all_count, count: count, page: page});
-        if (page == 0) {
-            $('#container').prepend(html);
-        } else {
-            $("#more_activities").remove();
-            $('#container').append(html);
-        }
-        descToggle();
-    };
-    //内容全部显示与部分隐藏
-    var descToggle = function(){
-        $(".post-all-content").each(function(){
-            var postHeight = $(this).height();
-            if (postHeight > 90){
-                $(this).parent().next().css("display","block");
-                $(this).parent().next().toggle(function(){
-                    $(this).text("点击隐藏");
-                    $(this).prev().css("height",postHeight);
-                },function(){
-                    $(this).text("点击展开");
-                    $(this).prev().css("height",90);
-                });
-            }
-        });
-    }
-
-    loadDataFromServer(8686, 0);
-});
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index ed99217b8..d0a5e7ab3 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -109,7 +109,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 
 /*20160520作品列表table*/
 .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
-.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1;}
+.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;}
 
 /*作业信息*/
 .mt-2 {margin-top:-2px;}
@@ -1426,4 +1426,4 @@ a.pages-big{ width:50px;}
 .H60 {height:60px !important;}
 .W420 {width:420px;}
 .W300 {width:300px !important;}
-.W600{ width:600px;}
\ No newline at end of file
+.W600{ width:600px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index ee3ddf6df..7fad9854f 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1621,8 +1621,9 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 /*消息弹框*/
 .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:200px; overflow:hidden;}
+.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;}
@@ -1801,4 +1802,4 @@ input.new_loggin_input{
 .H60 {height:60px !important;}
 .W420 {width:420px;}
 .W300 {width:300px !important;}
-.W600{ width:600px;}
\ No newline at end of file
+.W600{ width:600px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index d8b8cc74a..bde560613 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1247,6 +1247,39 @@ a.pages-big{ width:50px;}
 .red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 
+/*20160622质量分析*/
+.analysis-tag-wrap {width:100%; color:#000; height:20px; line-height:20px; vertical-align:middle;}
+.analysis-tag {width:10px; height:20px; background-color:#777;}
+.analysis-block {padding:15px; border:1px solid #d9d9d9;}
+.flex {display:flex;}
+.analysis-genral {flex:1; display:block; text-align:center;}
+.analysis-block-icon {background:url(../images/code-analysis-icon.png) -2px -8px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-serious-icon {background:url(../images/code-analysis-icon.png) -2px -34px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-main-icon {background:url(../images/code-analysis-icon.png) -2px -59px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-secondary-icon {background:url(../images/code-analysis-icon.png) -2px -85px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-info-icon {background:url(../images/code-analysis-icon.png) -2px -111px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.quality-percentage {width:320px; height:14px; display:inline-block;}
+.quality-percentage-rate {width:50%; height:14px; background-color:#0a6c99; display:inline-block;}
+.image-cir {border-radius:50%;}
+.analysis-genral-icon {position:absolute; padding:1px 5px; display:inline-block; top:5px;}
+.contribute-list-avatar {width:80px; vertical-align:middle; text-align:center;}
+.contribute-list-code {width:160px; vertical-align:middle; text-align:center;}
+.contribute-list-problem {width:170px; vertical-align:middle; text-align:center;}
+.contribute-list-rate {width:228px; vertical-align:middle; text-align:center;}
+.contribute-list-height {height:80px;}
+.contribute-list-line-height {line-height:80px;}
+
+/*20160623分析结果*/
+.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-name-icon {background:url(../images/code-analysis-icon.png) -2px -148px no-repeat; width:16px; height:16px; display:inline-block; vertical-align:middle;}
+
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
 
@@ -1254,4 +1287,4 @@ a.pages-big{ width:50px;}
 .H60 {height:60px !important;}
 .W420 {width:420px;}
 .W300 {width:300px !important;}
-.W600{ width:600px;}
\ No newline at end of file
+.W600{ width:600px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 333c410ca..500923519 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -27,6 +27,7 @@ a.btn_message_free{ background:#ff5722; display:block;  text-align:center; color
 h2{ font-size:18px; }
 h3{ font-size:14px; }
 h4{ font-size:14px; }
+.f8 {font-size:8px;}
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}
@@ -130,6 +131,7 @@ h4{ font-size:14px; }
 .mt12 { margin-top:12px !important;}
 .mt15 {margin-top:15px;}
 .mt19 {margin-top:19px !important;}
+.mt35 {margin-top:35px;}
 .ml70{margin-left: 70px;}
 .mb0 {margin-bottom: 0px !important;}
 .mb4{ margin-bottom:4px;}
@@ -137,6 +139,8 @@ h4{ font-size:14px; }
 .mb8 {margin-bottom:8px;}
 .mb10{ margin-bottom:10px !important;}
 .mb20{ margin-bottom:20px;}
+.mb30 {margin-bottom:30px;}
+.mb40 {margin-bottom:40px;}
 .pl10 {padding-left:10px;}
 .pl15{ padding-left:15px;}
 .pl5{ padding-left:5px;}
@@ -228,6 +232,7 @@ a.c_green{ color:#28be6c;}
 
 .b_grey{ background: #F5F5F5;}
 .b_dgrey{ background: #CCC;}
+.c_white {color:#fff;}
 .c_orange{color:#e8770d;}
 .c_dark{ color:#2d2d2d;}
 .c_lorange{ color:#ff9900;}
@@ -239,6 +244,11 @@ a.c_green{ color:#28be6c;}
 .c_dblue{ color:#09658c;}
 .b_blue{background:#64bdd9;}
 .b_green{background:#28be6c;}
+.b_slow_yellow{background:#adde18;}
+.b_yellow{background:#DDDF0D;}
+.b_slow_red{background:#df8538;}
+.b_green2 {background:#63c360;}
+.b_red {background:#d60308;}
 .b_w{ background:#fff !important;}
 
 /*add by Tim*/
@@ -341,6 +351,8 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;white-space:nowrap;}
 .bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;white-space:nowrap;}
 .grey_border{border:1px solid #dddddd !important;}
+.borderRadius {border-radius:5px;}
+.tac {text-align:center;}
 /* commonpic */
 .pic_date{ display:block; background:url(../images/new_project/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; float:left;}
 .pic_add{ display:block; background:url(../images/new_project/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; float:left;}
@@ -1155,8 +1167,9 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 /*消息弹框*/
 .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 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:200px; overflow:hidden;}
+.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;}
@@ -1165,3 +1178,8 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+
+/*20160622代码分析弹窗*/
+.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
\ No newline at end of file
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 6cccb3615..3360d81ee 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -2,8 +2,10 @@
 /* CSS Document */
 
 /*基本样式*/
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
-h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+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;}
+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;}
@@ -12,29 +14,43 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .f15 {font-size:15px;}
 .fb {font-weight:bold;}
 .mt2 {margin-top:2px;}
+.mt3 {margin-top:3px;}
+.mt4 {margin-top:4px;}
 .mt5 {margin-top:5px;}
 .mt10 {margin-top:10px;}
+.mt11 {margin-top:11px;}
+.mt15 {margin-top:15px;}
+.mt30 {margin-top:30px;}
+.mt70 {margin-top:70px;}
 .mb5 {margin-bottom:5px;}
 .mb10 {margin-bottom:10px;}
+.mb20 {margin-bottom:20px;}
 .ml10 {margin-left:10px;}
 .mr5 {margin-right:5px;}
 .mr10 {margin-right:10px;}
 .ml15 {margin-left:15px;}
 .mr15 {margin-right:15px;}
 .mr20 {margin-right:20px;}
+.ml25 {margin-left:25px;}
 .mr25 {margin-right:25px;}
 .ml55 {margin-left:55px;}
 .mr55 {margin-right:55px;}
+.c-red {color:#e81a1a;}
 .c-blue {color:#269ac9;}
 .c-grey {color:#9a9a9a;}
 .c-grey2 {color:#707070;}
 .c-grey3 {color:#555555;}
+.c-grey4 {color:#888888;}
+.c-grey5 {color:#aaaaaa;}
+.c-grey6 {color:#777777;}
+.c-blue {color:#3b94d6;}
 a {color:#707070;}
 a.c-grey {color:#707070;}
 a.c-grey2 {color:#9a9a9a;}
 a:link,a:visited{text-decoration:none;}
 a:hover,a:active{cursor:pointer;}
 a.link-blue {color:#269ac9;}
+a.link-blue2 {color:#3b94d6;}
 a.underline {text-decoration:underline;}
 .border-radius {border-radius:5px;}
 .w36 {width:36px;}
@@ -42,9 +58,35 @@ a.underline {text-decoration:underline;}
 .max-width-130 {max-width:130px;}
 .hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
 .inline-block {display:inline-block;}
+.dis {display:block;}
 .undis {display:none;}
 .text-nowrap {white-space:nowrap;}
 .v-top {vertical-align:top;}
+.tac {text-align:center;}
+.block-center {margin-left:auto; margin-right:auto; display:block;}
+
+/*背景色*/
+.bg-grey {background-color:#c1c1c1 !important;}
+.bg-blue {background-color:#3b94d6;}
+
+/*按钮样式*/
+.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;}
+
+
+/*tab*/
+.tab-wrap {position:relative; line-height:38px; display:flex; font-size:13px; background-color:#fff;}
+.tab-wrap a {position:relative; display:block; flex:1;}
+.tab-wrap a:first-child:after {display:none;}
+.tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
+.weixin-tab {text-align:center; border-bottom:1px solid #ccc;}
+
+/*bottom-tab*/
+.bottom-tab-wrap {position:fixed; width:100%; bottom:0; line-height:38px; display:flex; font-size:13px; background-color:#fff;}
+.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%;}
@@ -56,7 +98,8 @@ a.underline {text-decoration:underline;}
 .fl {float:left;}
 .fr {float:right;}
 .cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:13px; line-height:18px; height:95px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content {width:100%; font-size:13px; line-height:18px; height:90px; 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,
@@ -78,6 +121,8 @@ a.underline {text-decoration:underline;}
 .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;}
 
 /* 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;}
@@ -86,6 +131,67 @@ a.underline {text-decoration:underline;}
 .loading-box span {display: block; font-size:12px;}
 
 /*帖子锁定样式*/
-.locked_btn_cir {background: url("/images/locked.png") 0 0 no-repeat; cursor: default;}
+.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-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;}
+.submit-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
+.slice {width:2%; text-align:center; border-top:1px solid #ccc;}
+.slice-line {width:1px; height:37px; margin:auto; background:#ccc;}
+
+/*20160613邀请码样式*/
+.qr-code-wrap {width:100%; padding:40px 0; background-color:#3b94d6;}
+.qr-code-box {width:225px; background-color:#fff; border-radius:3px; margin:0 auto;}
+.share-class-name {font-size:18px; color:#3b3b3b; text-align:center; padding:12px; border-bottom:1px solid #cccccc;}
+.qr-img-wrap {width:100%; border-bottom:1px dashed #ccc;}
+.qr-code-img {margin:36px auto; display:block;}
+.invitation-code-wrap {text-align:center; font-size:18px; color:#3b3b3b; padding:16px;}
+.share-code-wrap {width:100%; background-color:#efeff4;}
+.share-code-btn, .finish-btn {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; background-color:#ff7239; margin:18px auto 20px auto; border-radius:50px; display:block;}
+.share-code-instruction {max-width:228px; font-size:12px; color:#666; line-height:20px; margin:0 auto;}
+
+/*20160613班级详情*/
+.class-detail-name, .blue-title {width:100%; height:45px; line-height:45px; vertical-align:middle; background-color:#3b94d6; color:#fff; font-size:18px; text-align:center;}
+.blue-title-sub {position:absolute; right:10px;}
+.slice2 {width:2%; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
+.slice3 {width:1%; height:38px; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
+.slice-line2 {width:1px; height:38px; margin:auto; background:#ccc;}
+.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-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;}
+.class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
+.border-top {border-top:1px solid #ccc;}
+.class-detail-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
+.img-circle {border-radius:50%;}
+.member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
+
+/*20160614班级列表*/
+.course-list-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-top:1px solid #ccc; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-list {width:100%; border-bottom:1px solid #ccc;}
+.class-list li {height:40px; line-height:40px; vertical-align:middle; margin:0 25px; border-left:1px solid #ccc; border-bottom:1px solid #ccc; position:relative;}
+.class-list-name {max-width:75%; display:inline-block;}
+.class-list-dot {position:absolute; top:13px; left:-8px;}
+.border-bottom-none {border-bottom:none !important;}
+.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;}
 
-.bg-grey {background-color:#c1c1c1;}
+/*20160616登录注册*/
+.login-wrap {padding:0 10px;}
+.input-box-wrap {padding-right:17px;}
+.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:after{content:url(/images/wechat/checked.png);}
+.forget-psw-wrap {width:60px; margin:0 auto;}
+.forget-psw {position:fixed; bottom:10px;}
diff --git a/script/assets b/script/assets
new file mode 100644
index 000000000..bf4501127
--- /dev/null
+++ b/script/assets
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cd public/javascripts/wechat && gulp  && gulp minify
diff --git a/spec/controllers/quality_analysis_controller_spec.rb b/spec/controllers/quality_analysis_controller_spec.rb
new file mode 100644
index 000000000..d25575a85
--- /dev/null
+++ b/spec/controllers/quality_analysis_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe QualityAnalysisController, :type => :controller do
+
+end
diff --git a/spec/factories/quality_analyses.rb b/spec/factories/quality_analyses.rb
new file mode 100644
index 000000000..a48e6e33f
--- /dev/null
+++ b/spec/factories/quality_analyses.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :quality_analyasis, class: 'QualityAnalysis' do
+    project_id 1
+    author_login "MyString"
+    rep_identifier "MyString"
+  end
+end
diff --git a/spec/models/quality_analysis_spec.rb b/spec/models/quality_analysis_spec.rb
new file mode 100644
index 000000000..d18ede452
--- /dev/null
+++ b/spec/models/quality_analysis_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe QualityAnalysis, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end