Merge branch 'develop' into 'dai_ao'

个人主页（未完） See merge request !59
2016-12-15 09:22:19 +08:00 · 2016-12-15 09:22:19 +08:00 · cc3f52a78c
parent 585d1ebb0d ffd1e3942c
commit cc3f52a78c
161 changed files with 3594 additions and 1522 deletions
--- a/18
+++ b/18
@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'

 #rails 3.2.22.2 bug
- gem "test-unit", "~>3.0"
+ # gem "test-unit", "~>3.0"

 ### profile
- gem 'oneapm_rpm'
+ # gem 'oneapm_rpm'

 group :development do
  gem 'grape-swagger'
@ -63,22 +63,18 @@ group :development do
  if RUBY_PLATFORM =~ /w32/
    gem  'win32console'
  end
+
+  if RUBY_PLATFORM =~ /darwin/
+    gem 'puma'
+end
 end

 group :development, :test do
-  unless RUBY_PLATFORM =~ /w32/
-    gem 'pry-rails'
    if RUBY_VERSION >= '2.0.0'
      gem 'pry-byebug'
+    gem "test-unit", "~>3.0"
    end
-    gem 'pry-stack_explorer'
-    if RUBY_PLATFORM =~ /darwin/
-      gem 'puma'
-    end
-  end
-
  gem 'rspec-rails', '~> 3.0'
-  gem 'factory_girl_rails'
 end

 # Gems used only for assets and not required
--- a/app/api/mobile/entities/attachment.rb
+++ b/app/api/mobile/entities/attachment.rb
@ -17,17 +17,18 @@ module Mobile
              end
            else
              case field
+                when :download_url
+                  "attachments/download/#{f.try(:id)}"
                when :file_dir
                  "attachments/download/" << f.send(:id).to_s << '/'
                when :attafile_size
                  (number_to_human_size(f.filesize)).gsub("ytes", "").to_s
                when :coursename
-                  f.course.nil? ? "" : f.course.name
+                  f.try(:course).try(:name) || ''
                when :syllabus_title
-                  f.course.nil? ? "" : f.course.syllabus.nil? ? "" : f.course.syllabus.title
+                  f.try(:course).try(:syllabus).try(:title) || ''
                when :course_id
-                  f.course.nil? ? 0 : f.course.id
-
+                  f.try(:course).try(:id) || 0
              end
            end
          end
@ -50,6 +51,8 @@ module Mobile
        current_user_is_teacher = is_course_teacher(current_user,instance.course)
        current_user_is_teacher
      end
+
+      attachment_expose :download_url
    end
  end
 end
--- a/app/api/mobile/entities/issue.rb
+++ b/app/api/mobile/entities/issue.rb
@ -180,6 +180,8 @@ module Mobile
          end
        end
      end
+
+      expose :attachments, using: Mobile::Entities::Attachment
    end
  end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -55,7 +55,7 @@ class ApplicationController < ActionController::Base
  include Redmine::Search::Controller
  include Redmine::MenuManager::MenuController
  helper Redmine::MenuManager::MenuHelper
-  
+
  def user_agent
    logger.info "HTTP_USER_AGENT #{request.env["HTTP_USER_AGENT"]}" 
  end
@ -117,6 +117,9 @@ class ApplicationController < ActionController::Base
      elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
        # RSS key authentication does not start a session
        user = User.find_by_rss_key(params[:key])
+      elsif session[:wechat_openid]
+        uw = UserWechat.find_by_openid(session[:wechat_openid])
+        user = uw.user if uw
      end
    end
    if user.nil? && Setting.rest_api_enabled? && accept_api_auth?
@ -509,8 +512,7 @@ class ApplicationController < ActionController::Base
    # render_404
  # end

-  def self.
-      model_object(model)
+  def self.model_object(model)
    self.model_object = model
  end

--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -72,8 +72,10 @@ class AttachmentsController < ApplicationController

  def direct_download
    @attachment.increment_download
+    file_type = detect_content_type(@attachment)
+
    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-              :type => detect_content_type(@attachment),
+              :type => file_type,
              :disposition => 'attachment'    #inline can open in browser
  end

@ -130,11 +132,7 @@ class AttachmentsController < ApplicationController
  def download
    # modify by nwb
    # 下载添加权限设置
-    if (params[:type] && params[:type] == "wechat" )
-      candown = true
-    else
-      candown = attachment_candown @attachment
-    end
+    candown = attachment_candown @attachment

    if candown || User.current.admin? || User.current.id == @attachment.author_id
      if stale?(:etag => @attachment.digest)
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -32,6 +32,13 @@ class CoursesController < ApplicationController
  before_filter :require_login, :only => [:join, :unjoin]
  #before_filter :allow_join, :only => [:join]

+  # 邀请码停用/启用
+  def set_invite_code_halt
+    if User.current.allowed_to?(:as_teacher, @course) || User.current.admin?
+      @course.update_attribute('invite_code_halt', @course.invite_code_halt == 0 ? 1 : 0)
+    end
+  end
+
  #查找组织
  def search_public_orgs_not_in_course
    condition = '%%'
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@ -82,6 +82,27 @@ class HomeworkCommonController < ApplicationController
        @homework.publish_time = params[:homework_common][:publish_time]
      end
      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
+      param_end_time = Time.parse(params[:homework_common][:end_time]).strftime("%Y-%m-%d")
+      homework_end_time = Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d")
+      if homework_end_time != param_end_time
+        if homework_end_time > param_end_time
+          @homework.student_works.where("work_status = 1").each do |st|
+            if param_end_time < Time.parse(st.commit_time.to_s).strftime("%Y-%m-%d")
+              st.late_penalty = @homework.late_penalty
+              st.work_status = 2
+              st.save
+            end
+          end
+        else
+          @homework.student_works.where("work_status = 2").each do |st|
+            if param_end_time >= Time.parse(st.commit_time.to_s).strftime("%Y-%m-%d")
+              st.late_penalty = 0
+              st.work_status = 1
+              st.save
+            end
+          end
+        end
+      end
      @homework.end_time = params[:homework_common][:end_time] || Time.now
      @homework.course_id = params[:course_id]
      if params[:homework_type] && params[:homework_type].to_i != @homework.homework_type
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -22,9 +22,9 @@ class IssuesController < ApplicationController
  before_filter :authorize1, :only => [:show]
  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal, :add_journal_in_org]
  before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
-  before_filter :find_project, :only => [:new, :create, :update_form]
+  before_filter :find_project, :only => [:new, :create, :update_form, :issue_commits, :commit_for_issue, :issue_commit_delete]
  #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org,:delete_journal,:reply,:add_reply]
+  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org,:delete_journal,:reply,:add_reply, :issue_commits, :commit_for_issue, :issue_commit_delete]

  before_filter :find_optional_project, :only => [:index]
  before_filter :check_for_default_issue_status, :only => [:new, :create]
@ -57,6 +57,57 @@ class IssuesController < ApplicationController
  helper :project_score
  include ApplicationHelper

+  # issue和代码提交id关联模块 --> over
+  # 获取某个项目的commit_ids
+  def issue_commits
+    begin
+      return render_404 if @project.gpid.nil?
+      @issue_commit_ids = (params[:issue_commit_ids].is_a?(Array) ? params[:issue_commit_ids] : params[:issue_commit_ids].split(",")) unless params[:issue_commit_ids].nil?
+      search = params[:search].to_s.strip
+      @type = params[:type]
+      limit = 15
+      g = Gitlab.client
+      g_project = g.project(@project.gpid)
+      rev = params[:branch].nil? ? g_project.default_branch : params[:branch]
+      @project_branches = g.branches(@project.gpid)
+      @branch_names = @project_branches.map{|b| b.name}
+      @default_branch = g_project.default_branch
+      # 搜索的分页需要单独处理，因为搜索不容易获取总数
+      if search.present?
+        @commits = g.commits(@project.gpid, ref_name:rev, :search => search)
+        @commits_count = @commits.count
+        @commits_pages = Paginator.new @commits_count, limit, params['page'] || 1
+        @offset ||= @commits_pages.offset
+        @commits = paginateHelper @commits,limit
+      else
+        @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s, ref_name:rev, :search => search)
+        @commits_count = g.user_static(@project.gpid, :rev => rev).count
+        @commits_pages = Redmine::Pagination::Paginator.new @commits_count, limit, params[:page]
+      end
+    rescue Exception => e
+      puts e
+    end
+  end
+
+  # 选择对应的Commit
+  def commit_for_issue
+    history_commit_ids = params[:issue_for_commit_ids].split(",") unless params[:issue_for_commit_ids].nil?
+    @issue_commit_ids = (history_commit_ids.blank? ? params[:checkbox1] : params[:checkbox1] | history_commit_ids).uniq
+  end
+
+  def issue_commit_delete
+    commit_id = params[:commit_id].split(",")
+    issue_commit_ids = params[:issue_commit_ids]
+    # issue_id存在则为issue详情或者编辑的时候，否则为新建Issue
+    # 编辑和详情的时候需要在数据库中删除记录，新建的时候在内存中删除
+    if params[:issue_id]
+      commit_issue = CommitIssues.where(:commit_id => commit_id, :issue_id => params[:issue_id], :project_id => @project.id).first
+      commit_issue.delete if commit_issue
+    end
+    @issue_commit_ids = issue_commit_ids - commit_id
+  end
+  # over
+
  def index
    # 顶部导航
    @project_menu_type = 2
@ -163,14 +214,14 @@ class IssuesController < ApplicationController
  def show
    # 顶部导航
    @project_menu_type = 2
-
    # 打开编辑内容
    @is_edit = true unless params[:edit].nil?
-
    # 当前用户查看指派给他的缺陷消息，则设置消息为已读
    query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
    query.update_attribute(:viewed, true) unless query.nil?
-
+    # issue 关联的commit
+    commit_issues = CommitIssues.where(:issue_id => @issue.id, :project_id => @issue.project_id)
+    @issue_commit_ids = commit_issues.map{|commit_issue| commit_issue.commit_id}
    # issue 新建的at消息
    User.current.at_messages.unviewed('Issue', @issue.id).each {|x| x.viewed!}
    # 回复的at消息
@ -238,6 +289,8 @@ class IssuesController < ApplicationController
    @issue.fixed_version_id = nil if @issue.fixed_version_id == 0
    @issue.assigned_to_id = nil if @issue.assigned_to_id == 0
    if @issue.save
+      # 关联commmit
+      update_issue_commit params[:commit_ids]
      #params[:issue][:assigned_to_id] = nil if params[:issue][:assigned_to_id].to_i == 0
      senduser = User.find(params[:issue][:assigned_to_id])
      issue_id = @issue.id
@ -276,6 +329,9 @@ class IssuesController < ApplicationController
  def edit
    # 修改实例变量的值
    return unless update_issue_from_params
+    # issue 关联的commit
+    commit_issues = CommitIssues.where(:issue_id => @issue.id, :project_id => @issue.project_id)
+    @issue_commit_ids = commit_issues.map{|commit_issue| commit_issue.commit_id}

    respond_to do |format|
      format.html {render :layout => 'base_projects' }#added by young
@ -309,9 +365,9 @@ class IssuesController < ApplicationController
        end
      end
    end
-
-
    if @saved
+      # 更新commit关联情况
+      update_issue_commit params[:commit_ids]
      #修改界面增加跟踪者
      watcherlist = @issue.watcher_users
      select_users = []
@ -356,6 +412,26 @@ class IssuesController < ApplicationController
    end
  end

+  # 保存issue的时候相关的commit操作
+  # commit_ids => "9b9845ff,poor56el"
+  def update_issue_commit commit_ids
+    # 关联commmit
+    commit_ids = params[:commit_ids]
+    unless commit_ids.blank?
+      commit_ids = commit_ids.split(",").uniq
+      if params[:action] == "update"
+        exist_commit_ids = CommitIssues.where(:issue_id => @issue, :project_id => @issue.project_id)
+        unless exist_commit_ids.blank?
+          exist_commit_ids = exist_commit_ids.map{|commit| commit.commit_id}
+          commit_ids = commit_ids - exist_commit_ids
+        end
+      end
+      commit_ids.each do |commit_id|
+        CommitIssues.create(:commit_id => commit_id, :project_id => @issue.project_id, :issue_id => @issue.id)
+      end
+    end
+  end
+
  def update_user_issue_detail(issue, params)
    case params[:type]
    when "status"
@ -794,7 +870,6 @@ class IssuesController < ApplicationController

    # 更新issue状态时，journal表产生记录，返回@current_journal
    @issue.init_journal(User.current)
-
    issue_attributes = params[:issue]
    if issue_attributes && params[:conflict_resolution]
      case params[:conflict_resolution]
@ -809,18 +884,18 @@ class IssuesController < ApplicationController
      end
    end

-    senduser = User.find(params[:issue][:assigned_to_id])
-
-    if senduser.id != User.current.id && @issue.assigned_to_id != params[:issue][:assigned_to_id].to_i
-      issue_id = @issue.id
-      issue_title = params[:issue][:subject]
-      priority_id = params[:issue][:priority_id]
-      ps = ProjectsService.new
-      ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
+    if params[:action] == "update"
+      senduser = User.find(params[:issue][:assigned_to_id])
+      if senduser.id != User.current.id && @issue.assigned_to_id != params[:issue][:assigned_to_id].to_i
+        issue_id = @issue.id
+        issue_title = params[:issue][:subject]
+        priority_id = params[:issue][:priority_id]
+        ps = ProjectsService.new
+        ps.send_wechat_project_issue_notice senduser,@issue.project,issue_id,issue_title,priority_id
+      end
    end

    @issue.safe_attributes = issue_attributes
-
    @priorities = IssuePriority.active
    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
    true
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@ -38,12 +38,12 @@ class PullRequestsController < ApplicationController
    @requests_merged_count = merge_requests.select{|request| request.state == "merged"}.count
    @requests_closed_count = merge_requests.select{|request| request.state == "closed"}.count

-    @limit = 10
+    @limit = 20
    @is_remote = true
    @count = type_count(type, @requests_opened_count, @requests_merged_count, @requests_closed_count)
    @pages = Paginator.new @count, @limit, params['page'] || 1
    @offset ||= @pages.offset
-    @requests = paginateHelper @requests, 10
+    @requests = paginateHelper @requests, 20
    respond_to do |format|
      format.html
      format.js
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -7,7 +7,7 @@ class StudentWorkController < ApplicationController
  require "base64"
  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:program_test_ex,
                                          :set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,
-                                          :search_course_students,:work_canrepeat,:add_group_member]
+                                          :search_course_students,:work_canrepeat,:add_group_member,:change_project]
  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work,:revise_attachment]
  before_filter :member_of_course, :only => [:new, :create, :show, :add_score, :praise_student_work]
  before_filter :author_of_work, :only => [:edit, :update, :destroy]
@ -587,6 +587,14 @@ class StudentWorkController < ApplicationController
      if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
        student_work.late_penalty = @homework.late_penalty
        student_work.work_status = 2
+        # 缺评扣分
+        if @homework.homework_detail_manual.no_anon_penalty == 0 && @homework.homework_detail_manual.comment_status == 3 && @homework.anonymous_comment == 0
+          work_ids = "(" + @homework.student_works.has_committed.map(&:id).join(",") + ")"
+          all_dis_eva = StudentWorksEvaluationDistribution.where("student_work_id IN #{work_ids}")
+          has_sw_count = all_dis_eva.select("distinct user_id").count
+          anon_count = all_dis_eva.count / has_sw_count
+          student_work.absence_penalty = @homework.homework_detail_manual.absence_penalty * anon_count
+        end
      else
        student_work.late_penalty = 0
        student_work.work_status = 1
@ -1052,7 +1060,7 @@ class StudentWorkController < ApplicationController
  end

  def forbidden_anonymous_comment
-    @homework.update_column('anonymous_comment', 1)
+    @homework.update_column('anonymous_comment', @homework.anonymous_comment == 0 ? 1 : 0)
    homework_detail_manual = @homework.homework_detail_manual
    homework_detail_programing = @homework.homework_detail_programing
    if homework_detail_programing
@ -1084,6 +1092,7 @@ class StudentWorkController < ApplicationController
    respond_to do |format|
      format.js
    end
+    @homework = @work.homework_common
  end

  def new_student_work_project
@ -1130,6 +1139,26 @@ class StudentWorkController < ApplicationController
    end
  end

+  # 作品更换关联项目
+  def change_project
+    work = @homework.student_works.has_committed.where("user_id = #{User.current.id}").first
+    project = Project.find params[:projectName].to_i
+    if work && project
+      relate_user_ids = work.student_work_projects.map{|pro| pro.user_id}
+      member_ids = project.members.map{|mem| mem.user_id}
+      if (relate_user_ids & member_ids) == relate_user_ids
+        work.student_work_projects.update_all(:project_id => params[:projectName].to_i)
+        student_works = @homework.student_works.where("user_id in #{'(' + relate_user_ids.join(',') + ')'}")
+        student_works.update_all(:project_id => params[:projectName].to_i)
+      else
+        @remain_user_ids = relate_user_ids - (relate_user_ids & member_ids)
+      end
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
  #查找课程的学生
  def search_course_students
    name = ""
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -35,14 +35,14 @@ class UsersController < ApplicationController

  #
  before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
-  before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
+  before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses, :unsolved_issues_list,
                                      :user_homeworks,:student_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
                                      :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
                                      :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                      :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                      :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist,:user_projectlist,:sort_syllabus_list,
-                                      :sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks, :cancel_or_collect,:expand_courses,:homepage, :user_issues]
+                                      :sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks, :cancel_or_collect,:expand_courses,:homepage, :user_issues, :course_community, :project_community]
  before_filter :auth_user_extension, only: :show
  #before_filter :rest_user_score, only: :show
  #before_filter :select_entry, only: :user_projects
@ -433,7 +433,8 @@ class UsersController < ApplicationController
        render_404
        return
    end
-    @message_alls = paginateHelper @message_alls,25
+
+    @message_alls = paginateHelper @message_alls, 25
    respond_to do |format|
      format.html{render :layout=>'new_base_user'}
    end
@ -1186,10 +1187,18 @@ class UsersController < ApplicationController
    student_work = StudentWork.where(homework_common_id: homework.id, user_id: User.current.id).first
    if student_work

-      #提交作品时，计算是否迟交
+      # 提交作品时，计算是否迟交
      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
        student_work.late_penalty = homework.late_penalty
        student_work.work_status = 2
+        # 缺评扣分
+        if homework.homework_detail_manual.no_anon_penalty == 0 && homework.homework_detail_manual.comment_status == 3 && homework.anonymous_comment == 0
+          work_ids = "(" + homework.student_works.has_committed.map(&:id).join(",") + ")"
+          all_dis_eva = StudentWorksEvaluationDistribution.where("student_work_id IN #{work_ids}")
+          has_sw_count = all_dis_eva.select("distinct user_id").count
+          anon_count = all_dis_eva.count / has_sw_count
+          student_work.absence_penalty = homework.homework_detail_manual.absence_penalty * anon_count
+        end
      else
        student_work.late_penalty = 0
        student_work.work_status = 1
@ -1806,22 +1815,197 @@ class UsersController < ApplicationController
  end

  def show
-    #更新用户申请成为课程老师或教辅消息的状态
+    if is_current_user
+      # 自己的主页显示消息
+      # 系统消息为管理员发送，我的消息中包含有系统消息
+      @message_alls = []
+      messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc")
+      messages.each do |message_all|
+        mess = message_all.message
+        unless (message_all.message_type == 'CourseMessage' && mess && mess.course && mess.course.is_delete == 1)
+          @message_alls << mess
+        end
+      end
+      @message_count = @message_alls.count
+      @message_alls = paginateHelper @message_alls, 20
+      # 用户待解决的issue
+=begin
+      @unsolved_issues = Issue.where(:assigned_to_id => @user.id, :status_id => [1, 2, 4, 6]).includes(:author, :project).order("updated_on desc")
+      @unsolved_issues_count = @unsolved_issues.count
+      @unsolved_issue_pages =  Paginator.new @unsolved_issues_count, 20, params['page'] || 1
+      @unsolved_issues = paginateHelper @unsolved_issues, 20
+=end
+      @unsolved_issues_count = Issue.where(:assigned_to_id => @user.id, :status_id => [1, 2, 4, 6]).includes(:author, :project).order("updated_on desc").count
+      # 用户待完成的作业
+      my_course_ids = StudentsForCourse.where(:student_id => @user.id).blank? ? "(-1)" : "(" + StudentsForCourse.where(:student_id => @user.id).map{|sc| sc.course_id}.join(",") + ")"
+      homeworks = HomeworkCommon.where("course_id in #{my_course_ids} and publish_time <= '#{Date.today}'")
+      homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
+      student_works = StudentWork.where("user_id = #{@user.id} and homework_common_id in #{homework_ids} and work_status != 0")
+      @unfinished_homework_count = homeworks.count - student_works.count
+      # 用户待完成的测验
+      exercises = Exercise.where("course_id in #{my_course_ids} and exercise_status = 2")
+      exercise_ids = exercises.blank? ? "(-1)" : "(" + exercises.map{|ex| ex.id}.join(",") + ")"
+      exercise_users = ExerciseUser.where("user_id = #{@user.id} and exercise_id in #{exercise_ids}")
+      @unfinished_test_count = exercises.count - exercise_users.count
+      # 用户待完成的问卷
+      polls =  Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2")
+      poll_ids = polls.blank? ? "(-1)" : "(" + polls.map{|poll| poll.id}.join(",") + ")"
+      poll_users = PollUser.where("user_id = #{@user.id} and poll_id in #{poll_ids}")
+      @unfinished_poll_count = polls.count - poll_users.count
+      # 用户待匿评的作品
+      student_work_evaluations = @user.student_works_evaluation_distributions
+      student_work_ids = student_work_evaluations.blank? ? "(-1)" : "(" + student_work_evaluations.map{|st| st.student_work_id}.join(",") + ")"
+      student_work_scores = @user.student_works_scores.where("student_work_id in #{student_work_ids} and reviewer_role = 3")
+      @anonymous_evaluation_count = student_work_evaluations.count - student_work_scores.count
+      # 待评阅的作业  暂不做
+      @unreview_homework = 1
+      # 待审批的作业
+      @unapproval_homework = 1
+    else
+      # 看别人的主页显示动态
+      #更新用户申请成为课程老师或教辅消息的状态
+      if params[:course_id] != nil
+        join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?",
+                                                   params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
+        join_course_messages.update_all(:viewed => true)
+      end
+      shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+      shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
+      @page = params[:page] ? params[:page].to_i + 1 : 0
+      user_project_ids = (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
+      user_course_ids = (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
+      course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
+      project_types = "('Message','Issue','Project')"
+      principal_types = "JournalsForMessage"
+      container_type = ''
+      act_type = ''
+      # 他的动态
+      sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))"
+      if params[:type].present?
+        case params[:type]
+          when "course_homework"
+            container_type = 'Course'
+            act_type = 'HomeworkCommon'
+          when "course_news"
+            container_type = 'Course'
+            act_type = 'News'
+          when "course_message"
+            container_type = 'Course'
+            act_type = 'Message'
+          when "course_poll"
+            container_type = 'Course'
+            act_type = 'Poll'
+          when "course_journals"
+            container_type = 'Course'
+            act_type = 'JournalsForMessage'
+          when "project_issue"
+            container_type = 'Project'
+            act_type = 'Issue'
+          when "project_message"
+            container_type = 'Project'
+            act_type = 'Message'
+          when "user_journals"
+            container_type = 'Principal'
+            act_type = 'JournalsForMessage'
+          when "current_user"
+            container_type = 'Principal'
+            act_type = 'Principal'
+          when "all"
+            container_type = 'all'
+            act_type = 'all'
+        end
+      end
+      if container_type != '' && container_type != 'all'
+        if container_type == 'Course'
+          sql = "container_type = '#{container_type}' and container_id in #{user_course_ids} and act_type = '#{act_type}'"
+        elsif container_type == 'Project'
+          sql = "container_type = '#{container_type}' and container_id in #{user_project_ids} and act_type = '#{act_type}'"
+        elsif container_type == 'Principal' && act_type == 'JournalsForMessage'
+          sql = "container_type = '#{container_type}' and act_type= '#{act_type}' and container_id = #{@user.id}"
+        elsif container_type == 'Principal' && act_type == 'Principal'
+          sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))"
+        end
+        if User.current != @user
+          sql += " and user_id = #{@user.id}"
+        end
+      else
+        if User.current != @user
+          blog_ids = "("+@user.blog.id.to_s+")"
+        else
+          blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+        end
+        sql = "(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+            "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+            "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+            "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
+        if container_type != 'all' && User.current != @user
+          sql = "user_id = #{@user.id} and(" + sql + ")"
+        end
+      end
+      @user_activities_count = UserActivity.where("#{sql}").order('updated_at desc').count
+      @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
+      @type = params[:type]
+    end
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+    end
+  end
+
+  # 待解决的Issue
+  def unsolved_issues_list
+    @unsolved_issues = Issue.where(:assigned_to_id => @user.id, :status_id => [1, 2, 4, 6]).includes(:author, :project).order("updated_on desc")
+    @unsolved_issues_count = @unsolved_issues.count
+    @limit = 20
+    @is_remote = true
+    @unsolved_issues_pages = Paginator.new @unsolved_issues_count, @limit, params['page'] || 1
+    @offset ||= @unsolved_issues_pages.offset
+    @unsolved_issues = paginateHelper @unsolved_issues, @limit
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 待完成的作业
+  def unfinished_homework_list
+
+  end
+
+  # 待完成的测验
+  def unfinished_test_list
+
+  end
+
+  # 待完成的问卷
+  def unfinished_poll_list
+
+  end
+
+  # 待匿评的作业
+  def anonymous_evaluation_list
+
+  end
+
+  # 待审批的申请
+  def unapproval_homework_list
+
+  end
+
+  # 课程社区
+  def course_community
    if params[:course_id] != nil
      join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?",
                                                 params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
      join_course_messages.update_all(:viewed => true)
    end
-    shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
    shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
    @page = params[:page] ? params[:page].to_i + 1 : 0
-    user_project_ids = (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
    user_course_ids = (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
    course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
-    project_types = "('Message','Issue','Project')"
    principal_types = "JournalsForMessage"
    container_type = ''
    act_type = ''
+
    if params[:type].present?
      case params[:type]
        when "course_homework"
@ -1839,6 +2023,63 @@ class UsersController < ApplicationController
        when "course_journals"
          container_type = 'Course'
          act_type = 'JournalsForMessage'
+        when "user_journals"
+          container_type = 'Principal'
+          act_type = 'JournalsForMessage'
+        when "current_user"
+          container_type = 'Principal'
+          act_type = 'Principal'
+        when "all"
+          container_type = 'all'
+          act_type = 'all'
+      end
+    end
+    if container_type != '' && container_type != 'all'
+      if container_type == 'Course'
+        sql = "container_type = '#{container_type}' and container_id in #{user_course_ids} and act_type = '#{act_type}'"
+      elsif container_type == 'Principal' && act_type == 'JournalsForMessage'
+        sql = "container_type = '#{container_type}' and act_type= '#{act_type}' and container_id = #{@user.id}"
+      elsif container_type == 'Principal' && act_type == 'Principal'
+        sql = "user_id = #{@user.id} and (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})"
+      end
+      if User.current != @user
+        sql += " and user_id = #{@user.id}"
+      end
+    else
+      if User.current != @user
+        blog_ids = "("+@user.blog.id.to_s+")"
+      else
+        blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+      end
+      sql = "(container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})" +
+          "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+          "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
+      if container_type != 'all' && User.current != @user
+        sql = "user_id = #{@user.id} and(" + sql + ")"
+      end
+    end
+    @user_activities_count = UserActivity.where("#{sql}").order('updated_at desc').count
+    @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
+    @type = params[:type]
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'base_course_community'}
+    end
+  end
+
+  # 项目社区
+  def project_community
+    # 看别人的主页显示动态
+    #更新用户申请成为课程老师或教辅消息的状态
+    shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    user_project_ids = (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
+    project_types = "('Message','Issue','Project')"
+    principal_types = "JournalsForMessage"
+    container_type = ''
+    act_type = ''
+    if params[:type].present?
+      case params[:type]
        when "project_issue"
          container_type = 'Project'
          act_type = 'Issue'
@ -1857,14 +2098,12 @@ class UsersController < ApplicationController
      end
    end
    if container_type != '' && container_type != 'all'
-      if container_type == 'Course'
-        sql = "container_type = '#{container_type}' and container_id in #{user_course_ids} and act_type = '#{act_type}'"
-      elsif container_type == 'Project'
+      if container_type == 'Project'
        sql = "container_type = '#{container_type}' and container_id in #{user_project_ids} and act_type = '#{act_type}'"
      elsif container_type == 'Principal' && act_type == 'JournalsForMessage'
        sql = "container_type = '#{container_type}' and act_type= '#{act_type}' and container_id = #{@user.id}"
      elsif container_type == 'Principal' && act_type == 'Principal'
-        sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))"
+        sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}))"
      end
      if User.current != @user
        sql += " and user_id = #{@user.id}"
@ -1876,19 +2115,18 @@ class UsersController < ApplicationController
        blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
      end
      sql = "(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-          "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
          "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
          "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
      if container_type != 'all' && User.current != @user
        sql = "user_id = #{@user.id} and(" + sql + ")"
      end
    end
-    
+    @user_activities_count = UserActivity.where("#{sql}").order('updated_at desc').count
    @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
    @type = params[:type]
    respond_to do |format|
      format.js
-      format.html {render :layout => 'new_base_user'}
+      format.html {render :layout => 'base_project_community'}
    end
  end

@ -3539,7 +3777,7 @@ class UsersController < ApplicationController
    # @syllabus = paginateHelper @syllabus,@limit

    respond_to do |format|
-      format.html {render :layout => 'new_base_user'}
+      format.html {render :layout => 'base_course_community'}
    end
  end

@ -3683,7 +3921,7 @@ class UsersController < ApplicationController
    @my_joined_projects_count = @my_joined_projects.count

    respond_to do |format|
-      format.html {render :layout => 'new_base_user'}
+      format.html {render :layout => 'base_project_community'}
    end
  end

--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@ -1,4 +1,6 @@
 #coding=utf-8
+
+require 'base64'
 class WechatsController < ActionController::Base
  wechat_responder

@ -105,6 +107,7 @@ class WechatsController < ActionController::Base
  end

  on :event, with: 'unsubscribe' do |request|
+    unBind(request)
    request.reply.success # user can not receive this message
  end

@ -272,12 +275,18 @@ class WechatsController < ActionController::Base
    end
  end

+  def unBind(request)
+    uw = user_binded?(request[:FromUserName])
+    uw.try(:subscribe!)
+  end
+
  def sendBind(request)
    tmpurl = "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&connect_redirect=1#wechat_redirect"
    logger.info "tmpurl!!!!!!!!!!!!!!"
    logger.info tmpurl
    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！
-在这里您可以随时了解您的课程和项目动态，随时点赞和回复。
+在这里您可以随时了解您的课程和项目动态，随时点赞和回复。交作业、代码提交等更多功能，请前往 www.trustie.net
+
 我们将会与微信不断结合，为您提供更有价值的服务。

 您还未绑定确实的用户，请先绑定，谢谢！" } }
@ -485,9 +494,33 @@ class WechatsController < ActionController::Base
    end


+    # 用于权限跳转
+    def auth
+      state = params[:state]
+      url = "#{ROOT_URL}/wechat/auth_callback"
+      authorize_url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{url}&response_type=code&scope=snsapi_base&state=#{state}&connect_redirect=1#wechat_redirect"
+      redirect_to authorize_url
+    end
+
+    def auth_callback
+      path = Base64.urlsafe_decode64(params[:state])
+      open_id = get_openid_from_code(params[:code])
+      unless open_id
+        render 'wechats/open_wechat', layout: nil and return
+      end
+
+      redirect_to "/wechat/user_activities##{path}"
+    end
+
+
    private
    def get_openid_from_code(code)
-      return 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg' if code =='only-for-test'
+      if code =='only-for-test'
+        openid = 'o3ss_wHOOnHkz1khBJxH8RF4SfPY'
+        session[:wechat_openid] = openid
+        return openid
+      end
+
      openid = session[:wechat_openid]
      unless openid
        if code
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -37,11 +37,21 @@ module ApplicationHelper
  #   super
  # end

+  # 获取多种类型的user用户名
+  def user_message_username user
+    user.try(:show_name)
+  end
+
  # 超出1w后用k+形式显示
  def switch_integer_into_k number
    number > 10000 ? (number.to_f / 1000).round.to_s + "k" : number
  end

+  # 判断某个课程是否包含仅对自己可见的作业
+  def course_has_score_open_common_homework course
+    course.homework_commons.select{|hc| hc.score_open == 0}.count > 0 ? true : false
+  end
+
  # 隐藏项目以外的信息
  # return: true 显示，false 不显示
  def hidden_unproject_infos
@ -72,12 +82,36 @@ module ApplicationHelper
    user.nil? ? User.find(2) : user
  end

+  # 通过邮件查找用户，能查到返回用户，否则返回邮件地址
+  def user_by_mail mail
+    user = User.find_by_mail(mail)
+    user.nil? ? mail : user.try(:show_name)
+  end
+
+  def link_to_user_mail(mail, css_class)
+    user = User.find_by_mail(mail)
+    user = user.nil? ? mail : user
+    if user.is_a?(User)
+      name = user.show_name
+      link_to name, {:controller=> 'users', :action => 'show', id: user.id}, :class => css_class, :target => "_blank"
+    else
+      "<a class='#{css_class}'>#{h(user.to_s)}</a>".html_safe
+    end
+  end
+
  # 通过系统外部用户名查找用户，如果用户不存在则用邮箱替换
  def get_user_by_login_and login
    user = User.find_by_login(login)
    (user.nil? || login == "root") ? User.find(2) : user
  end

+  # 登录名来自外部系统
+  # 通过登录名查找用户，如果用户存在则显示用户姓名，否则显示登录名
+  def get_user_by_login login
+    user = User.find_by_login(login)
+    user.nil? ? login : user.show_name
+  end
+
  # 重置user_path，目的是将id转换成用户名
  def user_path(resource, parameters = {})
    if Fixnum ===  resource
@ -2786,6 +2820,37 @@ module ApplicationHelper
    end
    technical_title
  end
+  # 用户项目总数
+  def user_project_count
+    @my_projects = @user.projects.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_project_total = @my_projects.count
+  end
+
+  # 用户的课程总数
+  def user_course_count
+    @my_course_count = @user.syllabuses.count
+
+    sy_courses = @user.courses.visible.not_deleted
+    syllabus_ids = sy_courses.empty? ? '(-1)' : "(" + sy_courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
+    syllabus_members = SyllabusMember.where("user_id = #{@user.id}")
+    syllabus_member_ids = syllabus_members.empty? ? "(-1)" : "(" + syllabus_members.map{|syl_mem| syl_mem.syllabus_id}.join(',') + ")"
+    @join_syllabuses = Syllabus.where("(id in #{syllabus_ids} or id in #{syllabus_member_ids}) and user_id != #{@user.id}")
+    @my_joined_course_count = @join_syllabuses.count
+
+    @user_course_total = @my_joined_course_count + @my_course_count
+  end
+
+  # 用户发布的issue数
+  def issues_author_is_self_count
+    @issues = Issue.where( :author_id => @user.id )
+    @issues_author_is_self_count = @issues.count
+  end
+
+  # 用户收到的issue数
+  def issues_assigned_is_self_count
+    @issues = Issue.where( :assigned_to_id => @user.id )
+    @issues_assigned_is_self_count = @issues.count
+  end

  def get_user_roll user
    technical_title = ""
@ -3705,7 +3770,9 @@ def get_hw_status homework_common
      end
      if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
        str += '<span class="green_homework_btn_cir ml5">作品提交中</span>'
-      elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
+      elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && homework_common.anonymous_comment == 1 && User.current.allowed_to?(:as_teacher, homework_common.course)
+        str += '<span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>'
+      else
        str += '<span class="red_homework_btn_cir ml5">作品补交中</span>'
      end
    elsif homework_common.homework_detail_manual.comment_status == 2
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@ -27,6 +27,21 @@ module RepositoriesHelper
  REPO_IP_ADDRESS = Setting.host_repository
  REPO_GITLAB_ADDRESS = "git.trustie.net"

+  # 获取某次提交的关联Issue
+  # REDO:一次关联查询
+  # type为true则为详情页面，全部显示
+  def get_commit_issues commit_id, project_id, type
+    commit_issues = CommitIssues.where(:commit_id => commit_id, :project_id => project_id)
+    unless commit_issues.blank?
+      if commit_issues.count > 2 && type != 1
+        result = commit_issues.map{|commit_issue| commit_issue.issue_id}.first(2) << "more"
+      else
+        result = commit_issues.map{|commit_issue| commit_issue.issue_id}
+      end
+    end
+    return result unless result.blank?
+  end
+
  # 因为gitlab的提交总数不是实时同步的，说以取总数用两种方法
  def choise_commit_count git_count, pro_count
    git_count > pro_count ? git_count : pro_count
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@ -94,13 +94,13 @@ module UsersHelper
  def pull_request_message_status ma
    case ma.status
      when 1
-        "创建了PullRequest:"
+        "创建了PullRequest："
      when 2
-        "接受了PullRequest:"
+        "接受了PullRequest："
      when 3
-        "重新打开了PullRequest:"
+        "重新打开了PullRequest："
      when 4
-        "关闭了PullRequest:"
+        "关闭了PullRequest："
    end

  end
@ -135,11 +135,11 @@ module UsersHelper
  def applied_project_tip applied_message
    case applied_message.status
      when 4
-        "拒绝申请加入项目:"
+        "拒绝申请加入："
      when 5,3,2,1,7
-        "申请加入项目:"
+        "申请加入："
      when 6
-        "同意申请加入项目"
+        "同意申请加入："
    end
  end

@ -159,6 +159,10 @@ module UsersHelper
    end
  end

+  def is_current_user
+    is_current_user = (User.current == @user)
+  end
+
  def applied_project_tip_header applied_message
    case applied_message.status
      when 4
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@ -397,7 +397,7 @@ class Attachment < ActiveRecord::Base
  end

  def course
-    container
+    Course === container ? container : nil
  end

  def visible?(user=User.current)
--- a/app/models/commit_issues.rb
+++ b/app/models/commit_issues.rb
@ -0,0 +1,5 @@
+class CommitIssues < ActiveRecord::Base
+  attr_accessible :commit_id, :issue_id, :project_id
+  # 之所以没建立关联表，主要是应为commit_id是直接通过api获取的，不存在trustie端
+  has_many :issues
+end
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@ -56,6 +56,8 @@ class Issue < ActiveRecord::Base
  has_one :praise_tread_cache, as: :object, dependent: :destroy
  # ForgeMessage虚拟关联(多态)
  has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
+  # 该关联不能关联删除，因为commit记录没有存在Trustie数据库中
+  has_many :commit_issueses

  has_many :at_messages, class_name: 'AtMessage', as: :at_message ,:dependent => :destroy

@ -133,6 +135,10 @@ class Issue < ActiveRecord::Base
  after_save :after_create_from_copy
  after_destroy :update_parent_attributes

+  def user
+    self.author
+  end
+
  #动态的更新
  def update_activity
    update_user_activity(self.class, self.id)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@ -106,6 +106,10 @@ class Message < ActiveRecord::Base
      end
    }

+  def description
+    self.content
+  end
+
  def topic?
    parent_id.nil?
  end
--- a/app/models/user_wechat.rb
+++ b/app/models/user_wechat.rb
@ -24,4 +24,9 @@ class UserWechat < ActiveRecord::Base
    BlogComment.where(author_id: old_user).update_all(author_id: u.id)
    UserActivity.where(user_id: old_user).update_all(user_id: u.id)
  end
+
+
+  def unsubscribe!
+    self.delete
+  end
 end
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@ -584,6 +584,8 @@ class CoursesService
        @state = 2
      elsif course[:is_delete] == 1
        @state = 11
+      elsif course[:invite_code_halt] == 1
+        @state = 14
      else
        if current_user.member_of_course?(course) #如果已经是成员
          @state = 3
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@ -1,8 +1,8 @@
 <% if @course %>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/course_news_post_reply', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% elsif @project %>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% else %>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'organizations/course_news_post_reply', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% end %>
 sd_create_editor_from_data('<%= @user_activity_id%>',"","100%", "UserActivity");
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@ -62,17 +62,17 @@
                <% when 'HomeworkCommon' %>
                    <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id, :hw_status => 2} %>
                <% when 'News' %>
-                    <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                    <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id, :is_course => 1} %>
                <% when 'Message' %>
                    <%= render :partial => 'users/course_message', :locals => {:activity => act, :user_activity_id => activity.id,:is_course=>1,:is_board=>0} %>
                <% when 'Poll' %>
-                    <%= render :partial => 'users/course_poll', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                    <%= render :partial => 'users/course_poll', :locals => {:activity => act, :user_activity_id => activity.id, :is_course => 1} %>
                <% when 'JournalsForMessage' %>
-                    <%= render :partial => 'users/course_journalsformessage', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                    <%= render :partial => 'users/course_journalsformessage', :locals => {:activity => act, :user_activity_id => activity.id, :is_course => 1} %>
                <% when 'Attachment' %>
                    <%= render :partial => 'users/course_attachment', :locals => {:activity => act, :user_activity_id => activity.id} %>
                <% when 'Course' %>
-                    <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                    <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => activity.id, :is_course => 1} %>
                <% end %>
            <% end %>
    <% end %>
--- a/app/views/courses/_course_activity_users.html.erb
+++ b/app/views/courses/_course_activity_users.html.erb
@ -4,9 +4,9 @@
      <ul class="rankList">
      <h3 style="font-size: 14px; font-weight: normal;">
        <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "班级活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => 'fontGrey3' %>
+            <%= link_to "活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => 'fontGrey3' %>
        <% else %>
-            <span class="fontGrey7"> 班级活跃度 </span>
+            <span class="fontGrey7"> 活跃度 </span>
        <% end %>
        <a class="sy_cmore fr" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
        <div class="cl"></div>
--- a/app/views/courses/_course_heroes.html.erb
+++ b/app/views/courses/_course_heroes.html.erb
@ -3,9 +3,9 @@
    <ul class="rankList">
      <h4 style="font-size: 14px; font-weight: normal;">
        <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "班级英雄榜", course_member_path(course, :role => 2), :class => 'fontGrey3' %>
+            <%= link_to "英雄榜", course_member_path(course, :role => 2), :class => 'fontGrey3' %>
        <% else %>
-            <span class="fontGrey7">班级英雄榜</span>
+            <span class="fontGrey7">英雄榜</span>
        <% end %>
        <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
      <div  style="cursor:pointer;" class="numIntro undis">
@ -15,9 +15,15 @@
      </div>
      <% hero_homework_scores.each do |student_score| %>
          <% if student_score.score.to_i != 0 %>
-              <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %></a>
-                <p><a href="javascript:void:(0);"><%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %></a></p>
-                <p><span class="c_red" style="cursor:pointer" ><%= student_score.score<0 ? 0 : student_score.score.to_i %></span></p>
+              <li> <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %></a>
+                <p><a href="javascript:void(0);"><%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %></a></p>
+                <p><span class="c_red" style="cursor:pointer" >
+                  <% if !(User.current.allowed_to?(:as_teacher, @course) || User.current.admin?) && User.current.id != student_score.user.id && course_has_score_open_common_homework(@course) %>
+                    <%= "**" %>
+                  <% else %>
+                    <%= student_score.score<0 ? 0 : student_score.score.to_i %>
+                  <% end %>
+                </span></p>
              </li>
          <% end %>
      <% end %>
--- a/app/views/courses/_course_teacher.html.erb
+++ b/app/views/courses/_course_teacher.html.erb
@ -1,23 +1,26 @@
-<div class="st_list">
-  <div class="st_box">
-    <a href="javascript:void(0)" class="fr fb  mb5" >加入时间</a>
-    <a href="javascript:void(0)" class="fr fb  mb5 mr70" >角色</a>
-    <div class="cl"></div><!--st_box_top end-->
+<div class="sy_class_fenban clear">
+  <div class="mt5">
+    <div style="border-bottom: 1px solid #CCC">
+        <span href="javascript:void(0)" class="c_grey f14 fl fb mb5 ml65" >姓名</span>
+        <span href="javascript:void(0)" class="c_grey f14 fr fb mb5 mr20">加入时间</span>
+        <span href="javascript:void(0)" class="c_grey f14 fr fb mb5 mr70" >角色</span>
+        <div class="cl"></div><!--st_box_top end-->
+    </div>

+    <div class="mt10">
    <% members.each do |member| %>
-        <div class="st_boxlist">
-          <%= link_to image_tag(url_to_avatar(member.user), :width => "32", :height => "32", :style => "display:block;"), user_path(member.user_id),:target => '_blank', :class => 'st_img' ,:alt => "用户头像" %>
-          <span class="fl ml10 c_grey"><%= l(:label_username)%></span>
-          <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %>
-          <span class="fr c_grey"><%= format_date(member.created_on)%></span>
-          <span class="fr c_grey mr30 w45"><%= zh_course_role(h member.roles.sort.collect(&:to_s).first)%></span>
+        <div class="teacher_st_boxlist">
+          <%= link_to image_tag(url_to_avatar(member.user), :width => "50", :height => "50", :style => "display:block;", :class =>'teacher_member_img'), user_path(member.user_id), :class => 'fl' ,:alt => "用户头像" %>
+          <div class="fl">
+            <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 mt5 mb10 link-blue db") %>
+            <span class="c_grey ml10"><%= l(:label_username)%><%= member.user.login%></span>
+          </div>
+          <span class="fr c_grey mr15"><%= format_date(member.created_on)%></span>
+          <span class="fr c_grey mr55 w45" style="text-align: center"><%= zh_course_role(h member.roles.sort.collect(&:to_s).first)%></span>
        </div>
        <div class="cl"></div>
    <% end%>
-
-    <ul class="wlist">
-      <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-    </ul>
+    </div>
    <div class="cl"></div>
  </div>
 </div>
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@ -10,7 +10,6 @@
          <li>
            <label>班级邀请码：</label>
            <input class=" sy_input_txt fl" name="invite_code" placeholder="请输入五位班级邀请码">
-
            <div class="cl"></div>
          </li>
          <li>
@ -18,14 +17,13 @@
            <input type="checkbox" name="role[]" value="9" id="join_course_role_9" class="ml5 mr5 "/><span class="mr10">教师</span>
            <input type="checkbox" name="role[]" value="7" id="join_course_role_7" class="ml5 mr5"/><span class="mr10">助教</span>
            <input type="checkbox" name="role[]" value="10" id="join_course_role_10" class="ml5 mr5"/><span class="mr10">学生</span>
-
            <div class="cl"></div>
          </li>
-          <li>
+          <p id="none_checked_notice" class="c_red none f12" style="margin-left: 42px;">请至少选择一个身份</p>
+          <li class="mt10">
            <label>&nbsp;</label>
-            <a href="javascript:void(0);" class="sy_btn_blue fl" onclick="$('#new-watcher-form').submit();hideModal()">确&nbsp;&nbsp;定</a>
+            <a href="javascript:void(0);" class="sy_btn_blue fl" onclick="submit_join_course();">确&nbsp;&nbsp;定</a>
            <a href="javascript:void(0);" class="sy_btn_grey fl ml20" onclick="hideModal()">取&nbsp;&nbsp;消</a>
-
            <div class="cl"></div>
          </li>
        </ul>
@ -33,6 +31,16 @@
  </div>
 </div>
 <script>
+    function submit_join_course(){
+        if ($("input[name='role[]']:checked").length >= 1){
+            $("#none_checked_notice").hide();
+            $('#new-watcher-form').submit();
+            hideModal();
+        }else{
+            $("#none_checked_notice").show();
+        }
+    }
+
    $(function() {
        $("#join_course_role_7").on('click', function(){
            if($("#join_course_role_7").is(":checked")) {
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@ -79,29 +79,39 @@
        <% sum = hw_score + ex_score + act_score %>
        <td><%= (@page - 1) * @limit + i + 1 %></td>
        <td>
-          <%= link_to image_tag(url_to_avatar(user), :width => "30", :height => "30", :style => "display:block;"), user_path(member.user_id), :class => 'sy_class_users_st fl mt5 mr5' ,:alt => "用户头像" %>
-          <span class="fl sy_class_users_st_name" title="<%= user.show_name %>"><%= user.show_name %></span>
+          <%= link_to image_tag(url_to_avatar(user), :width => "30", :height => "30", :style => "display:block;"), user_path(user), :class => 'sy_class_users_st fl mt5 mr5' ,:alt => "用户头像" %>
+          <%= link_to user.show_name, user_path(user), :class => 'fl sy_class_users_st_name' ,:title => "#{user.show_name}" %>
        </td>
        <td>
          <span class="sy_class_users_st_num" title="<%= user.user_extensions.student_id %>"><%= user.user_extensions.student_id %></span>
        </td>
        <td>
-          <%= link_to format("%0.2f", hw_score), {
-                :action => 'show_member_score',
-                :member_id => member.id,
-                :remote => true},
-                :class => "" %>
+          <% if !is_teacher && User.current.id != member.user_id && course_has_score_open_common_homework(@course) %>
+             <a>**</a>
+          <% else %>
+              <%= link_to format("%0.2f", hw_score), {
+                      :action => 'show_member_score',
+                      :member_id => member.id,
+                      :remote => true},
+                      :class => "" %>
+          <% end %>
        </td>
        <td><%= ex_score %></td>
        <td>
          <%= link_to act_score, {
-                :action => 'show_member_act_score',
-                :member_id => member.id,
-                :remote => true},
-                :class => '' %>
+                  :action => 'show_member_act_score',
+                  :member_id => member.id,
+                  :remote => true},
+                  :class => '' %>
        </td>
        <td class="pr">
-          <span class="sum_score_tip"><%= format("%0.2f", sum) %></span>
+          <span class="sum_score_tip">
+             <% if !is_teacher && User.current.id != member.user_id && course_has_score_open_common_homework(@course) %>
+              <a>**</a>
+          <% else %>
+              <%= format("%0.2f", sum) %>
+          <% end %>
+          </span>
          <div class="sy_tips_box_inner undis" style="left: <%=is_teacher ? '230px' : '215px' %>; top: -60px; text-align: left;">
            <span style="top: 75px;"></span>
            <p >
--- a/app/views/courses/join_course_multi_role.js.erb
+++ b/app/views/courses/join_course_multi_role.js.erb
@ -5,77 +5,82 @@
 <% if @state == 0 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">加入成功</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 1 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">密码错误</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 2 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">班级已过期<br/>请联系班级管理员重启班级。(在配置班级处)</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 3 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">您已经加入了班级</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 4 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">您输入的邀请码错误</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 5 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">您还未登录</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 6 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">申请成功，请等待审核</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 7%>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">您已经发送过申请了，请耐心等待</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 8%>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">您已经是该班级的教师了</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 9%>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">您已经是该班级的教辅了</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 10%>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">您已经是该班级的管理员了</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 11%>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
-        '<div class="clear mt15"><p class="text_c f14">该班级已被删除</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
+        '<div class="clear mt15"><p class="text_c f14">该班级已归档，请联系老师</p><div class="cl"></div>'+
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 12 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">您已经发送过申请了，请耐心等待</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% elsif @state == 13 %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">申请成功，请等待审核</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="refresh_current_course();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+pop_box_new(htmlvalue, 300, 140);
+<% elsif @state == 14 %>
+var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
+        '<div class="clear mt15"><p class="text_c f14">此二维码已停用，请与老师联系</p><div class="cl"></div>'+
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% else %>
 var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
        '<div class="clear mt15"><p class="text_c f14">未知错误，请稍后再试</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_grey mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
 pop_box_new(htmlvalue, 300, 140);
 <% end %>
 <% end %>
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@ -1,12 +1,11 @@
 <% if @role.to_i == 1 %>
-    <div class="courseRSide fl" id="homework_page_right">
-        <div class="project_r_h">
-          <h2 class="project_h2 fl"><%= @subPage_title%></h2>
+    <div class="sy_class_r sy_class_nobg fr ml10">
+        <div class="sy_class_r_head mb10">
+          <h3 class="fl"><%= @subPage_title %></h3>
          <% if User.current.allowed_to?(:as_teacher,@course) %>
-            <span class="fr f14 fontGrey2" style="height: 40px; line-height: 40px; margin-right: 15px;">
-              <%=link_to "成员管理", {:controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member'}, :class => 'hw_more_li' %>
-            </span>
+              <%=link_to "成员管理", {:controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member'}, :class => 'link-blue fr mt5' %>
          <% end %>
+          <div class="cl"></div>
        </div>
        <%= render :partial => 'course_teacher', :locals => {:members => @members} %>
    </div>
--- a/app/views/courses/set_invite_code_halt.js.erb
+++ b/app/views/courses/set_invite_code_halt.js.erb
@ -0,0 +1,2 @@
+$("#project_info_<%=@course.id %>").html("<%= escape_javascript(render :partial => 'layouts/course_base_info') %>");
+hideModal();
--- a/app/views/exercise/_all_import_exercises.html.erb
+++ b/app/views/exercise/_all_import_exercises.html.erb
@ -2,13 +2,13 @@
  <thead>
  <tr>
    <th class="newupload_td01">&nbsp;</th>
-    <th class="pr">
-      <%= link_to "试卷标题", search_exercises_exercise_index_path(:course_id => course_id, :order => "exercise_name", :sort => @r_sort), :remote => true%>
+    <th class="pr tl">
+      <%= link_to "试卷标题", search_exercises_exercise_index_path(:course_id => course_id, :order => "exercise_name", :sort => @r_sort), :remote => true, :class => "ml5"%>
      <% if order == "exercise_name" %>
          <%= link_to "", search_exercises_exercise_index_path(:course_id => course_id, :order => "exercise_name", :sort => @r_sort), :class => "#{@r_sort == 'desc' ? 'sortupbtn' : 'sortdownbtn'}", :style => "position: absolute; top: 8px; left: 172px;", :remote => true %>
      <% end %>
    </th>
-    <th class="newupload_td03" style="color: #7f7f7f;">来源</th>
+    <th class="newupload_td03 tl" style="color: #7f7f7f;"><span class="ml5">来源</span></th>
    <th class="newupload_td04 pr">
      <%= link_to "创建时间", search_exercises_exercise_index_path(:course_id => course_id, :order => "created_at", :sort => @r_sort), :remote => true%>
      <% if order == "created_at" %>
--- a/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb
+++ b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb
@ -1,6 +1,2 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>');
-showModal('ajax-modal', '500px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
+var htmlvalue = "<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
+pop_box_new(htmlvalue, 400, 178);
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@ -2,5 +2,6 @@
 <%#= watcher_link_issue(@issue, User.current) %>
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
-<%= link_to l(:button_edit), 'javascript:void(0);', :onclick => 'issueEditShow();', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
+<%#= link_to l(:button_edit), 'javascript:void(0);', :onclick => 'issueEditShow();', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
+<%= link_to l(:button_edit), edit_issue_path(@issue), :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
 <%#= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@ -1,4 +1,4 @@
-<div id="issue_edit" style="display: none">
+<div id="issue_edit">
 <%= content_for(:header_tags) do %>
    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@ -63,7 +63,7 @@
          <% end %>
          <!--<a href="javascript:void(0);" class="sy_btn_blue mr5 fr"> 保存并继续</a>-->
          <!--<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="sy_btn_blue mr5 fr" id="issue_confirm"> 保存</a>-->
-          <input onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="sy_btn_blue fr mr5" onfocus="this.blur()" id="issue_confirm" style="width: 28px;color: #FFF" value="保存">
+          <input onclick="issue_create();" class="sy_btn_blue fr mr5" onfocus="this.blur()" id="issue_confirm" style="width: 28px;color: #FFF" value="保存">
        </li>
      </ul>
      <ul class="fl pro_new_conbox_right ml10 mb10">
@ -74,28 +74,28 @@
              <label class="fl ml5" for="issue_is_private" id="issue_is_private_tips"><%= l(:field_set_private_tips)%></label>
          <% end %>
        </li>
-        <li class=" clear"  id="versions_assigned_id">
+        <li class="clear"  id="versions_assigned_id">
          <% if @issue.safe_attribute? 'assigned_to_id' %>
              <%= f.select :assigned_to_id, assigned_options_for_select(@issue.assignable_users, @issue.assigned_to),
                        {:required => @issue.required_attribute?('assigned_to_id'), :no_label => true},
                        {:onchange => "change_assigned_tip();",:class => "w150"}  %>
          <% end %>
        </li>
-        <li class=" clear" id="assigned_to_tips">
+        <li class="clear" id="assigned_to_tips">
          <%= @issue.assigned_to.nil? ? "未指派" : "已指派"  %>
        </li>
-        <li class=" clear" >
+        <li class="clear" >
        <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version),
                   {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
                   {:onchange => "change_milestone_tip();", :class => "w150"} %>
        </li>
-        <li class=" clear" id="milestone_option_tips">
+        <li class="clear" id="milestone_option_tips">
          <%= @issue.fixed_version.nil? ? "未选择里程碑" : "已选择里程碑" %>
          <% if params[:action] == "new" %>
              <%= link_to "", new_project_version_path(@project, :is_issue => true, :issue_project_id => @project.id), :class => "pic_add mt5 ml5 fr", :remote => true %>
          <% end %>
        </li>
-        <li class=" clear" style="border:1px solid #c8c8c8;">
+        <li class="clear" style="border:1px solid #c8c8c8;">
          <% if @issue.safe_attribute? 'start_date' %>
              <%= f.text_field :start_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
                               :required => @issue.required_attribute?('start_date'), :onchange => "issue_start_date_change();",
@ -103,41 +103,98 @@
              <%= calendar_for('issue_start_date', 'start_date') if @issue.leaf? %>
          <% end %>
        </li>
-        <li class=" clear" id="option_start_date_tips">
+        <li class="clear" id="option_start_date_tips">
          <%= @issue.start_date.nil? ? "未选择开始日期" : "已选择开始日期" %>
        </li>
-        <li class=" clear" style="border:1px solid #c8c8c8;">
+        <li class="clear" style="border:1px solid #c8c8c8;">
          <label class="label02" ></label>
          <% if @issue.safe_attribute? 'due_date' %>
              <%= f.text_field :due_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
-                               :required => @issue.required_attribute?('due_date'), :onchange => "issue_end_date_change();",
-                               :class => "fl calendar_input",:style => "width: 170px;", :placeholder => "请选择结束日期"  %>
+                              :required => @issue.required_attribute?('due_date'), :onchange => "issue_end_date_change();",
+                              :class => "fl calendar_input",:style => "width: 170px;", :placeholder => "请选择结束日期"  %>
              <%= calendar_for('issue_due_date', 'start_date') if @issue.leaf? %>
          <% end %>
        </li>
-        <li class=" clear " id="option_end_date_tips">
+        <li class="clear " id="option_end_date_tips">
          <%= @issue.due_date.nil? ? "未选择结束日期" : "已选择结束日期" %>
        </li>
-        <li class=" clear">
+        <li class="clear">
          <% if @issue.safe_attribute? 'estimated_hours' %>
              <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
-                               :required => @issue.required_attribute?('estimated_hours'), :placeholder => "请填写预计工时" %>
+                              :required => @issue.required_attribute?('estimated_hours'), :placeholder => "请填写预计工时" %>
          <% end %>
        </li>
-        <li class=" clear"><%= l(:field_estimated_hours) %></li>
+        <li class="clear"><%= l(:field_estimated_hours) %></li>

-        <li class=" clear">
+        <li class="clear">
          <% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %>
              <%= f.select :done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }),
-                           {:required => @issue.required_attribute?('done_ratio'), :no_label => true},
-                           :onchange => "PrecentChange(this.value)",
-                           :class => "w150" %>
+                         {:required => @issue.required_attribute?('done_ratio'), :no_label => true},
+                          :onchange => "PrecentChange(this.value)",
+                          :class => "w150" %>
          <% end %>
-        <li class=" clear">完成度</li>
        </li>
+        <li class="clear">完成度</li>
+        <% if @project.gpid %>
+            <%#= hidden_field_tag @issue_commit_ids %>
+            <input value="" name="commit_ids" id="commit_ids" type="hidden">
+            <% if @issue %>
+                <% if is_project_manager?(User.current.id, @project.id)|| User.current.id == @issue.author_id || User.current.admin? %>
+                    <li class="clear"><span>关联Commit</span>
+                      <a href="javascript:void(0)" onclick="get_issue_commit_ids('issue_commit_ids','<%= @project.id %>');">
+                        <span class='btn-commit btn-blue mt-2 fr'>+</span>
+                      </a>
+                    </li>
+                <% end %>
+            <% else %>
+                <% if User.current.member_of?(@project) %>
+                    <li class="clear"><span>关联Commit</span>
+                      <a href="javascript:void(0)" onclick="get_issue_commit_ids('issue_commit_ids','<%= @project.id %>');">
+                        <span class='btn-commit btn-blue mt-2 fr'>+</span>
+                      </a>
+                    </li>
+                <% end %>
+            <% end %>
+            <div id="issue_commit_ids">
+                <%= render :partial => "issues/issue_commit_ids", :locals => {:f => f} %>
+            </div>
+        <% end %>
      </ul>
 <% end %>
 <script>
+    function issue_create(){
+        var issue_commit_ids = $("#issue_commit_ids .commit_id_value");
+        var str = "";
+        for(var i=0; i < issue_commit_ids.length; i++){
+            str += $(issue_commit_ids[i]).html();
+            if(i != issue_commit_ids.length -1){
+                str += ",";
+            }
+        }
+        issue_desc_editor.sync();
+        $('#commit_ids').val(str);
+        $('#issue-form').submit();
+    }
+
+    function get_issue_commit_ids(id, project_id){
+        var issue_commit_ids = $("#issue_commit_ids .commit_id_value");
+        var str = "";
+        for(var i=0; i < issue_commit_ids.length; i++){
+            str += $(issue_commit_ids[i]).html();
+            if(i != issue_commit_ids.length -1){
+                str += ",";
+            }
+        }
+        $.ajax({
+            url: '<%= url_for(:controller => 'issues', :action => 'issue_commits') %>',
+            type:'get',
+            data:{
+                project_id: project_id,
+                issue_commit_ids: str
+            }
+        })
+    }
+
    function change_assigned_tip() {
        if( document.getElementById('issue_assigned_to_id').options[document.getElementById('issue_assigned_to_id').selectedIndex].value == 0 ){
            $('#assigned_to_tips').html("未指派");
--- a/app/views/issues/_issue_commit_ids.html.erb
+++ b/app/views/issues/_issue_commit_ids.html.erb
@ -0,0 +1,18 @@
+<% if @issue_commit_ids %>
+    <% @issue_commit_ids.each do |commit_id| %>
+        <div class="btn btn-blue mb5">
+          <%= link_to commit_id[0,8], {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit_id}, :target => "_blank", :class => "commit_id_value" %>
+          <% if @issue %>
+              <% if User.current.admin? || is_project_manager?(User.current.id, @project.id) || User.current.id == @issue.author_id %>
+                  <%= link_to "×", issue_commit_delete_issues_path(:commit_id => commit_id, :project_id => @project.id, :issue_commit_ids => @issue_commit_ids, :issue_id => @issue.try(:id)), :remote => true, :style => "color:#fff;" %>
+              <% end %>
+          <% else %>
+              <% if User.current.member_of?(@project) %>
+                  <%= link_to "×", issue_commit_delete_issues_path(:commit_id => commit_id, :project_id => @project.id, :issue_commit_ids => @issue_commit_ids, :issue_id => @issue.try(:id)), :remote => true, :style => "color:#fff;" %>
+              <% end %>
+          <% end %>
+        </div>
+    <% end %>
+<% else %>
+    <div class="c_grey">暂无</div>
+<% end %>
--- a/app/views/issues/_issue_commits.html.erb
+++ b/app/views/issues/_issue_commits.html.erb
@ -0,0 +1,42 @@
+<div style="width:745px;">
+  <div class="muban_popup_top">
+    <h3 class="fl">关联Commit</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con " >
+    <div class="newupload_conbox " >
+      <% if @commits.blank? %>
+          <%= render :partial => "projects/no_data" %>
+      <% else %>
+          <div class=" clear">
+            <div class="cl"></div>
+            <%= form_tag(url_for(:controller => 'issues', :action => 'issue_commits', :project_id => @project.id, :type => "search"),
+                              :remote => true, :method => 'get', :id => 'issue_commit_form', :class => "fl") do %>
+                <ul class="clear  lightheight28 fl mr100">
+                  <li class="mb10 clear fl">
+                    <span class=" fl">&nbsp;分支&nbsp;&nbsp;:&nbsp;</span>
+                    <%= select_tag :branch, options_for_select(["#{@default_branch}"]+ @branch_names, @rev),
+                                 :class => "fl newupload_select", :style => "width:180px;height:28px;",
+                                 :onchange => "$('#issue_commit_form').submit();" %>
+                  </li>
+                </ul>
+                <div class="hw_search_box fr mb10" >
+                  <input type="text" name="search" placeholder="输入描述内容进行搜索" class="hw_search-input" style="width:300px;">
+                  <%= submit_tag '', :class => 'hw_btn_search', :onfocus => 'this.blur();', :style => 'border-style:none' %>
+                </div>
+            <% end %>
+          </div>
+          <div id="issue_commit_list">
+            <%= render :partial => "issues/issue_commits_list" %>
+          </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<script>
+    function remote_function(id) {
+        $(id).submit();
+    }
+</script>
--- a/app/views/issues/_issue_commits_list.html.erb
+++ b/app/views/issues/_issue_commits_list.html.erb
@ -0,0 +1,58 @@
+<%= form_tag(url_for(:controller => 'issues', :action => 'commit_for_issue', :project_id => @project.id), :remote => true, :method => 'get', :id => 'commit_for_issue', :class => "fl") do %>
+<table class="newupload_table " cellspacing="0" cellpadding="0">
+  <thead>
+  <tr>
+    <th class="newupload_td01">&nbsp;</th>
+    <th class="newupload_td04">修订号</th>
+    <th>描述</th>
+    <th class="newupload_td04">提交者</th>
+    <th class="newupload_td05">提交日期</th>
+  </tr>
+  </thead>
+  <tbody>
+      <% @commits.each do |commit| %>
+      <tr>
+        <td class="newupload_td01"><input  type="checkbox" value="<%= commit.short_id %>" name="checkbox1[]"> </td>
+        <td class="newupload_td04"><span class="newupload_table_name">
+           <%= link_to commit.id[0,8], {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit.id}, :target => "_blank" %></span>
+        </td>
+        <td class="newupload_td02"><p><%= commit.title %></p></td>
+        <td class="newupload_td04"><span class="newupload_table_name"><%= link_to_user_mail(commit.author_email, "") %></span></td>
+        <td class="newupload_td05"><%= format_date(commit.created_at) %></td>
+      </tr>
+      <% end %>
+  </tbody>
+  <input value="" name="issue_for_commit_ids" id="issue_for_commit_ids" type="hidden">
+</table>
+<div class="clear">
+  <div class="clear fl mt10 mb10">
+    <a href="javascript:void(0);" class="sy_btn_blue fl" onclick="search_and_branch_for_commit_ids();">确&nbsp;&nbsp;定</a>
+    <a href="javascript:void(0);" class="sy_btn_grey fl ml10" onclick="hideModal()">取&nbsp;&nbsp;消</a>
+  </div>
+  <div style="text-align:center;">
+    <div class="pages" style="width:auto; display:inline-block;">
+      <ul id="homework_pository_ref_pages">
+        <%= pagination_links_full @commits_pages, @commits_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+      </ul>
+      <div class="cl"></div>
+    </div>
+  </div>
+  <div class="cl"></div>
+</div>
+<% end %>
+
+<script>
+    function search_and_branch_for_commit_ids(){
+        var issue_commit_ids = $("#issue_commit_ids .commit_id_value");
+        var str = "";
+        for(var i=0; i < issue_commit_ids.length; i++){
+            str += $(issue_commit_ids[i]).html();
+            if(i != issue_commit_ids.length -1){
+                str += ",";
+            }
+        }
+        $('#issue_for_commit_ids').val(str);
+        $('#commit_for_issue').submit();
+        hideModal();
+    }
+</script>
--- a/app/views/issues/commit_for_issue.js.erb
+++ b/app/views/issues/commit_for_issue.js.erb
@ -0,0 +1 @@
+$("#issue_commit_ids").html('<%= escape_javascript(render :partial => 'issues/issue_commit_ids') %>');
--- a/app/views/issues/edit.html.erb
+++ b/app/views/issues/edit.html.erb
@ -1,6 +1,7 @@
-<h3><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h3>
+<div id="issue_edit_show"  class="mt10 pro_newissue_con">
+  <%= render :partial => 'issues/edit' %>
+  <% content_for :header_tags do %>
+      <%= robot_exclusion_tag %>
+  <% end %>

-<%= render :partial => 'edit' %>
-<% content_for :header_tags do %>
-    <%= robot_exclusion_tag %>
-<% end %>
+</div>
--- a/app/views/issues/issue_commit_delete.js.erb
+++ b/app/views/issues/issue_commit_delete.js.erb
@ -0,0 +1 @@
+$("#issue_commit_ids").html('<%= escape_javascript(render :partial => 'issues/issue_commit_ids') %>');
--- a/app/views/issues/issue_commits.js.erb
+++ b/app/views/issues/issue_commits.js.erb
@ -0,0 +1,13 @@
+var checked = $("input[name='checkbox1[]']:checked").size();
+if(checked > 0)
+{
+    alert('翻页或搜索后将丢失当前选择的提交记录!');
+}
+
+<% if @type %>
+$("#issue_commit_list").html('<%= escape_javascript(render :partial => 'issues/issue_commits_list') %>');
+<% else %>
+var htmlvalue = "<%= escape_javascript(render :partial => 'issues/issue_commits') %>";
+pop_box_new(htmlvalue,760,600);
+<% end %>
+
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@ -5,16 +5,7 @@
 <script>
    sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
 </script>
-<script type="text/javascript">
-    $(function(){
-        $("#RSide").removeAttr("id");
-        $("#Container").css("width","1000px");
-        is_edit = <%= @is_edit.present? && @is_edit == true %>
-        if(is_edit) {
-            issueEditShow();
-        }
-    });
-</script>
+
 <div  class="mt10 mb10" id =issue_show_total"">
  <div class="banner-big f16 fontGrey3">
    问题跟踪
@ -46,9 +37,6 @@
    </div>
  </div>

-  <div id="issue_edit_show"  class="mt10 pro_newissue_con">
-    <%= render :partial => 'issues/edit'%>
-  </div>
  <ul class="fr pro_new_conbox_right" id="project_issue_info_show">
    <li class="clear">
      <span class="pro_new_conbox_leftspan fl">当前状态</span>
@ -86,6 +74,11 @@
          <span class="pro_new_conbox_rightspan fl ml10"><%= @issue.done_ratio %>%</span>
        </li>
    <% end %>
+    <li class="clear"><span class="pro_new_conbox_leftspan mb5">关联Commit</span>
+      <div id="issue_commit_ids">
+        <%= render :partial => "issues/issue_commit_ids" %>
+      </div>
+    </li>
  </ul>
  <div class="cl"></div>
 </div>
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@ -54,14 +54,23 @@
  </div>
 </div>
 <div class="sy_class_id fl">
-  <p>邀 请 码<br />
+  <p style="margin: <%=is_teacher ? '8px auto' : '24px auto 0px' %>">邀 请 码<br />
    <span class="sy_corange">
-      <% if User.current.admin? || User.current.member_of_course?(@course) %>
-        <%=@course.generate_invite_code %>
+      <% if @course.invite_code_halt == 0 %>
+          <% if User.current.admin? || User.current.member_of_course?(@course) %>
+            <%=@course.generate_invite_code %>
+          <% else %>
+            <span class="f12">请询问老师</span>
+          <% end %>
      <% else %>
-        <span class="f12">请询问老师</span>
+          已停用
      <% end %>
    </span>
+    <% if is_teacher && @course.invite_code_halt == 0 %>
+      <a href="javascript:void(0);" class="btn_grey_mid" style="margin-bottom: 12px;" onclick="alert_halt_code();">停&nbsp;&nbsp;&nbsp;&nbsp;用</a>
+    <% elsif is_teacher && @course.invite_code_halt == 1 %>
+      <a href="<%=set_invite_code_halt_course_path(@course) %>" data-remote="true" class="btn_grey_mid" style="margin-bottom: 12px;">启&nbsp;&nbsp;&nbsp;&nbsp;用</a>
+    <% end %>
  </p>
 </div>
 <div class="sy_class_info fl ml15">
@ -102,10 +111,10 @@
 </div>
 <div class="cl"></div>
 <% if is_teacher %>
-    <div class="invite_code_tip_box fontGrey2">
+    <div class="invite_code_tip_box fontGrey2" id="invite_code_tip_box">
      <em></em>
      <span></span>
-      <p class="mt10 mb5">请将邀请码告诉学生和教辅</p>
-      <p class="mb10">他们可以主动加入班级</p>
+      <p class="mt10 mb5"><%= @course.invite_code_halt == 0 ? "请将邀请码告诉学生和教辅" : "邀请码已停用，学生和教辅" %></p>
+      <p class="mb10"><%= @course.invite_code_halt == 0 ? "他们可以主动加入班级" : "不可以主动加入班级了" %></p>
    </div>
 <% end %>
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@ -7,13 +7,19 @@
      <li class="navHomepageMenu fl">
        <%= link_to "首页",user_activities_path(User.current), :class => "c_white f16 db p10", :title => "回到个人首页"%>
      </li>
+<!--      <li class="navHomepageMenu fl">
+        <%#= link_to "资源库", user_resource_user_path(User.current, :type => 1), :class => "c_white f16 db p10" %>
+      </li>-->
      <li class="navHomepageMenu fl">
-        <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :class => "c_white f16 db p10" %>
+        <%= link_to "课程", user_course_community_path(User.current), :class => "c_white f16 db p10" %>
+      </li>
+      <li class="navHomepageMenu fl">
+        <%= link_to "项目", user_project_community_path(User.current), :class => "c_white f16 db p10" %>
      </li>
      <% if hidden_unproject_infos %>
-          <li class="navHomepageMenu fl">
-            <%= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
-          </li>
+<!--          <li class="navHomepageMenu fl">
+            <%#= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
+          </li>-->
          <% memo = Memo.where(:id => 1168).first %>
          <% unless memo.nil? %>
              <li class="navHomepageMenu fl mr30">
@ -72,10 +78,10 @@
              </li>
          <% end %>
          <li>
-            <%= link_to "我的组织",  user_organizations_user_path(:id => User.current), :class => "menuGrey"%>
+            <%= link_to '我的项目', {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "menuGrey" %>
          </li>
          <li>
-            <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
+            <%= link_to "我的组织",  user_organizations_user_path(:id => User.current), :class => "menuGrey"%>
          </li>
          <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
          <li>
--- a/app/views/layouts/_user_brief_introduction.html.erb
+++ b/app/views/layouts/_user_brief_introduction.html.erb
@ -1,10 +1,10 @@
 <span>
-    <% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
-        <%= user.user_extensions.brief_introduction %>
-    <% else%>
-        这个小伙伴很懒，什么都没留下~
+<div class="user_info_intro">
+    <% if  !user.user_extensions.school_id.blank? %>
+        <%= user.user_extensions.school.name %>
    <% end %>
+</div>
 </span>
-<% if User.current == user%>
-    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
-<% end %>
+<%# if User.current == user%>
+    <%#= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
+<%# end %>
--- a/app/views/layouts/_user_watch_btn.html.erb
+++ b/app/views/layouts/_user_watch_btn.html.erb
@ -1,18 +1,18 @@
 <ul>
  <% if User.current.logged?%>
      <% if User.current == target%>
-          <li style="width: 119px; float: left; border-right: 1px solid #ddd;"><%= link_to("个人资料", my_account_path, :class => "user_editinfo") %></li>
-          <li style="width: 118px; float: left;"><%= link_to '个人主页', homepage_user_path(@user), :class => "user_editinfo", :target => '_blank' %></li>
+<!--          <li style="width: 119px; float: left; border-right: 1px solid #ddd;"><%#= link_to("个人资料", my_account_path, :class => "user_editinfo") %></li>-->
+          <li><%= link_to '个人主页', homepage_user_path(@user), :class => "user_editinfo", :target => '_blank' %></li>
          <li class="cl"></li>
      <% else%>
-          <li style="width: 119px; float: left; border-right: 1px solid #ddd;">
-            <% if target.base_homepage.nil? %>
+        <!--  <li style="width: 119px; float: left; border-right: 1px solid #ddd;">
+            <%# if target.base_homepage.nil? %>
                <a href="javascript:void(0)" class ="user_editinfo" style="color: #cccccc" title="该用户暂未设置主页">主页</a>
-            <% else %>
-                <%=link_to "主页", homepage_user_path(@user.login), :class => 'user_editinfo', :target => '_blank' %>
-            <% end %>
-          </li>
-          <li style="width: 118px; float: left;">
+            <%# else %>
+                <%#=link_to "主页", homepage_user_path(@user.login), :class => 'user_editinfo', :target => '_blank' %>
+            <%# end %>
+          </li>-->
+          <li>
            <%if(target.watched_by?(User.current))%>
                <%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "user_editinfo", :method => "delete",:remote => "true", :title => "取消关注"%>
            <% else %>
--- a/app/views/layouts/base_course_community.html.erb
+++ b/app/views/layouts/base_course_community.html.erb
@ -0,0 +1,113 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel', 'css/user', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
+</head>
+
+<body onload="prettyPrint();">
+<div class="navContainer">
+  <% is_current_user = User.current.logged? && User.current == @user%>
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+<div class="homepageContentContainer">
+  <!--div class="homepageRightBannerImg"></div-->
+  <div class="cl"></div>
+  <div class="homepageContent">
+    <div class="homepageLeft mt10" id="LSide">
+      <div class="user_leftnav ">
+        <% if hidden_unproject_infos %>
+            <ul class="users_accordion mb10">
+              <li id="user_01" class="user_icons_course">
+                <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %>
+                <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user}, :style => "color:#aaa;" %></font>
+                <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
+                <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
+                  <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
+                </div>
+              </li>
+              <% if is_current_user %>
+                  <li id="user_02"  class="user_icons_new">
+                    <%= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
+                  </li>
+                  <li id="user_03" class="user_icons_new">
+                    <%= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
+                  </li>
+                  <li id="user_04" class="user_icons_addclass">
+                    <%= link_to "加入班级",join_private_courses_courses_path,:remote => true, :method => "post", :style => "font-size:14px;" %>
+                  </li>
+              <% end %>
+            </ul>
+        <% end %>
+        <ul class="users_accordion mb10">
+          <% if @user == User.current %>
+              <li id="user_05" class="user_icons_myhw">
+                <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_06" class="icons-doc clear">
+                <%= link_to "题库",  user_homeworks_user_path(User.current), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_07" class="icons-download clear">
+                <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank",:style => "font-size:14px;" %>
+              </li>
+          <% end %>
+        </ul>
+      </div>
+      <div class="user_leftnav ">
+        <ul class="users_accordion mb10">
+          <li id="user_10" class="user_icons_mes">
+            <%= link_to '留言', feedback_path(@user, :host=> Setting.host_user)%>
+          </li>
+        </ul>
+      </div>
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @user %>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
+    </div>
+    <div class="homepageRight">
+      <%= yield %>
+    </div>
+  </div>
+</div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
+<div id="ajax-modal" style="display:none;"></div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<div id="nh_tx_dialog_html" class="white_content" style="display:none;">
+  <%=render :partial => 'layouts/upload_avatar', :locals => {:source => @user} %>
+</div>
+</body>
+</html>
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -147,7 +147,7 @@
      <%# 课程英雄榜 %>
      <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
      <div class="sy_class_leftbox" >
-        <h3 class="fontGrey7">班级推荐</h3>
+        <h3 class="fontGrey7">推荐</h3>
        <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
      </div>
      <%# 更新访问数,刷新的时候更新访问次数 %>
@ -279,10 +279,19 @@

    function delete_confirm(){
        var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
-                '<div class="clear mt15"><p class="text_c f14">您确认要退出该班级吗？</p><div class="cl"></div><a href="<%=join_path(:object_id => @course.id) %>" class="fr sy_btn_blue mr85 mt10" data-method="delete" data-remote="true">确&nbsp;&nbsp;定</a>'+
+                '<div class="clear mt15"><p class="text_c f14">您确认要退出该班级吗？</p><div class="cl"></div>'+
+                '<a href="<%=join_path(:object_id => @course.id) %>" class="fr sy_btn_blue mr85 mt10" data-method="delete" data-remote="true">确&nbsp;&nbsp;定</a>'+
                '<a href="javascript:void(0);" class="fr sy_btn_grey mt10 mr10" onclick="hideModal();">取&nbsp;&nbsp;消</a></div></div>';
        pop_box_new(htmlvalue, 300, 140);
    }
+
+    function alert_halt_code(){
+        var htmlvalue = '<div id="muban_popup_box" style="width:400px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
+                '<div class="clear mt15"><p class="text_c f14">邀请码停用后，用户不能主动加入该班级了</p><p class="text_c mt10 f14">您是否确认停用</p><div class="cl"></div>'+
+                '<a href="<%=set_invite_code_halt_course_path(@course) %>" class="fr sy_btn_blue mr135 mt10" data-remote="true">确&nbsp;&nbsp;定</a>'+
+                '<a href="javascript:void(0);" class="fr sy_btn_grey mt10 mr10" onclick="hideModal();">取&nbsp;&nbsp;消</a></div></div>';
+        pop_box_new(htmlvalue, 400, 180);
+    }
 </script>

 </html>
--- a/app/views/layouts/base_project_community.html.erb
+++ b/app/views/layouts/base_project_community.html.erb
@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel', 'css/user', :media => 'all' %>
+  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+  <%= javascript_heads %>
+  <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
+  <%= heads_for_theme %>
+  <%= call_hook :view_layouts_base_html_head %>
+  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
+</head>
+
+<body onload="prettyPrint();">
+<div class="navContainer">
+  <% is_current_user = User.current.logged? && User.current == @user%>
+  <% if User.current.logged? %>
+      <%= render :partial => 'layouts/logined_header' %>
+  <% else%>
+      <%= render :partial => 'layouts/unlogin_header' %>
+  <% end%>
+</div>
+<div class="cl"></div>
+<div class="homepageContentContainer">
+  <!--div class="homepageRightBannerImg"></div-->
+  <div class="cl"></div>
+  <div class="homepageContent">
+    <div class="homepageLeft mt10" id="LSide">
+      <div class="user_leftnav ">
+        <ul class="users_accordion mb10">
+          <li id="user_06" class="user_icons_project">
+            <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list'%>
+            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user}, :style => "color:#aaa;" %></font>
+            <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
+            <div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
+              <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>
+            </div>
+          </li>
+          <% if is_current_user %>
+              <li id="user_07"  class="user_icons_new">
+                <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_08" class="user_icons_addproject">
+                <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_09" class="user_icons_myissues">
+                <%= link_to "我的Issue", user_issues_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+          <% end %>
+        </ul>
+        <ul class="users_accordion mb10">
+          <li id="user_10" class="user_icons_mes">
+            <%= link_to '留言', feedback_path(@user, :host=> Setting.host_user)%>
+          </li>
+        </ul>
+      </div>
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @user %>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
+    </div>
+    <div class="homepageRight">
+      <%= yield %>
+    </div>
+  </div>
+</div>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+
+<div id="ajax-modal" style="display:none;"></div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<div id="nh_tx_dialog_html" class="white_content" style="display:none;">
+  <%=render :partial => 'layouts/upload_avatar', :locals => {:source => @user} %>
+</div>
+</body>
+</html>
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@ -7,7 +7,7 @@
  <meta name="keywords" content="issue,bug,tracker" />
  <%= csrf_meta_tag %>
  <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel', 'css/user', :media => 'all' %>
  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
  <%= javascript_heads %>
  <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@ -88,7 +88,7 @@

 <body onload="prettyPrint();">
 <div class="navContainer">
-  <% is_current_user = User.current.logged? && User.current == @user%>
+  <% is_current_user = User.current.logged? && User.current == @user %>
  <% if User.current.logged? %>
      <%= render :partial => 'layouts/logined_header' %>
  <% else%>
@ -104,7 +104,8 @@
      <div class="user_leftinfo mb10">
        <% if User.current.logged? && User.current == @user%>
            <div class="pr" style="width: 80px; margin:0 auto;">
-                <%=link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path, :class => "user_leftinfo_img", :remote => true%>
+                <%=link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id => 'nh_source_tx'),
+                           my_clear_user_avatar_temp_path, :class => "user_leftinfo_img", :remote => true %>
                <div class="homepageEditProfile undis">
                  <%=link_to '', my_clear_user_avatar_temp_path, :class => 'homepageEditProfileIcon', :remote => true, :title => '点击编辑Logo' %>
                </div>
@ -130,23 +131,23 @@
                <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
              </div>
            </div>
-            <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
+          <!--  <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%#= edit_brief_introduction_user_path(@user.id)%>');"><%#= @user.user_extensions.brief_introduction %></textarea>-->
          </div>
          <ul class="user_atten clear">
            <li>
-              <a href="<%=user_blogs_path(:user_id => @user) %>">
+              <a href="<%= user_blogs_path(:user_id => @user) %>">
                <strong>博客</strong><br />
-                <span class="sy_cgrey"><%=@user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %></span>
+                <span class="sy_cgrey"><%= @user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %></span>
              </a>
            </li>
            <li>
-              <a href="<%=user_watchlist_user_path(@user) %>">
+              <a href="<%= user_watchlist_user_path(@user) %>">
                <strong>关注</strong><br />
-                <span class="sy_cgrey"><%=User.watched_by(@user).count %></span>
+                <span class="sy_cgrey"><%= User.watched_by(@user).count %></span>
              </a>
            </li>
            <li>
-              <a href="<%=user_fanslist_user_path(@user) %>">
+              <a href="<%= user_fanslist_user_path(@user) %>">
                <strong>粉丝</strong><br />
                <span id="user_fans_number" class="sy_cgrey"><%= @user.watcher_users.count %></span>
              </a>
@ -157,64 +158,110 @@
          <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
        </div>
      </div>
-
-      <div class="user_leftnav ">
-        <% if hidden_unproject_infos %>
-        <ul class="users_accordion mb10">
-          <li id="user_01" class="user_icons_course">
-            <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %>
-            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user}, :style => "color:#aaa;" %></font>
-            <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
-            <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
-              <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
-            </div>
-          </li>
-          <% if is_current_user %>
-              <li id="user_02"  class="user_icons_new">
-                <%= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
-              </li>
-              <li id="user_03" class="user_icons_new">
-                <%= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
-              </li>
-              <li id="user_04" class="user_icons_addclass">
-                <%= link_to "加入班级",join_private_courses_courses_path,:remote => true, :method => "post", :style => "font-size:14px;" %>
-              </li>
-              <% if @user == User.current %>
-                <li id="user_05" class="user_icons_myhw">
-                  <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
+      <% if is_current_user %>
+          <div class="home-user-leftnav">
+            <h3 >
+          	  <%= link_to "课程社区", user_course_community_path(User.current), :class => "fl" %>
+			</h3>
+            <%# if hidden_unproject_infos %>
+                <ul>
+                  <li class="home-user-leftnav-li icons-class clear">
+                    <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{user_course_count}</span>".html_safe : "课程",
+                                {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %>
+                    <!--      <div class="user_navmore_box" >
+              <ul>
+                <li class="user_navmore_icons">
+                  <ul class="user_navmore_txt02" >
+                    <%# if is_current_user %>
+                    <li>
+                      <%#= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank", :class => "user_navmore_li" %>
+                    </li>
+                    <li>
+                      <%#= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank", :class => "user_navmore_li" %>
+                    </li>
+                    <li>
+                      <%#= link_to "加入班级", join_private_courses_courses_path, :remote => true, :method => "post", :class => "user_navmore_li" %>
+                    </li>
+                    <#% end %>
+                  </ul>
                </li>
-              <% end %>
-          <% end %>
-        </ul>
-        <% end %>
+              </ul>
+            </div>-->
+                  </li>
+                      <li class="home-user-leftnav-li icons-homework clear">
+                        <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :class => "fl" %>
+                      </li>
+                  <li class="home-user-leftnav-li icons-doc clear">
+                    <%= link_to "题库",  user_homeworks_user_path(User.current), :target => "_blank", :class => "fl" %>
+                  </li>
+                  <li class="home-user-leftnav-li icons-download clear">
+                    <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank", :class => "fl" %>
+                  </li>
+                </ul>
+            <%# end %>
+          </div>

-        <ul class="users_accordion mb10">
-          <li id="user_06" class="user_icons_project">
-            <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list'%>
-            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user}, :style => "color:#aaa;" %></font>
-            <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
-            <div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
-              <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>
-            </div>
-          </li>
-          <% if is_current_user %>
-              <li id="user_07"  class="user_icons_new">
-                <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :target => "_blank", :style => "font-size:14px;" %>
+          <div class="home-user-leftnav">
+            <h3 >
+          	  <%= link_to "项目社区", user_project_community_path(User.current), :class => "fl" %>
+			</h3>
+            <ul>
+              <li class="home-user-leftnav-li icons-project clear">
+                <%= link_to  user_project_count > 0 ? "项目<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{user_project_count}</span>".html_safe : "项目",
+                             {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list' %>
+                <!--    <div class="user_navmore_box" >
+              <ul>
+                <li class="user_navmore_icons">
+                  <ul class="user_navmore_txt02">
+                    <li>
+                      <%#= link_to "新建项目",  new_project_path(:host => Setting.host_name), :target => "_blank", :class => "user_navmore_li" %>
+                    </li>
+                    <li>
+                      <%#= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :class => "user_navmore_li" %>
+                    </li>
+                    <li>
+                        <%#= link_to "我的关注", user_watchlist_user_path(@user), :remote => true, :method => "post", :class => "user_navmore_li" %>
+                    </li>
+                    &lt;!&ndash;<li><a href="javascript:void(0);" class="user_navmore_li">发现更多</a></li>&ndash;&gt;
+                  </ul>
+                </li>
+              </ul>
+            </div>-->
              </li>
-              <li id="user_08" class="user_icons_addproject">
-                <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %>
+              <li class="home-user-leftnav-li icons-issue clear">
+                <%= link_to issues_author_is_self_count > 0 ? "我发布的issue<span class='issues_nav_tag mr10 fr'style='line-height:18px;margin-top: 9px;'>#{issues_author_is_self_count}</span>".html_safe : "我发布的issue",
+                            user_issues_user_path(@user) %>
              </li>
-              <li id="user_09" class="user_icons_myissues">
-                <%= link_to "我的Issue", user_issues_user_path(@user), :style => "font-size:14px;" %>
+              <li class="home-user-leftnav-li icons-issue clear">
+                <%= link_to issues_assigned_is_self_count > 0 ? "我收到的issue<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{issues_assigned_is_self_count}</span>".html_safe : "我收到的issue",
+                            user_issues_user_path(@user) %>
              </li>
-          <% end %>
-        </ul>
+            </ul>
+          </div>
+      <% else %>
+          <div class="home-user-leftnav">
+            <h3 >Ta在确实
+                <span class="fr mr5" style="font-size:12px;color: #7f7f7f;"><%= time_tag(@user.created_on).html_safe %></span>
+            </h3>
+            <ul>
+              <li class="home-user-leftnav-li icons-class clear">
+                <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag ml140'>#{user_course_count}</span>".html_safe : "课程",
+                            {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list", :class => "fl" %>
+              </li>
+              <li class="home-user-leftnav-li icons-project clear">
+                <%= link_to  user_project_count > 0 ? "项目<span class='issues_nav_tag ml140'>#{user_project_count}</span>".html_safe : "项目",
+                             {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "fl" %>
+              </li>
+            </ul>
+          </div>
+      <% end %>
+      <div class="user_leftnav ">
        <ul class="users_accordion mb10">
          <li id="user_10" class="user_icons_mes">
-            <%= link_to '留言', feedback_path(@user, :host=> Setting.host_user)%>
+            <%= link_to "留言", feedback_path(@user, :host=> Setting.host_user)%>
          </li>
        </ul>
-      </div><!--sy_class_leftnav end-->
+      </div>

      <%# 更新访问数,刷新的时候更新访问次数 %>
      <%  update_visiti_count @user %>
@ -281,4 +328,4 @@
    }
 </script>
 </body>
-</html>
+</html>
--- a/app/views/memos/_memo_all_replies.html.erb
+++ b/app/views/memos/_memo_all_replies.html.erb
@ -31,7 +31,7 @@
          <%= render :partial => 'users/message_contents', :locals => {:comment => reply, :type => 'Memo', :user_activity_id => @memo.id}%>
        </div>
        <div class="homepagePostReplyContent break_word" style="margin-bottom:15px;"  id="activity_description_<%= reply.id %>">
-          <p><%=  reply.content.gsub(/script/, "script&nbsp").html_safe %></p>
+          <p><%= reply.content.gsub(/\/script/, "script").gsub(/script/, "&nbsp;script").html_safe %></p>
        </div>
        <div class="orig_reply mb10 mt-10">
          <div class="reply">
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@ -143,7 +143,7 @@
        <div class="cl"></div>
      </div>
      <div class="undis ml15 mr15" id="orgContent_3">
-<!--新增二级栏目-->
+      <!--新增二级栏目-->
      <div>
        <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id => 'add_subfield_form',:remote => true do %>
            <span class="fontGrey3 fb mb5 mr10" >新增一级栏目</span>
@ -155,6 +155,7 @@
              <% else %>
                  <span class="fontGrey2">(用户自定义url，可选) 您还没有子域名，请先在左侧信息栏申请子域名</span>
              <% end %>
+              <div id="sub_dir_tip" class="mt10 c_red" style="display: none;">您输入的域名目录是关键字，不能使用</div>
              <div class="cl"></div>
            </div>
            <ul class="orgAddRole mb10">
@ -183,8 +184,24 @@

 </div>
 <script>
+    function regex_domain_name()
+    {
+        var name = $.trim($("#sub_dir").val());
+        var domain = ["members","more_org_submains","more_org_projects","more_org_courses","search_courses","teachers","students","projects","courses","acts","search_projects"]
+        if(domain.indexOf(name) > 0)
+        {
+            $("#sub_dir_tip").show();
+            return false;
+        }
+        else
+        {
+            $("#sub_dir_tip").hide();
+            return true;
+        }
+    }
+
  function add_org_subfield(){
-      if ($("#subfield_name").val().trim() != "")
+      if ($("#subfield_name").val().trim() != "" && regex_domain_name())
        $("#add_subfield_form").submit();
  }
  function add_org_subfield_subdomain(){
--- a/app/views/projects/_project_attachment.html.erb
+++ b/app/views/projects/_project_attachment.html.erb
@ -9,10 +9,10 @@
          <div class="homepagePostTo break_word">
            <%= link_to activity.try(:author).show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
            TO
-            <%= link_to activity.project.name.to_s+" | 项目资源", project_files_path(activity.course), :class => "newsBlue ml15" %>
+            <%= link_to activity.project.name.to_s+" | 项目资源", project_files_path(activity.project), :class => "newsBlue ml15" %>
          </div>
          <div class="homepagePostTitle break_word" >
-            <%= link_to activity.filename, project_files_path(activity.course), :class => "postGrey" %>
+            <%= link_to activity.filename, project_files_path(activity.project), :class => "postGrey" %>
          </div>
          <div class="homepagePostSubmitContainer">
            <div class="homepagePostDeadline mr15">
--- a/app/views/projects/_project_issue_contents.html.erb
+++ b/app/views/projects/_project_issue_contents.html.erb
@ -7,17 +7,26 @@
    <% parents_rely = get_reply_parents parents_rely, comment %>
    <% length = parents_rely.length %>
    <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 2 %>
+      <% if length <= 5 %>
          <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => comment.parent, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
      <% else %>
          <div class="orig_cont clearfix">
            <div class="orig_cont clearfix">
-              <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[length - 1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
-            </div>
-            <div class="orig_cont_hide_issue clearfix">
-              <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => 'is_project_issue', :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+              <div class="orig_cont clearfix">
+                <div class="orig_cont clearfix">
+                  <div class="orig_cont clearfix">
+                    <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[length - 1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                  </div>
+                  <div class="orig_cont_hide clearfix">
+                    <span class="orig_icon" >&darr; </span>
+                    <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 5).to_s %>个楼层</span>
+                    <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => 'is_project_issue', :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+                  </div>
+                  <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[3], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                </div>
+                <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[2], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+              </div>
+              <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
            </div>
            <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[0], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
          </div>
--- a/app/views/projects/_project_message_contents.html.erb
+++ b/app/views/projects/_project_message_contents.html.erb
@ -7,17 +7,26 @@
    <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
    <% length = parents_rely.length %>
    <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 2 %>
+      <% if length <= 5 %>
          <%=render :partial => 'projects/journal_comment_reply', :locals => {:comment => comment.parent, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
      <% else %>
          <div class="orig_cont clearfix">
            <div class="orig_cont clearfix">
-              <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
-            </div>
-            <div class="orig_cont_hide_issue clearfix">
-              <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => 'is_project_message', :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+              <div class="orig_cont clearfix">
+                <div class="orig_cont clearfix">
+                  <div class="orig_cont clearfix">
+                    <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                  </div>
+                  <div class="orig_cont_hide clearfix">
+                    <span class="orig_icon" >&darr; </span>
+                    <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 5).to_s %>个楼层</span>
+                    <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => 'is_project_message', :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+                  </div>
+                  <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[3], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                </div>
+                <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[2], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+              </div>
+              <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
            </div>
            <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[0], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
          </div>
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@ -1,7 +1,7 @@
 <!--新版项目头部结束-->
 <div class="ke-block pro_new_info mb10 " style="padding-bottom: 5px;word-break: normal;word-wrap: break-word" >
 <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
-  <div id="project_description_code" style="padding: 0 15px 10px 15px;">
+  <div id="project_description_code" style="padding: 0 15px 10px 15px;font-size: 14px;">
  <% if @project.description.blank? %>
      <p style="padding-top:5px"><%= @project.name %></p>
  <% else %>
--- a/app/views/pull_requests/_pull_request_commits.html.erb
+++ b/app/views/pull_requests/_pull_request_commits.html.erb
@ -16,6 +16,15 @@
      </ul>
    </div>
 <% end %>
+<div style="text-align:center;">
+  <div class="pages" style="width:auto; display:inline-block;">
+    <ul  id="homework_pository_ref_pages">
+      <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+    </ul>
+    <div class="cl"></div>
+  </div>
+</div>
+<div class="cl"></div>



--- a/app/views/pull_requests/_pull_requests_list.html.erb
+++ b/app/views/pull_requests/_pull_requests_list.html.erb
@ -14,8 +14,17 @@
          <div class="c_grey clear mt5">
            <p class="fl">由 <%= link_to get_user_by_login_and(request.author.try(:username)).try(:show_name), user_path(get_user_by_login_and(request.author.try(:username))), :class => "linkBlue2" %> 创建于<%= time_tag(request.created_at) %>前</p>
            <span class="fl ml10"><%= time_tag(request.updated_at) %>前更新</span>
-            <p class="fr"><%= find_gitlab_project(request.source_project_id)+"/"+request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%= find_gitlab_project(request.target_project_id)+"/"+request.target_branch %></p>
+            <p class="fr"><%#= find_gitlab_project(request.source_project_id)+"/"+request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%#= find_gitlab_project(request.target_project_id)+"/"+request.target_branch %></p>
          </div>
        </div>
    <% end %>
+    <div style="text-align:center;">
+      <div class="pages" style="width:auto; display:inline-block;">
+        <ul  id="homework_pository_ref_pages">
+          <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => true, :flag => true, :is_new => true%>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+    <div class="cl"></div>
 <% end %>
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@ -28,16 +28,6 @@
      <!--</div>-->
      <div id="pull_requests_list">
        <%= render "pull_requests/pull_requests_list" %>
-
-        <div style="text-align:center;">
-          <div class="pages" style="width:auto; display:inline-block;">
-            <ul  id="homework_pository_ref_pages">
-              <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
-            </ul>
-            <div class="cl"></div>
-          </div>
-        </div>
-        <div class="cl"></div>
      </div>
    </div>
    <script>
--- a/app/views/repositories/changes.html.erb
+++ b/app/views/repositories/changes.html.erb
@ -14,9 +14,21 @@
            <% commits.each do |commit| %>
                <li  class="clear">
                  <span class="fl c_grey ml15 "><%= time_tag(commit.created_at) %>前</span>
-                  <%= link_to get_user_by_mail(commit.author_email).show_name, user_path(get_user_by_mail(commit.author_email)), :target => "_blank", :class => "pullreques_pull_name fl ml10" %>
+                  <%= link_to_user_mail(commit.author_email, "pullreques_pull_name fl ml10") %>
                  <p class="pullreques_pull_txt ml10 fl"><%= commit.title %></p>
                  <%= link_to truncate(commit.short_id, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit.id}, :target => "_blank", :class => "fr mr15 c_grey" %>
+                  <% unless get_commit_issues(commit.short_id, @project.id, 0).nil? %>
+                      <% get_commit_issues(commit.short_id, @project.id, 0).each do |issue_id| %>
+                          <div class="btn-commit-issue btn-blue mb5 mr5 fr">
+                            <% if issue_id == "more" %>
+                                <%= link_to "更多", {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit.id}, :target => "_blank", :class => "commit_id_value mr5" %>
+                            <% else %>
+                                <%= link_to "##{issue_id}", issue_path(issue_id), :target => "_blank", :class => "commit_id_value mr5" %>
+                            <% end %>
+                          </div>
+                      <% end %>
+                  <% end %>
+                  <div class="cl"></div>
                </li>
            <% end %>
          </ul>
--- a/app/views/repositories/commit_diff.html.erb
+++ b/app/views/repositories/commit_diff.html.erb
@ -8,12 +8,20 @@
      <div class="c_grey02 mb10">
        <p><%= @commit_details.message %></p>
      </div>
-      <!--<div class=" clear mb10">-->
-        <!--<p class="fb">关联Issue:</p>-->
-        <!--<a href="javascript:void(0);" class="btn-small fl mr10">#123</a>-->
-        <!--<a href="javascript:void(0);" class="btn-small fl mr10">#123</a>-->
-        <!--<a href="javascript:void(0);" class="btn-small fl mr10">#123</a>-->
-      <!--</div>-->
+      <div class=" clear mb10">
+        <p class="fb c_grey">关联Issue:</p>
+        <% unless get_commit_issues(@commit_details.short_id, @project.id, 1).nil? %>
+            <% get_commit_issues(@commit_details.short_id, @project.id, 1).each do |issue_id| %>
+                <div class="btn-commit-issue btn-blue mb5 mr5">
+                  <% if issue_id == "more" %>
+                      <%= link_to "更多", {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => @commit_details.id}, :target => "_blank", :class => "commit_id_value mr5" %>
+                  <% else %>
+                      <%= link_to "##{issue_id}", issue_path(issue_id), :target => "_blank", :class => "commit_id_value mr5" %>
+                  <% end %>
+                </div>
+            <% end %>
+        <% end %>
+      </div>
      <li class="commit js-toggle-container">
        <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
      </li>
--- a/app/views/student_work/_alert_forbidden_anonymous.html.erb
+++ b/app/views/student_work/_alert_forbidden_anonymous.html.erb
@ -1,16 +1,19 @@
-<div id="popbox02">
-  <div class="ni_con">
-    <h2>禁用匿评</h2>
-    <p>
-      禁用匿评后学生将不能对作品进行互评，且匿评不能再开启，是否确定禁用匿评？
-    </p>
-    <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :hw_status => hw_status)%>');" style="margin-bottom: 20px;" >
-        确&nbsp;&nbsp;定
-      </a>
-      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
-        取&nbsp;&nbsp;消
-      </a>
-    </div>
+<div id="muban_popup_box" style="width:400px;">
+  <div class="muban_popup_top">
+    <h3 class="fl">
+      提示
+    </h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
  </div>
-</div>
+  <div class="muban_popup_con ml30 mr30 mt20 mb10 clear" >
+    <p class="mb10 f14 text_c">评分比例将恢复默认值，您可以在评分设置中进行修改</p>
+    <% if @homework.anonymous_comment == 0%>
+        <p class="mb10 f14 text_c">是否确定禁用匿评</p>
+    <% else %>
+        <p class="mb10 f14 text_c">是否确定启用匿评</p>
+    <% end %>
+    <a href="javascript:void(0);" class="fl sy_btn_blue" style="margin-left: 114px;" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :hw_status => hw_status)%>');">确定</a>
+    <a href="javascript:void(0);" class="fl sy_btn_grey ml5" onclick="hideModal();">取消</a>
+  </div>
+</div>
--- a/app/views/student_work/_change_project.html.erb
+++ b/app/views/student_work/_change_project.html.erb
@ -0,0 +1,64 @@
+<div id="muban_popup_box" style="width:400px;">
+  <div class="muban_popup_top">
+    <h3 class="fl">更换项目</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con clear ml30 mr30 mt10">
+    <%= form_for('new_form',:url =>{:controller => 'student_work',:action => 'change_project',:homework => @homework.id},:method => "post", :remote => true) do |f|%>
+        <input type="text" name="project" placeholder="输入项目名称进行搜索" class="searchResourcePopup mb10" />
+        <div class="cl"></div>
+        <p id="no_search_result" class="c_red f14" style="width:320px;display: none">您当前尚未创建任何项目，请先创建项目再关联。</p>
+        <ul id="search_project_list" class="maxHeight200"></ul>
+        <p id="notes" class="c_red"></p>
+        <a href="javascript:void(0);" class="sy_btn_blue fr" onclick="clickOK();">确定</a>
+        <a href="javascript:void(0);" class="sy_btn_grey fr mr5" onclick="clickCanel();">取消</a>
+        <div class="cl"></div>
+    <% end %>
+  </div>
+</div>
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_pros(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_user_projects') %>'+'?name='+ e.target.value,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询项目
+    $("input[name='project']").on('input', function (e) {
+        throttle(search_pros,window,e);
+    });
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_user_projects') %>'+'?first=1',
+            type:'get'
+        });
+    });
+
+    function clickOK() {
+        var radio = $("input[name='projectName']:checked");
+        if(radio.length < 1) {
+            $("#notes").html("请先选择一个项目");
+            return false;
+        } else {
+            $("#muban_popup_box").find('form').submit();
+            hideModal();
+        }
+    }
+</script>
--- a/app/views/student_work/_evaluation_un_group_member_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb
@ -5,16 +5,15 @@
    <div class="syllabus_class_w fontGrey3" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(st)%>')">
      <%= link_to(image_tag(url_to_avatar(st.user),:width =>"40",:height => "40", :style => "display:block;"),user_activities_path(st.user), :class => "fl") %>
      <% if !is_expand %>
-          <span class="fl student_work_<%= st.id%>" style="width:120px;">
-            <span class="fl hidden ml5" style="max-width:75px;"><%= st.user.show_name %></span>
-            <span class="fl">(组长)</span>
+          <span class="fl" style="width:120px;">
+            <%= link_to st.user.show_name + "(组长)", user_path(st.user), :class => "fl hidden ml5 linkGrey", :style => "max-width:75px;" %>
          </span>
          <span class="fl hidden student_work_<%= st.id%>" style="width:105px; text-align: center">
            <%= st.user.user_extensions.student_id.nil? || st.user.user_extensions.student_id == "" ? "--" : st.user.user_extensions.student_id%>
          </span>
      <% else %>
-          <span class="fl student_work_<%= st.id%>" style="width:120px;">
-            <span class="fl hidden ml5" style="max-width:75px;"><%= st.user.show_name %></span>
+          <span class="fl" style="width:120px;">
+            <%= link_to st.user.show_name, user_path(st.user), :class => "fl hidden ml5 linkGrey", :style => "max-width:75px;" %>
          </span>
          <span class="fl student_work_<%= st.id%> hidden" style="width:105px; text-align: center">
            <%= st.user.user_extensions.student_id.nil? || st.user.user_extensions.student_id == "" ? "--" : st.user.user_extensions.student_id%>
@ -23,27 +22,25 @@
      <div class="flex-container fl" style="width:340px;">
        <div class="flex-cell student_work_<%= st.id%>">
          <span class="<%= score_color (!score_open || st.teacher_score.nil? ? nil : st.teacher_score) %>">
-            <%= !score_open || st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%>
+            <%= st.teacher_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",st.teacher_score))%>
          </span>
        </div>
        <div class="flex-cell student_work_<%= st.id%>">
          <span class="<%= score_color (!score_open || st.teaching_asistant_score.nil? ? nil : st.teaching_asistant_score) %>">
-            <%= !score_open || st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%>
+            <%= st.teaching_asistant_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",st.teaching_asistant_score))%>
          </span>
        </div>
        <% if @homework.anonymous_comment == 0 %>
            <div class="flex-cell student_work_<%= st.id%>">
              <div class="<%= score_color (!score_open || st.student_score.nil? ? nil : st.student_score)%> student_score_info pr">
-                <% if !score_open || st.student_score.nil? %>
+                <% if st.student_score.nil? %>
                    <% pro = @homework.student_work_projects.where("user_id = #{st.user_id}").first
                       if pro.nil? || pro.student_work_id == "" || pro.student_work_id.nil?
                         work = st
                       else
                         work = StudentWork.find pro.student_work_id
-                       end %>
-                    <% if !score_open %>
-                        <span title="">--</span>
-                    <% elsif @homework.homework_detail_manual.comment_status < 2 %>
+                       end %>                    
+                    <% if @homework.homework_detail_manual.comment_status < 2 %>
                        <span title="尚未开启匿评">未参与</span>
                    <% elsif @homework.homework_detail_manual.comment_status == 2 && work.student_works_evaluation_distributions.count != 0 %>
                        <span title="匿评期间，尚未获得他人匿评">待匿评</span>
@ -53,16 +50,20 @@
                        <span title="匿评开启后提交的作品，不参加匿评">迟交</span>
                    <% end %>
                <% else %>
-                    <%= format("%.1f", st.student_score) %>
-                    <span class="linkBlue">
-                      (<%= anon_count %>)
-                    </span>
-                    <div class="g_infoNi none">
-                      现共有
-                      <span class="c_red">&nbsp;<%= anon_count %>&nbsp;</span>
-                      名学生进行了匿评，平均分为
-                      <span class="c_red">&nbsp;<%= format("%.1f", st.student_score) %>&nbsp;</span>分。
-                    </div>
+					<% if !score_open %>
+                        <span title="">**</span>
+					<% else %>
+						<%= format("%.1f", st.student_score) %>
+						<span class="linkBlue">
+						  (<%= anon_count %>)
+						</span>
+						<div class="g_infoNi none">
+						  现共有
+						  <span class="c_red">&nbsp;<%= anon_count %>&nbsp;</span>
+						  名学生进行了匿评，平均分为
+						  <span class="c_red">&nbsp;<%= format("%.1f", st.student_score) %>&nbsp;</span>分。
+						</div>
+					<% end %>
                <% end %>
              </div>
            </div>
@ -70,7 +71,7 @@
        <div class="flex-cell">
          <% score = st.work_score %>
          <div class="<%= score_color (!score_open || score.nil? ? nil : score)%> student_final_scor_info pr" style="display: inline">
-            <%= !score_open || score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
+            <%= score.nil? ? "--" : (!score_open ? "**" : format("%.1f",score<0 ? 0 : score))%>
            <% unless !score_open || score.nil?%>
                <div class="score-tip none tl" style="line-height: 18px; top:-32px; right:-273px;">
                  <em></em>
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@ -13,15 +13,15 @@
    <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
  </td>
  <% if @homework.homework_type != 3 %>
-        <td class="<%= @homework.homework_type == 1 ? (@homework.anonymous_comment == 1 ? 'hworkStName130' : 'hworkStName100') : (@homework.anonymous_comment == 1 ? 'hworkStName110' : 'hworkStName') %> pr10 float-none student_work_<%= student_work.id%>" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
-          <%= student_work.user.show_name%>
+        <td class="<%= @homework.homework_type == 1 ? (@homework.anonymous_comment == 1 ? 'hworkStName130' : 'hworkStName100') : (@homework.anonymous_comment == 1 ? 'hworkStName110' : 'hworkStName') %> pr10 float-none" title="<%= student_work.user.show_name%>" style="cursor:pointer;">
+          <%= link_to student_work.user.show_name ,user_path(student_work.user) %>
        </td>
        <td class="<%= @homework.homework_type == 1 ? (@homework.anonymous_comment == 1 ? 'hworkStName130' : 'hworkStID90') : (@homework.anonymous_comment == 1 ? 'hworkStID100' : 'hworkStID') %> pr10 float-none student_work_<%= student_work.id%>" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
          <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
        </td>
  <% else %>
      <% if @homework.homework_detail_group.base_on_project == 1 %>
-          <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width130" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+          <td class="hworkName float-none pr10 width130" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
            <div>
              <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "StudentName break_word"%>
            </div>
@ -40,7 +40,7 @@
              </td>
          <% end %>
      <% elsif @homework.homework_detail_group.base_on_project == 0 %>
-          <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%=@homework.anonymous_comment == 1 ? 'width280' : 'width210' %>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+          <td class="hworkName float-none pr10 <%=@homework.anonymous_comment == 1 ? 'width280' : 'width210' %>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
            <div>
              <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
            </div>
@ -53,25 +53,23 @@
    <% end %>
  </td>
  <td class="hworkList70 <%= score_color (!score_open || student_work.teacher_score.nil? ? nil : student_work.teacher_score)%>">
-    <%= !score_open || student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
+    <%= student_work.teacher_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",student_work.teacher_score))%>
  </td>
  <td class="hworkList70 <%= score_color (!score_open || student_work.teaching_asistant_score.nil? ? nil : student_work.teaching_asistant_score)%>">
-    <%= !score_open || student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
+    <%= student_work.teaching_asistant_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",student_work.teaching_asistant_score)) %>
  </td>

  <% if @homework.homework_type == 2%>
      <!-- 系统评分 -->
      <td class="hworkList70 <%= score_color (!score_open || student_work.system_score.nil? ? nil : student_work.system_score)%>">
-        <%= !score_open || student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
+        <%= student_work.system_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",student_work.system_score))%>
      </td>
  <% end%>

  <% if @homework.anonymous_comment == 0%>
    <td class="hworkList70 <%= score_color (!score_open || student_work.student_score.nil? ? nil : student_work.student_score)%> student_score_info pr">
-      <% if !score_open || student_work.student_score.nil? %>
-          <% if !score_open %>
-              <span title="">--</span>
-          <% elsif student_work.work_status != 0 %>
+      <% if student_work.student_score.nil? %>          
+          <% if student_work.work_status != 0 %>
              <% if @homework.homework_detail_manual.comment_status < 2 %>
                  <span title="尚未开启匿评">未参与</span>
              <% elsif @homework.homework_detail_manual.comment_status >= 2 && student_work.student_works_evaluation_distributions.count == 0 %>
@ -85,18 +83,22 @@
              <span title="">--</span>
          <% end %>
      <% else %>
-        <%=format("%.1f",student_work.student_score) %>
-        <span class="linkBlue">
-          (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>)
-        </span>
-        <div class="anonymous-tip none">
-          <em></em>
-          <font></font>
-          现共有
-          <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>&nbsp;</span>
-          名学生进行了匿评，平均分为
-          <span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
-        </div>
+		<% if !score_open %>
+              <span title="">**</span>
+		<% else %>
+			<%=format("%.1f",student_work.student_score) %>
+			<span class="linkBlue">
+			  (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>)
+			</span>
+			<div class="anonymous-tip none">
+			  <em></em>
+			  <font></font>
+			  现共有
+			  <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>&nbsp;</span>
+			  名学生进行了匿评，平均分为
+			  <span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
+			</div>
+		<% end %>
      <% end %>
  </td>
  <% end %>
@ -107,7 +109,7 @@
    <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
  <% end %>
  <td class="hworkList70 <%= score_color (!score_open || score.nil? ? nil : score)%> student_final_scor_info pr">
-    <%= !score_open || score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
+    <%= score.nil? ? "--" : (!score_open ? "**" : format("%.1f",score<0 ? 0 : score))%>
    <% unless !score_open || score.nil?%>
        <div class="score-tip none tl" style="line-height: 18px;">
          <em></em>
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@ -81,7 +81,7 @@
  <% if @homework.homework_type == 2%>
      <!-- 系统评分 -->
      <td class="hworkList70 <%= score_color (!score_open || student_work.system_score.nil? ? nil : student_work.system_score)%>">
-        <%= !score_open || student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
+        <%= student_work.system_score.nil? ? "--" : (!score_open ? "**" : format("%.1f",student_work.system_score))%>
      </td>
  <% end%>

--- a/app/views/student_work/_homework_post_brief.html.erb
+++ b/app/views/student_work/_homework_post_brief.html.erb
@ -4,8 +4,6 @@
 <div class="homepagePostDes">
 <div class="homepagePostTo break_word mt-4">
  <%= link_to homework.user.show_name, user_activities_path(homework.user_id), :class => "newsBlue mr15"%>
-  TO
-  <%= link_to homework.course.name, course_path(homework.course_id), :class => "newsBlue"%>
 </div>
 <div class="homepagePostTitle hidden fl m_w505">
  <% index = get_hw_index(homework, is_teacher) %>
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@ -121,13 +121,8 @@
        <% end %>
    });
    function show_upload(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
-        showModal('ajax-modal', '452px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","40%").css("left","46%");
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+        var htmlvalue = "<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>";
+        pop_box_new(htmlvalue, 500, 230);
    }
    function regex_des() {
        if ($.trim($("#attachment_des").val()) == "") {
--- a/app/views/student_work/_relate_project.html.erb
+++ b/app/views/student_work/_relate_project.html.erb
@ -1,16 +1,21 @@
-<div id="popbox02" style="">
-  <span class="f16 fontBlue">关联项目</span>
-  <a href="javascript:void(0);" class="popClose" onclick="clickCanel();"></a>
-  <%=form_tag url_for(:controller=>'student_work',:action=>'student_work_project',:homework=>@homework.id,:user_activity_id=>@user_activity_id,:hw_status =>@hw_status),:id =>'student_work_relate_project',:class=>'resourcesSearchBox',:remote => true do %>
-      <input type="text" name="project" placeholder="输入项目名称进行搜索" class="searchResourcePopup mb10" />
-      <div class="cl"></div>
-      <p id="no_search_result" class="c_red" style="width:220px;display: none">您当前尚未创建任何项目，请先创建项目再关联。</p>
-      <ul id="search_project_list" class="maxHeight100"></ul>
-      <p id="notes" class="c_red"></p>
-      <div class="courseSendSubmit mt10"><a href="javascript:void(0);" class="sendSourceText" onclick="clickOK();">确定</a></div>
-      <div class="courseSendCancel mt10"><a href="javascript:void(0);" class="sendSourceText" onclick="clickCanel();">取消</a></div>
-      <div class="cl"></div>
-  <% end %>
+<div id="muban_popup_box" style="width:400px;">
+  <div class="muban_popup_top">
+    <h3 class="fl">关联项目</h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con clear ml30 mr30 mt10">
+    <%= form_for('new_form',:url =>{:controller => 'student_work',:action => 'student_work_project',:homework => @homework.id,:user_activity_id=>@user_activity_id,:hw_status =>@hw_status},:method => "post", :remote => true) do |f|%>
+        <input type="text" name="project" placeholder="输入项目名称进行搜索" class="searchResourcePopup mb10" />
+        <div class="cl"></div>
+        <p id="no_search_result" class="c_red f14" style="width:320px;display: none">您当前尚未创建任何项目，请先创建项目再关联。</p>
+        <ul id="search_project_list" class="maxHeight200"></ul>
+        <p id="notes" class="c_red"></p>
+        <a href="javascript:void(0);" class="sy_btn_blue fr" onclick="clickOK();">确定</a>
+        <a href="javascript:void(0);" class="sy_btn_grey fr mr5" onclick="clickCanel();">取消</a>
+        <div class="cl"></div>
+    <% end %>
+  </div>
 </div>
 <script type="text/javascript">
    var lastSearchCondition = '';
@ -52,7 +57,7 @@
            $("#notes").html("请先选择一个项目");
            return false;
        } else {
-            $("#student_work_relate_project").submit();
+            $("#muban_popup_box").find('form').submit();
        }
    }
 </script>
--- a/app/views/student_work/_relate_projects.html.erb
+++ b/app/views/student_work/_relate_projects.html.erb
@ -3,18 +3,22 @@
      <% allow_visit = project.status != 9 && (project.is_public || User.current.member_of?(project) || User.current.admin? || User.current.allowed_to?(:as_teacher, @homework.course)) %>
      <div class="syllabus_courses_list" style="cursor: default">
        <div class="sy_courses_open">
+          <% projectUser = User.where("id=?",project.user_id).first %>
+          <% is_change = project.status == 9 && projectUser == User.current && @homework.student_works.has_committed.where("user_id = #{User.current.id}").count == 1 %>
          <h3>
            <% if allow_visit %>
                <%= link_to "#{project.name}", project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "new_project_title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
            <% elsif project.status != 9 %>
                <a href="javascript:void(0)" class="new_project_title fl" title="私有项目不可访问"><%=project.name %></a>
            <% else %>
-                <a href="javascript:void(0)" class="new_project_title fl" title="项目已删除"><%=project.name %></a>
+                <a href="javascript:void(0)" onclick="alert_notice_box();" class="new_project_title fl <%= is_change ? 'mw380' : '' %>" title="项目已删除"><%=project.name %></a>
            <% end %>
          </h3>
          <span class="<%= project.is_public? ? 'syllabus_class_open' : 'syllabus_class_private' %> fl ml10 mt3 syllabus_class_property"><%= project.is_public?  ? '公开' : '私有' %></span>
-          <% projectUser = User.where("id=?",project.user_id).first %>
-          <%=link_to "<span class='fr grayTxt'>创建者：#{projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)}</span>".html_safe, user_path(projectUser) %>
+          <% if is_change %>
+            <a href="javascript:void(0)" onclick="alert_change_project();" class="btn_grey_mid mt-5 ml10 fr">更换项目</a>
+          <% end %>
+          <%=link_to "<span class='fr grayTxt hidden mw150'>创建者：#{projectUser.show_name}</span>".html_safe, user_path(projectUser), :title => "#{projectUser.show_name}" %>
          <div class="cl"></div>
        </div>
        <div>
@ -30,4 +34,16 @@
        <div class="cl"></div>
      </div>
  <% end %>
-</div><!--syllabus_courses_box end-->
+</div><!--syllabus_courses_box end-->
+<script>
+  function alert_notice_box(){
+      var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
+              '<div class="clear mt15"><p class="text_c f14">项目已删除，链接无效</p><div class="cl"></div>'+
+              '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 119px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+      pop_box_new(htmlvalue, 300, 140);
+  }
+  function alert_change_project(){
+      var htmlvalue = "<%= escape_javascript(render :partial => 'student_work/change_project') %>";
+      pop_box_new(htmlvalue, 400, 285);
+  }
+</script>
--- a/app/views/student_work/_revise_attachment.html.erb
+++ b/app/views/student_work/_revise_attachment.html.erb
@ -1,31 +1,33 @@
 <% revise_attachment = work.attachments.where("attachtype = 7").first %>
 <% if @homework.end_time < Date.today %>
-    <% if revise_attachment && @is_teacher %>
+    <% if revise_attachment && work.user != User.current %>
        <div class="resubAtt mb15">
-          <span class="resubTitle">追加修订附件</span>
+          <span class="resubTitle">作业修订附件</span>
        </div>
        <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
          <span class="tit_fb"> 追加附件：</span>
          <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 2} %>
-          <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)<br />
          <% unless revise_attachment.description == "" %>
            <span class="tit_fb break_word">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
          <% end %>
        </div>
        <div class="cl"></div>
+        <div class="_notice_box ml5 text_c">注意：此处的附件是在作业截止日期过后提交的</div>
+        <div class="cl"></div>
    <% end %>
    <% if work.user == User.current && !User.current.allowed_to?(:as_teacher, @homework.course) %>
        <div class="resubAtt mb15">
-          <span class="resubTitle">追加修订附件</span>
+          <span class="resubTitle">作业修订附件</span>
        </div>
        <% if revise_attachment %>
            <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
              <span class="tit_fb"> 追加附件：</span>
              <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 1} %>
-              <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %><br />
              <% unless revise_attachment.description == "" %>
                  <span class="tit_fb break_word">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
              <% end %>
+              <div class="cl"></div>
+              <div class="_notice_box ml5 text_c">注意：此处的附件是在作业截止日期过后提交的</div>
            </div>
        <% end %>
        <div class="cl"></div>
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@ -125,13 +125,8 @@
        <% end %>
    });
    function show_upload(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
-        showModal('ajax-modal', '452px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","40%").css("left","46%");
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+        var htmlvalue = "<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>";
+        pop_box_new(htmlvalue, 500, 230);
    }
    function regex_des() {
        if ($.trim($("#attachment_des").val()) == "") {
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@ -17,7 +17,7 @@
            <%=link_to "提交作品",  new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
        <% end %>
    <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
-       <span class="f12 c_red">已提交且不可再修改，因为截止日期已过</span>
+       <span class="f12 c_red">截止日期已过，已提交且不可修改</span>
    <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
        <% if @homework.homework_type == 3 %>
            <span class="f12 c_red">组长已提交，组长还可修改</span>
--- a/app/views/student_work/_student_work_score.html.erb
+++ b/app/views/student_work/_student_work_score.html.erb
@ -1,7 +1,7 @@
 <ul class="ping_box_ul <%= is_last ? '' : 'ping_line'%> fl">
  <% show_real_name = @is_teacher || score.user == User.current || score.reviewer_role != 3 %>
  <%= link_to image_tag(url_to_avatar(show_real_name ? score.user : ""), :width => "34", :height => "34"), show_real_name ? user_path(score.user) : "javascript:void(0)",:class => "ping_pic fl" %>
-  <% show_real_score = @homework.score_open == 1 || @is_teacher || score.student_work.user == User.current %>
+  <% show_real_score = @homework.score_open == 1 || @is_teacher || score.student_work.user == User.current || score.user == User.current %>
  <div class="pingBoxTit">
    <%= link_to show_real_name ? score.user.show_name : "匿名", show_real_name ? user_path(score.user) : "javascript:void(0)", :title => show_real_name ? score.user.show_name : "匿评用户", :class => "linkBlue fl" %>
    <span class="ml5 fl">
@ -34,7 +34,7 @@

    <div id="replay_histroy_<%= score.id%>">
      <% score.journals_for_messages.order("created_on desc").each do |jour|%>
-          <% show_real_name = @is_teacher || score.reviewer_role != 3 %>
+          <% show_real_name = @is_teacher || score.reviewer_role != 3 || @homework.homework_detail_manual.comment_status != 2 %>
          <%= render :partial => 'jour_replay',:locals => {:jour => jour, :show_real_name => show_real_name || jour.user == User.current}%>
      <% end%>
    </div>
--- a/app/views/student_work/_upload_attachment.html.erb
+++ b/app/views/student_work/_upload_attachment.html.erb
@ -1,7 +1,12 @@
-<!--<div class="resourceUploadPopup">-->
-<span class="uploadDialogText">上传附件</span>
-<!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-<div class="uploadBoxContainer">
+<div id="muban_popup_box" style="width:500px;">
+  <div class="muban_popup_top">
+    <h3 class="fl">
+      上传附件
+    </h3>
+    <a href="javascript:void(0);" class="muban_icons_close fr"></a>
+    <div class="cl"></div>
+  </div>
+  <div class="muban_popup_con ml50 mt20 mb10 uploadBoxContainer">
  <%= form_tag(revise_attachment_student_work_path(work.id), :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
      <div>
        <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
@ -43,15 +48,11 @@
      <div class="cl"></div>
      <p id="hint_message"></p>
      <div class="cl"></div>
-      <div style="margin-top: 10px" >
-        <div class="courseSendSubmit">
-          <a href="javascript:void(0);" id="upload_files_submit_btn" class="sendSourceText" onclick="submit_revise_files();">确定</a>
-          <%#= submit_tag '确定',:onclick=>'submit_revise_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
-        </div>
-        <div class="courseSendCancel">
-          <a href="javascript:void(0);" id="upload_files_cancle_btn" class="sendSourceText" onclick="closeModal();">取消</a>
-        </div>
+      <div style="margin-top: 10px">
+        <a href="javascript:void(0);" id="upload_files_cancle_btn" class="fl sy_btn_grey mr10" onclick="closeModal();">取消</a>
+        <a href="javascript:void(0);" id="upload_files_submit_btn" class="fl sy_btn_blue" onclick="submit_revise_files();">确定</a>
      </div>
  <% end %>
 </div>
  <div class="cl"></div>
+</div>
--- a/app/views/student_work/_work_attachments_status.html.erb
+++ b/app/views/student_work/_work_attachments_status.html.erb
@ -5,7 +5,9 @@
            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw360', :download => true -%>
          </span>
      </span>
-      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author && status != 2 %>
+      <% if attachment.id && User.current == attachment.author && (attachment.attachtype == 7 || @homework.end_time >= Date.today) %>
+        <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) %>
+      <% end %>
      <span class="postAttSize">(<%= number_to_human_size attachment.filesize %>)</span>
      <span class="author">
        <%= format_time(attachment.created_on) %>
--- a/app/views/student_work/change_project.js.erb
+++ b/app/views/student_work/change_project.js.erb
@ -0,0 +1,17 @@
+<% if @remain_user_ids %>
+<% str = "" %>
+<% @remain_user_ids.each do |user_id| %>
+    <% user = User.find user_id %>
+    <% if str == "" %>
+        <% str += user.show_name.to_s + "(" + user.login.to_s + ")" %>
+    <% else %>
+        <% str += "、" + user.show_name.to_s + "(" + user.login.to_s + ")" %>
+    <% end %>
+<% end %>
+var htmlvalue = '<div id="muban_popup_box" style="width:350px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
+        '<div class="clear mt15"><p class="text_c f14">以下组员还不是项目成员，请先前往项目添加成员</p><p class="text_c f14"><%=str %></p><div class="cl"></div>'+
+        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 144px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
+pop_box_new(htmlvalue, 350, 140);
+<% else %>
+    window.location.href = "<%=student_work_index_url(:homework => @homework.id, :tab => 3) %>";
+<% end %>
--- a/app/views/student_work/forbidden_anonymous_comment.js.erb
+++ b/app/views/student_work/forbidden_anonymous_comment.js.erb
@ -3,4 +3,12 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(r
 sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
 <% else %>
 sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
+<% end %>
+<% if @homework.anonymous_comment == 0 %>
+    var htmlvalue = '<div id="muban_popup_box" style="width:400px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
+        '<div class="muban_popup_con ml30 mr30 mt20 mb10 clear"><p class="mb10 f14 text_c">将于7天后自动启动该作业的匿评</p><p class="mb10 f14 text_c">您可以在匿评设置中进行修改</p>' +
+        '<a href="javascript:void(0);" class="btn btn-blue mt10" style="margin-left: 142px;" onclick="hideModal();">知道啦</a></div></div>';
+    pop_box_new(htmlvalue, 400, 178);
+<% else %>
+    hideModal();
 <% end %>
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@ -186,8 +186,10 @@

    <% if @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
        <div class="undis" id="student_work_con3">
-          <% project_ids = @homework.student_work_projects.blank? ? "(-1)" : "(" + @homework.student_work_projects.map{|pro| pro.project_id}.join(",") + ")" %>
-          <% projects = Project.where("id in #{project_ids}") %>
+          <% student_work_ids = @homework.student_works.has_committed.blank? ? "(-1)" : "(" + @homework.student_works.has_committed.map{|st| st.id}.join(",") + ")" %>
+          <% student_work_projects = @homework.student_work_projects.where("student_work_id in #{student_work_ids} or student_work_id is null") %>
+          <% project_ids = student_work_projects.blank? ? "(-1)" : "(" + student_work_projects.map{|pro| pro.project_id}.join(",") + ")" %>
+          <% projects = Project.where("id in #{project_ids}").order("updated_on desc") %>
          <%= render :partial => "student_work/relate_projects", :locals => {:projects => projects}%>
        </div>
    <% end %>
--- a/app/views/student_work/new_student_work_project.js.erb
+++ b/app/views/student_work/new_student_work_project.js.erb
@ -1,5 +1,2 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/relate_project') %>');
-showModal('ajax-modal', '320px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').parent().css("top","").css("left","");
-$('#ajax-modal').parent().addClass("groupPopUp");
+var htmlvalue = "<%= escape_javascript(render :partial => 'student_work/relate_project') %>";
+pop_box_new(htmlvalue, 400, 285);
--- a/app/views/student_work/search_user_projects.js.erb
+++ b/app/views/student_work/search_user_projects.js.erb
@ -3,7 +3,7 @@
 <% else %>
    $("#search_project_list").html("");
    <% @project_ids.each do |project|%>
-    link = "<li><label><input type='radio' class='courseSendCheckbox' name='projectName' value='<%=project.id%>'/><span class='sendCourseName'> <%=project.name %> </span></label></li>";
-    $("#search_project_list").append(link );
+    link = "<li><input type='radio' class='courseSendCheckbox fl' name='projectName' value='<%=project.id%>'/><a href='<%=project_path(project) %>' target='_blank' class='hidden fl' style='padding-top: 8px; max-width: 300px;'> <%=project.name %> </a><div class='cl'></div></li>";
+    $("#search_project_list").append(link);
    <% end %>
 <% end %>
--- a/app/views/users/_applied_project_content.html.erb
+++ b/app/views/users/_applied_project_content.html.erb
@ -1,15 +1,16 @@
-<li class="homepageNewsPortrait fl">
-  <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %></a>
-</li>
-<li class="homepageNewsPubType fl">
-  <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
-</li>
-<li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
-  以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %>
-  <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
-</a>
-</li>
-<li class="fl" style="width:71px; height:49px;">
+<div class="shortMessageWidth">
+  <li class="homepageNewsPortrait fl">
+    <%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %>
+  </li>
+  <li class="homepageNewsPubType fl">
+    <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
+  </li>
+  <li class="messageInformationContents">
+    <% project = Project.find(ma.project_id) %>
+    <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
+  </li>
+</div>
+<li class="messageOperateContents fl">
  <span><%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %></span>
 </li>
-<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
--- a/app/views/users/_apply_homework_course_message.html.erb
+++ b/app/views/users/_apply_homework_course_message.html.erb
@ -1,27 +1,35 @@
-<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)), :target => '_blank' %></div></a></li>
-<li class="homepageNewsPubType fl">
-  <%= link_to User.find(ma.apply_user_id).show_name,
-              user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">申请引用作业：</span>
-</li>
-<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
-  <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
-  <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
-  <!--:onmouseover => "message_titile_show($(this),event)",-->
-  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-</li>
-
-<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
-            <span id="deal_info_<%=ma.id%>">
-              <% if ma.apply_result == 0 || ma.apply_result.nil?%>
-                <%= link_to '同意',dealwith_apply_homework_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
+<div class="shortMessageWidth">
+  <li class="homepageNewsPortrait fl">
+    <div class="navHomepageLogo fl">
+      <%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)), :target => '_blank' %>
+    </div>
+  </li>
+  <li class="homepageNewsPubType fl">
+    <%= link_to User.find(ma.apply_user_id).show_name, user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+    <span class="homepageNewsType fl">申请引用作业：</span>
+  </li>
+  <li class="messageInformationContents">
+    <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
+    <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",
+                student_work_index_path(:homework => ma.course_message.id),
+                :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",
+                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}",
+                :target => '_blank' %>
+    <!--:onmouseover => "message_titile_show($(this),event)",-->
+    <!--:onmouseout => "message_titile_hide($(this))" %>-->
+  </li>
+</div>
+<li class="messageApplyContents fl">
+            <span id="deal_info_<%= ma.id %>">
+              <% if ma.apply_result == 0 || ma.apply_result.nil? %>
+                <%= link_to '同意', dealwith_apply_homework_user_path(User.current, :agree=>'Y', :msg_id=>ma.id), :remote=>'true'%>
                  |
-                  <%= link_to '拒绝',dealwith_apply_homework_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
-             <% elsif ma.apply_result == 1%> <!-- 同意 -->
-                 您已经同意了该申请
-             <% elsif ma.apply_result == 2%> <!-- 拒绝 -->
-                 您已经拒绝了该申请
-             <%end %>
+                  <%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree=>'N', :msg_id=>ma.id), :remote=>'true'%>
+             <% elsif ma.apply_result == 1 %> <!-- 同意 -->
+                 您已同意申请
+             <% elsif ma.apply_result == 2 %> <!-- 拒绝 -->
+                 您已拒绝申请
+             <% end %>
             </span>
 </li>
-<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@ -1,3 +1,4 @@
+<div class="shortMessageWidth">
 <li class="homepageNewsPortrait fl">
  <div class="navHomepageLogo fl">
    <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
@ -5,9 +6,9 @@
 </li>
 <li class="homepageNewsPubType fl">
  <%= link_to ma.course_message.user.show_name, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">申请引用资源：</span>
+  <span class="homepageNewsType fl">申请引用资源：</span>
 </li>
-<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
+<li class="messageInformationContents">
  <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
  <% show_content = ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
  <% if ma.course_message.container_type == "Course" %>
@ -22,17 +23,17 @@
      </a>
  <% end %>
 </li>
-
-<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
+</div>
+<li class="messageApplyContents fl">
   <span id="deal_info_<%= ma.id %>">
     <% if ma.apply_result == 0 || ma.apply_result.nil? %>
         <%= link_to '同意', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> |
         <%= link_to '拒绝', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %>
     <% elsif ma.apply_result == 1 %>
-         您已经同意了该申请
+         您已同意申请
     <% elsif ma.apply_result == 2 %>
-         您已经拒绝了该申请
+         您已拒绝申请
     <%end %>
   </span>
 </li>
-<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
--- a/app/views/users/_apply_resource_course_message_reply.html.erb
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@ -1,4 +1,4 @@
-<ul class="homepageNewsList fl">
+<div class="longMessageWidth">
  <li class="homepageNewsPortrait fl">
    <% owner = User.find(ma.course_message.apply_user_id) %>
    <div class="navHomepageLogo fl">
@ -7,9 +7,9 @@
  </li>
  <li class="homepageNewsPubType fl">
    <%= link_to owner.show_name, user_path(owner), :class => "newsBlue homepageNewsPublisher" %>
-    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：</span>
+    <span class="homepageNewsType fl"><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：</span>
  </li>
-  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+  <li class="messageInformationContents">
    <% link_str = ma.apply_result == 2 ?
            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
    :
@ -25,10 +25,7 @@
          <%= link_str %>
        </a>
    <% end %>
-
-
    <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
-  </a>
  </li>
-  <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-</ul>
+</div>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
--- a/app/views/users/_course_attachment.html.erb
+++ b/app/views/users/_course_attachment.html.erb
@ -12,7 +12,7 @@
            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
        <% end %>
        TO
-        <%= link_to activity.course.name.to_s+" | 班级资源", course_files_path(activity.course), :class => "newsBlue" %>
+        <%= link_to "班级资源", course_files_path(activity.course), :class => "newsBlue ml15" %>
      </div>
      <div class="homepagePostTitle break_word" >
        <%= link_to activity.filename, course_files_path(activity.course), :class => "postGrey" %>
--- a/app/views/users/_course_create.html.erb
+++ b/app/views/users/_course_create.html.erb
@ -12,7 +12,8 @@
            <%= link_to activity.try(:teacher).try(:realname), user_path(activity.teacher), :class => "newsBlue mr15" %>
        <% end %>
        TO
-        <%= link_to activity.name.to_s+" | 班级", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue" %>
+        <% str = defined?(is_course) && is_course == 1 ? "班级" : "#{activity.name.to_s} | 班级" %>
+        <%= link_to str, course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
      </div>
      <div class="homepagePostTitle break_word" >
        <%= link_to activity.name, course_path(activity.id,:host=>Setting.host_course), :class => "postGrey" %>
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@ -9,10 +9,10 @@
      <div class="homepagePostTo break_word">
        <%= link_to activity.user.show_name, user_path(activity.user,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         TO <!--+"(课程名称)" -->
-        <% if hw_status == 3 || hw_status == 5 %>
-            <%= link_to activity.course.name, course_path(activity.course_id), :class => "newsBlue"%>
+        <% if hw_status == 3 || hw_status == 2 %>
+            <%= link_to "班级作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
        <% else %>
-            <%= link_to activity.course.name.to_s+" | 班级作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue"%>
+            <%= link_to activity.course.name.to_s+" | 班级作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
        <% end %>
      </div>
      <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@ -9,7 +9,8 @@
        <%= link_to activity.user.show_name, user_path(activity.user), :class => "newsBlue mr15" %>
         TO
        <% course=Course.find(activity.jour_id) %>
-        <%= link_to course.name.to_s+" | 班级留言", course_feedback_path(course), :class => "newsBlue" %>
+        <% str = defined?(is_course) && is_course == 1 ? "班级留言" : "#{course.name.to_s} | 班级留言" %>
+        <%= link_to str, course_feedback_path(course), :class => "newsBlue ml15" %>
      </div>
      <!--<div class="homepagePostTitle break_word list_style upload_img">
        <%# if activity.parent %>
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@ -8,7 +8,8 @@
      <div class="homepagePostTo break_word">
        <%= link_to activity.author.show_name, user_path(activity.author, :host=>Setting.host_user), :class => "newsBlue mr15" %>
        TO
-        <%= link_to activity.course.name.to_s+" | #{activity.board.parent.nil? ? '班级讨论区' : activity.board.name}", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue mr5"%>
+        <% str = is_course == 1 ? "#{activity.board.parent.nil? ? '班级讨论区' : activity.board.name}" : activity.course.name.to_s+" | #{activity.board.parent.nil? ? '班级讨论区' : activity.board.name}" %>
+        <%= link_to str, course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15"%>
      </div>
      <div class="homepagePostTitle hidden m_w530 fl">
        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@ -8,7 +8,8 @@
      <div class="homepagePostTo break_word">
         <%= link_to activity.author.show_name, user_path(activity.author), :class => "newsBlue mr15" %>
         TO  <!--+"(课程名称)"-->
-        <%= link_to activity.course.name.to_s+" | 班级通知", course_news_index_path(activity.course), :class => "newsBlue" %>
+        <% str = defined?(is_course) && is_course == 1 ? "班级通知" : "#{activity.course.name.to_s} | 班级通知" %>
+        <%= link_to str, course_news_index_path(activity.course), :class => "newsBlue ml15" %>
      </div>
      <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
        <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@ -17,7 +17,8 @@
        <% end %>
        TO
        <% course = Course.find(activity.polls_group_id) %>
-        <%= link_to course.name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue" %>
+        <% str = defined?(is_course) && is_course == 1 ? "班级问卷" : "#{course.name.to_s} | 班级问卷" %>
+        <%= link_to str, poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %>
        <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
      </div>
      <div class="homepagePostTitle break_word" >
--- a/app/views/users/_homework_base_info.html.erb
+++ b/app/views/users/_homework_base_info.html.erb
@ -111,6 +111,11 @@
                  <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink",
                              :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
                </li>
+            <% elsif activity.anonymous_comment == 1 %>
+                <li>
+                  <%= link_to("启用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink",
+                              :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
+                </li>
            <% end %>
            <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
                <li>
--- a/app/views/users/_join_course_course_message.html.erb
+++ b/app/views/users/_join_course_course_message.html.erb
@ -1,38 +1,49 @@
-<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
-<li class="homepageNewsPubType fl">
-  <span class="newsBlue homepageNewsPublisher">系统提示</span>
-  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的班级成员申请：</span>
-</li>
-<li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
-  <a href="javascript:void(0);" class="newsGrey">
+<div class="shortMessageWidth">
+  <% message_user = User.find(ma.course_message_id) %>
+  <li class="homepageNewsPortrait fl">
+    <div class="navHomepageLogo fl">
+      <%= link_to image_tag(url_to_avatar(message_user), :width => "30", :height => "30"), user_path(message_user), :target => '_blank' %>
+    </div>
+  </li>
+  <li class="homepageNewsPubType fl">
+  <span class="newsBlue homepageNewsPublisher">
+     <%=link_to message_user.show_name, user_path(ma.course_message_id),
+                :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+  </span>
+  <span class="homepageNewsType fl">
+    申请以<%= ma.content && ma.content.include?('9') ? "“教师”" : "“助教”" %>的身份加入班级：
+  </span>
+  </li>
+  <li class="messageInformationContents">
    <% content = User.find(ma.course_message_id).name+"申请成为班级\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "助教"}" %>
-    <%= link_to content, user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
+    <%= link_to Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
                :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank', :title => "#{content}" %>
    <!--:onmouseover => "message_titile_show($(this),event)",-->
    <!--:onmouseout => "message_titile_hide($(this))" %>-->
-  </a>
-</li>
-<div style="display: none" class="message_title_red system_message_style">
-  <p>
-    <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的班级成员申请，信息如下：
-  </p>
-  <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
-  <p>申请班级：<%= Course.find(ma.course_id).name%></p>
-  <div class="fl">班级描述：</div>
-  <div class="ml60"><%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %></div>
-  <p>申请职位：<%=ma.content && ma.content.include?('9')  ? "教师" : "助教"%></p>
+  </li>
+  <div style="display: none" class="message_title_red system_message_style">
+    <p>
+      <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的班级成员申请，信息如下：
+    </p>
+    <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
+    <p>申请班级：<%= Course.find(ma.course_id).name%></p>
+    <div class="fl">班级描述：</div>
+    <div class="ml60"><%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %></div>
+    <p>申请职位：<%=ma.content && ma.content.include?('9')  ? "教师" : "助教"%></p>
+  </div>
 </div>
-<li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
+<li class="messageOperateContents fl">
            <span id="deal_info_<%=ma.id%>">
              <% if ma.status == 0 || ma.status.nil?%>
                <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
                  |
                  <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
             <% elsif ma.status == 1%> <!-- 同意 -->
-                 您已经同意了该申请
+                 您已同意申请
             <% elsif ma.status == 2%> <!-- 拒绝 -->
-                 您已经拒绝了该申请
+                 您已拒绝申请
             <%end %>
             </span>
 </li>
-<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+
--- a/app/views/users/_message_contents.html.erb
+++ b/app/views/users/_message_contents.html.erb
@ -7,20 +7,26 @@
    <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
    <% length = parents_rely.length %>
    <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 2 %>
+      <% if length <= 5 %>
          <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent, :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
      <% 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 - 1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
-            </div>
-            <div class="orig_cont_hide clearfix">
-              <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => user_activity_id, :parent_id => comment.id),:remote=>true, :class => 'linkBlue2' %>
+              <div class="orig_cont clearfix">
+                <div class="orig_cont clearfix">
+                  <div class="orig_cont clearfix">
+                    <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                  </div>
+                  <div class="orig_cont_hide clearfix">
+                    <span class="orig_icon" >&darr; </span>
+                    <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 5).to_s %>个楼层</span>
+                    <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => user_activity_id, :parent_id => comment.id),:remote=>true, :class => 'linkBlue2' %>
+                  </div>
+                  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[3], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                </div>
+                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[2], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
            </div>
            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
          </div>
--- a/app/views/users/_new_user_message.html.erb
+++ b/app/views/users/_new_user_message.html.erb
@ -0,0 +1,27 @@
+<% message_alls.each do |ma| %>
+    <%# 系统消息 %>
+    <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
+
+    <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
+
+    <%# 课程消息 %>
+    <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
+
+    <!--项目消息-->
+    <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
+
+    <!--公共贴吧-->
+    <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
+
+    <!--用户留言-->
+    <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
+
+    <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
+
+    <%# 申请类消息 %>
+    <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
+<% end %>
+
+<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false,  :flag => true, :is_new => true %>
+</ul>
--- a/app/views/users/_news_contents.html.erb
+++ b/app/views/users/_news_contents.html.erb
@ -7,20 +7,26 @@
    <% parents_rely = get_reply_parents parents_rely, comment %>
    <% length = parents_rely.length %>
    <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 2 %>
+      <% if length <= 5 %>
          <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent, :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
      <% else %>
          <div class="orig_cont clearfix">
            <div class="orig_cont clearfix">
-              <!--<div>-->
-                <!--<%#=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>-->
-              <!--</div>-->
-              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
-            </div>
-            <div class="orig_cont_hide clearfix">
-              <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+              <div class="orig_cont clearfix">
+                <div class="orig_cont clearfix">
+                  <div class="orig_cont clearfix">
+                    <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                  </div>
+                  <div class="orig_cont_hide clearfix">
+                    <span class="orig_icon" >&darr; </span>
+                    <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 5).to_s %>个楼层</span>
+                    <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => user_activity_id, :parent_id => comment.id),:remote=>true, :class => 'linkBlue2' %>
+                  </div>
+                  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[3], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                </div>
+                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[2], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
            </div>
            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
          </div>
--- a/app/views/users/_no_data.html.erb
+++ b/app/views/users/_no_data.html.erb
@ -0,0 +1,4 @@
+<div class="pro_new_info mt50" style="width:748px;height:405px;">
+  <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
+  <p class="sy_tab_con_p ">该用户无公开动态~</p>
+</div>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`$("#issue_commit_ids").html('<%= escape_javascript(render :partial => 'issues/issue_commit_ids') %>');`