Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

2016-09-06 09:17:40 +08:00 · 2016-09-06 09:17:40 +08:00 · 96e7d14060
parent 05170c43ed f5ef2bac50
commit 96e7d14060
84 changed files with 1325 additions and 1039 deletions
--- a/app/api/mobile/apis/new_comment.rb
+++ b/app/api/mobile/apis/new_comment.rb
@ -89,11 +89,15 @@ module Mobile
          tip = 0 #0班级1项目
          type = params[:type]
          result = 1
+
+          #0回复 1回复的回复
+          reply_type = params[:reply_type]
+
+          update_id = 0
+
          if params[:content]!="" && current_user
            case type
              when "HomeworkCommon"
-                homework_common = HomeworkCommon.find(params[:id])
-
                #如果是私有的 并且不是成员则不能回复
                # is_public = homework_common.course.is_public
                # if is_public == 0 && !current_user.member_of_course?(homework_common.course)
@ -106,15 +110,29 @@ module Mobile
                #     result = 2
                #   end
                # end
+                if reply_type == nil || reply_type == 0
+                  homework_common = HomeworkCommon.find(params[:id])
                  feedback = HomeworkCommon.add_homework_jour(current_user, params[:content], params[:id])
                  if (feedback.errors.empty?)
                    homework_common.update_column(:updated_at, Time.now)
                    result = 2
+                    update_id = homework_common.id
+                  end
+                else
+                  #二级回复
+                  reply = JournalsForMessage.find params[:id].to_i
+                  homework_common = HomeworkCommon.find reply.jour_id
+
+                  options = {:notes => params[:content], :reply_id => reply.user_id,:user_id => current_user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i}
+                  feedback = HomeworkCommon.add_homework_jour(current_user, params[:content], reply.jour_id, options)
+                  if (feedback.errors.empty?)
+                    homework_common.update_column(:updated_at, Time.now)
+                    result = 2
+                    update_id = homework_common.id
+                  end
                end

              when "News"
-                news = News.find(params[:id])
-
                # if news.project
                #   if news.project.is_public == false && !current_user.member_of?(news.project)
                #     status = -1
@ -126,19 +144,28 @@ module Mobile
                #     tip = 0
                #   end
                # end
-
                if status == 0
+                  if reply_type == nil || reply_type == 0
+                    news = News.find(params[:id])
                    comment = Comment.new
                    comment.comments = params[:content]
                    comment.author = current_user
                    if news.comments << comment
                      result = 2
+                      update_id = news.id
+                    end
+                  else
+                    #二级回复
+                    comment = Comment.find(params[:id])
+                    news = News.find comment.commented_id
+                    new_comment = news.comments.build(:author_id => current_user.id, :reply_id => params[:id], :comments => params[:content], :parent_id => comment.id)
+                    if new_comment.save
+                      result = 2
+                      update_id = news.id
+                    end
                  end
                end
              when "Message"
-                message = Message.find(params[:id])
-                board = Board.find(message.board_id)
-
                # if message.project
                #   if message.project.is_public == false && !current_user.member_of?(message.project)
                #     status = -1
@ -152,6 +179,9 @@ module Mobile
                # end

                if status == 0
+                  # if reply_type == nil || reply_type == 0
+                    message = Message.find(params[:id])
+                    board = Board.find(message.board_id)
                    topic = message.root
                    reply = Message.new
                    reply.author = current_user
@ -161,11 +191,14 @@ module Mobile
                    reply.subject = "RE: #{topic.subject}"
                    if topic.children << reply
                      result = 2
+                      update_id = topic.id
                    end
+                  # else
+                    #二级回复
+
+                  # end
                end
              when "JournalsForMessage"
-                jour = JournalsForMessage.find params[:id]
-
                # if jour.jour_type == "Project"
                #   if jour.project.is_public == false && !current_user.member_of?(jour.project)
                #     status = -1
@ -179,6 +212,8 @@ module Mobile
                # end

                if status == 0
+                  # if reply_type == nil || reply_type == 0
+                    jour = JournalsForMessage.find(params[:id]).root
                    parent_id = params[:id]
                    author_id = current_user.id
                    reply_user_id = jour.user_id
@ -195,26 +230,48 @@ module Mobile
                    if jfm.errors.empty?
                      (JournalsForMessage.find parent_id).update_attribute(:updated_on,Time.now)
                      result = 2
+                      update_id = jour.id
                    end
+                  # else
+                    #二级回复
+
+                  # end
                end
              when 'Issue'
-                issue = Issue.find params[:id]
-
                # if issue.project.is_public == false && !current_user.member_of?(issue.project)
                #   status = -1
                #   tip = 1
                # end

                if status == 0
+                  if reply_type == nil || reply_type == 0
+                    issue = Issue.find params[:id]
                    is_jour = Journal.new
                    is_jour.user_id = current_user.id
                    is_jour.notes = params[:content]
                    is_jour.journalized = issue
                    if is_jour.save
                      result = 2
+                      update_id = issue.id
+                    end
+                  else
+                    #二级回复
+                    jour = Journal.find(params[:id])
+                    issue = jour.journalized
+                    is_jour = Journal.new
+                    is_jour.user_id = current_user.id
+                    is_jour.notes = params[:content]
+                    is_jour.reply_id = params[:id]
+                    is_jour.parent_id = params[:id]
+                    is_jour.journalized = issue
+                    if is_jour.save
+                      result = 2
+                      update_id = issue.id
+                    end
                  end
                end
              when 'BlogComment'
+                if reply_type == nil || reply_type == 0
                  blog = BlogComment.find(params[:id]).root
                  blogComment = BlogComment.new
                  blogComment.author = current_user
@ -223,14 +280,33 @@ module Mobile
                  blogComment.title = "RE: #{blog.title}"
                  if blog.children << blogComment
                    result = 2
+                    update_id = blog.id
+                  end
+                else
+                  #二级回复
+                  blog = BlogComment.find(params[:id]).root
+                  blogComment = BlogComment.new
+                  blogComment.author = current_user
+                  blogComment.blog = blog.blog
+                  blogComment.content = params[:content]
+                  blogComment.title = "RE: #{blog.title}"
+                  parent = BlogComment.find params[:id]
+                  blogComment.parent_id = params[:id]         #被回复的回复
+                  blogComment.reply_id = parent.author.id     #被回复者id
+
+                  if parent.children << blogComment
+                    result = 2
+                    update_id = blog.id
+                  end
+
                end
            end
            if result == 2
-              update_course_activity_api(type,params[:id])
-              update_user_activity_api(type,params[:id])
-              update_org_activity_api(type,params[:id])
-              update_forge_activity_api(type,params[:id])
-              update_principal_activity_api(type,params[:id])
+              update_course_activity_api(type,update_id)
+              update_user_activity_api(type,update_id)
+              update_org_activity_api(type,update_id)
+              update_forge_activity_api(type,update_id)
+              update_principal_activity_api(type,update_id)
            end
          else
            result = 3
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@ -599,8 +599,19 @@ class AdminController < ApplicationController

  #学校列表
  def schools
-
+    @order = ""
+    @sort = ""
    @schools = School.find_by_sql("SELECT * FROM schools ORDER BY created_at DESC")
+    if params[:sort] && (params[:order]  == 'num')
+      @order = params[:order]
+      @sort = params[:sort]
+      @schools.each do |school|
+        count = UserExtensions.where("school_id = #{school.id} or occupation = '#{school.name}'").count
+        school[:infocount] = count.to_i
+      end
+      @sort == 'asc' ? (@schools = @schools.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@schools = @schools.sort{|x,y| y[:infocount] <=> x[:infocount]})
+    end
+
    @school_count = @schools.count

    @school_pages = Paginator.new @school_count, 30, params['page'] || 1
@ -777,8 +788,15 @@ class AdminController < ApplicationController

  #留言列表
  def leave_messages
+    notes1, notes2, notes3 = '', '', ''
+    begin
+      notes1 = Message.find(19292).content
+      notes2 = Message.find(19291).content
+      notes3 = Message.find(19504).content
+    rescue => e
+    end
    @jour = JournalsForMessage.find_by_sql("SELECT * FROM journals_for_messages AS j1
-    WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) order by created_on desc")
+    WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) AND j1.notes !='#{notes1}' AND j1.notes !='#{notes2}' AND j1.notes !='#{notes3}' order by created_on desc")
    @jour = paginateHelper @jour,30
    @page = (params['page'] || 1).to_i - 1
    respond_to do |format|
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@ -203,16 +204,51 @@ class AttachmentsController < ApplicationController
      @attachment.save
      @newfiledense = filedense
    end
-    if @project
-
-    elsif @course
-
+    if @attachment.container_type == "Project" || @attachment.container_type == "Course"
+      tip_attachment_update
    end
+
    respond_to do |format|
      format.js
    end
  end

+  def tip_attachment_update
+    if params[:course_id]
+      @tip_all_attachments = Attachment.where(:container_type => "Course", :container_id => params[:course_id])
+      @tip_all_public_attachments = Attachment.where(:container_type => "Course", :container_id => params[:course_id], :is_public => 1)
+      @tip_all_private_attachments = Attachment.where(:container_type => "Course", :container_id => params[:course_id], :is_public => 0)
+      @course = Course.find(params[:course_id])
+    elsif params[:project_id]
+      @tip_all_attachments = Attachment.where(:container_type => "Project", :container_id => params[:project_id])
+      @tip_all_public_attachments = Attachment.where(:container_type => "Project", :container_id => params[:project_id], :is_public => 1)
+      @tip_all_private_attachments = Attachment.where(:container_type => "Project", :container_id => params[:project_id], :is_public => 0)
+      @project = Project.find(params[:project_id])
+    end
+    @tag_name = params[:tag_name]
+    @other = params[:other]
+    unless @tag_name.blank?
+      if @other
+        if @project
+          @tip_all_attachments = @tip_all_attachments.select{|attachment| !attachment.tag_list.include?('软件版本') && !attachment.tag_list.include?('文档') && !attachment.tag_list.include?('代码') && !attachment.tag_list.include?('媒体') && !attachment.tag_list.include?('论文')  }
+          @tip_all_public_attachments = @tip_all_public_attachments.select{|attachment| !attachment.tag_list.include?('软件版本') && !attachment.tag_list.include?('文档') && !attachment.tag_list.include?('代码') && !attachment.tag_list.include?('媒体') && !attachment.tag_list.include?('论文')  }
+          @tip_all_private_attachments = @tip_all_private_attachments.select{|attachment| !attachment.tag_list.include?('软件版本') && !attachment.tag_list.include?('文档') && !attachment.tag_list.include?('代码') && !attachment.tag_list.include?('媒体') && !attachment.tag_list.include?('论文')  }
+        elsif @course
+          @tip_all_attachments = @tip_all_attachments.select{|attachment| !attachment.tag_list.include?('课件') && !attachment.tag_list.include?('软件') && !attachment.tag_list.include?('媒体') && !attachment.tag_list.include?('代码') && !attachment.tag_list.include?('论文')  }
+          @tip_all_public_attachments = @tip_all_public_attachments.select{|attachment| !attachment.tag_list.include?('课件') && !attachment.tag_list.include?('软件') && !attachment.tag_list.include?('媒体') && !attachment.tag_list.include?('代码') && !attachment.tag_list.include?('论文')  }
+          @tip_all_private_attachments = @tip_all_private_attachments.select{|attachment| !attachment.tag_list.include?('课件') && !attachment.tag_list.include?('软件') && !attachment.tag_list.include?('媒体') && !attachment.tag_list.include?('代码') && !attachment.tag_list.include?('论文')  }
+        end
+      else
+        @tip_all_attachments = @tip_all_attachments.select{|attachment| attachment.tag_list.include?(@tag_name)}
+        @tip_all_public_attachments = @tip_all_public_attachments.select{|attachment| attachment.tag_list.include?(@tag_name)}
+        @tip_all_private_attachments = @tip_all_private_attachments.select{|attachment| attachment.tag_list.include?(@tag_name)}
+      end
+    end
+    @tip_all_attachments = @tip_all_attachments.count
+    @tip_all_public_attachments = @tip_all_public_attachments.count
+    @tip_all_private_attachments = @tip_all_private_attachments.count
+  end
+
  def thumbnail
    if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
      if stale?(:etag => thumbnail)
@ -281,6 +317,7 @@ class AttachmentsController < ApplicationController
      @attachment.delete
      @flag = true
    end
+    # tip_attachment_update

    respond_to do |format|
      format.js
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@ -40,7 +40,7 @@ class AvatarController < ApplicationController
        @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))

        # 用户头像上传时进行特别处理
-        if @is_direct == '1' && (@source_type == 'User' || @source_type == 'Course' || @source_type == 'Project')
+        if @is_direct == '1' && (@source_type == 'User' || @source_type == 'Course' || @source_type == 'Project' || @source_type == 'Organization')
          diskfile += "temp"
          @urlfile += "temp"
        end
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -331,7 +331,7 @@ class CoursesController < ApplicationController
          @all_members = searchTeacherAndAssistant(@course)
          @members =  @all_members
        when '2'
-          if @course.open_student == 1 || User.current.member_of_course?(@course)
+          if @course.open_student == 1 || User.current.member_of_course?(@course) || User.current.admin?
            @subPage_title = l :label_student_list
            page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
            @all_members = student_homework_score(0,page, 10,@score_sort_by,@sort_type)
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@ -90,6 +90,7 @@ class FilesController < ApplicationController
        @tag_list = get_course_tag_list @course
      end
      @all_attachments = @result
+      get_attachment_for_tip(@all_attachments)
      @limit = 10
      @feedback_count = @all_attachments.count
      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
@ -164,6 +165,7 @@ class FilesController < ApplicationController
      end

      @all_attachments = @project_attachment_result
+      get_attachment_for_tip(@all_attachments)
      @limit = 10
      @feedback_count = @all_attachments.count
      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
@ -325,7 +327,7 @@ class FilesController < ApplicationController
      @containers = [ Project.includes(:attachments).reorder(sort).find(@project.id)]

      show_attachments @containers
-      # get_attachment_for_tip(@all_attachments)
+      get_attachment_for_tip(@all_attachments)

      @tag_list = attachment_tag_list @all_attachments

@ -378,7 +380,7 @@ class FilesController < ApplicationController
      @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]

      show_attachments @containers
-      # get_attachment_for_tip(@all_attachments)
+      get_attachment_for_tip(@all_attachments)

      @tag_list = attachment_tag_list @all_attachments

--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@ -96,6 +96,9 @@ class MyController < ApplicationController
    elsif params[:project]
      @project = Project.find params[:project]
      diskfile = disk_filename('Project', @project.id)
+    elsif params[:organization]
+      @organization = Organization.find params[:organization]
+      diskfile = disk_filename('Organization', @organization.id)
    else
      @user = User.current
      diskfile = disk_filename('User', @user.id)
@ -116,6 +119,9 @@ class MyController < ApplicationController
        when 'Project'
          @project = Project.find params[:source_id]
          diskfile = disk_filename('Project', @project.id)
+        when 'Organization'
+          @organization = Organization.find params[:source_id]
+          diskfile = disk_filename('Organization', @organization.id)
      end
    end
    diskfile1 = diskfile + 'temp'
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@ -16,8 +16,8 @@ class QualityAnalysisController < ApplicationController
  end

  # params 说明：{identifier：版本库名}
+  # type: 1 新的分析 2 重新分析
  def create
-    logger.info("11111111111111111111111111111")
    begin
      user_name = User.find(params[:user_id]).try(:login)
      identifier = params[:identifier]
@ -30,22 +30,26 @@ class QualityAnalysisController < ApplicationController
      # 考虑到历史数据：有些用户创建类job但是build失败,即sonar没有结果，这个时候需要把job删除,并且删掉quality_analyses表数据
      # 如果不要这句则需要迁移数据
      @sonar_address = Redmine::Configuration['sonar_address']
-      projects_date = open(@sonar_address + "/api/projects/index").read
-      arr = JSON.parse(projects_date).map {|m| m["nm"]}   # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
-      quality_an = QualityAnalysis.where(:sonar_name => sonar_name).first
-      if @client_jenkins.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank?
-        aa = @client_jenkins.job.delete("#{job_name}")
-        quality_an.delete unless quality_an.blank?
-      end
+      # projects_date = open(@sonar_address + "/api/projects/index").read
+      # arr = JSON.parse(projects_date).map {|m| m["nm"]}   # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+      quality_an = QualityAnalysis.where(:sonar_name => sonar_name)
+      # if @client_jenkins.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank?
+      #   aa = @client_jenkins.job.delete("#{job_name}")
+      #   quality_an.delete unless quality_an.blank?
+      # end
+
+      # type 1的时候之所以判断job是否存在，为了防止特殊情况，正常情况是不会出现的
+      # 重新分析的时候需要删除以前的分析结果
+      @client_jenkins.job.delete("#{job_name}") if @client_jenkins.job.exists?(job_name)
+      quality_an.delete_all unless quality_an.blank?

      # Checks if the given job exists in Jenkins.
-      unless @client_jenkins.job.exists?(job_name)
      @g = Gitlab.client
      branch = params[:branch]
      language = swith_language_type(params[:language])
      path = params[:path].blank? ? "./" : params[:path]
      # qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
-        version = quality_an.nil? ? 1 : quality_an.sonar_version + 1
+      version = 1
      properties = "sonar.projectKey=#{sonar_name}
        sonar.projectName=#{sonar_name}
        sonar.projectVersion=#{version}
@ -62,13 +66,11 @@ class QualityAnalysisController < ApplicationController

      # jenkins job创建
      jenkins_job = @client_jenkins.job.create("#{job_name}", @doc.to_xml)
-        logger.info("Jenkins status of create ==> #{jenkins_job}")

      # 将地址作为hook值添加到gitlab
-        @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{job_name}")
+      # @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{job_name}")
      # job创建完成后自动运行job,如果运行成功则返回‘200’
      code = @client_jenkins.job.build("#{job_name}")
-        logger.error("build result ==> #{code}")

      # 判断调用sonar分析是否成功
      # 等待启动时间处理, 最长时间为30分钟
@ -108,8 +110,6 @@ class QualityAnalysisController < ApplicationController
          if quality_an.blank?
            QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
                                   :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
-            else
-              qa.update_attribute(:sonar_version, version)
          end
        end
      end
@ -121,7 +121,7 @@ class QualityAnalysisController < ApplicationController
          format.html{redirect_to error_list_project_quality_analysi_path(:project_id => @project.id, :job_name => job_name)}
        end
      end
-      end
+
    rescue => e
      @message = e.message
      logger.error("######################====>#{e.message}")
@ -302,10 +302,8 @@ class QualityAnalysisController < ApplicationController
    @jenkins_address = Redmine::Configuration['jenkins_address']
    jenkins_username = Redmine::Configuration['jenkins_username']
    jenkins_password = Redmine::Configuration['jenkins_password']
-    logger.info("22222222222222222222222222222222")
    # connect jenkins
    @client_jenkins = JenkinsApi::Client.new(:server_url => @jenkins_address, :username => jenkins_username, :password => jenkins_password)
-    logger.info("333333333333333333333333333333")
  rescue => e
    logger.error("failed to connect Jenkins ==> #{e}")
  end
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -1402,7 +1402,7 @@ class StudentWorkController < ApplicationController
  end

  def find_or_save_student_work(is_test)
-    student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
+    student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id, is_test: is_test).first
    if student_work.nil?
      @homework.student_works.build(
          name: params[:title],
@ -1413,7 +1413,7 @@ class StudentWorkController < ApplicationController
      unless @homework.save
        logger.debug @homework.errors.full_messages
      else
-        student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
+        student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id, is_test: is_test).first
      end
    end
    student_work
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -983,7 +983,7 @@ class UsersController < ApplicationController
      @user = User.current
      @homework = HomeworkCommon.find(params[:homework_id])
      @is_test = params[:is_test] == 'true'
-      @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
+      @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id, is_test: @is_test).first
      if @student_work.nil?
        @student_work = StudentWork.new
      end
@ -1660,55 +1660,117 @@ class UsersController < ApplicationController
    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"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10)
+          container_type = 'Course'
+          act_type = 'HomeworkCommon'
        when "course_news"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10)
+          container_type = 'Course'
+          act_type = 'News'
        when "course_message"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
+          container_type = 'Course'
+          act_type = 'Message'
        when "course_poll"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
+          container_type = 'Course'
+          act_type = 'Poll'
        when "course_journals"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'JournalsForMessage'").order('updated_at desc').limit(10).offset(@page * 10)
+          container_type = 'Course'
+          act_type = 'JournalsForMessage'
        when "project_issue"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
+          container_type = 'Project'
+          act_type = 'Issue'
        when "project_message"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
+          container_type = 'Course'
+          act_type = 'Message'
        when "user_journals"
-          @user_activities = UserActivity.where("container_type = 'Principal' and act_type= 'JournalsForMessage' and container_id = #{@user.id}").order('updated_at desc').limit(10).offset(@page * 10)
+          container_type = 'Principal'
+          act_type = 'JournalsForMessage'
        when "current_user"
-          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
-        else
-          if @user == User.current
-            blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+          container_type = 'Principal'
+          act_type = 'Principal'
+      end
+    end
+    if container_type != '' && act_type != ''
+      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+")"
-          end
-          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+        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}) "+
            "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-                                                    "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
-      end
+            "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids}))"
      else
-      #  @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
+        blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+        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})"
+      end
+    end
+    @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
+    # if params[:type].present?
+    #   case params[:type]
+    #     when "course_homework"
+    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10)
+    #     when "course_news"
+    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10)
+    #     when "course_message"
+    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
+    #     when "course_poll"
+    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
+    #     when "course_journals"
+    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'JournalsForMessage'").order('updated_at desc').limit(10).offset(@page * 10)
+    #     when "project_issue"
+    #       @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
+    #     when "project_message"
+    #       @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
+    #     when "user_journals"
+    #       @user_activities = UserActivity.where("container_type = 'Principal' and act_type= 'JournalsForMessage' and container_id = #{@user.id}").order('updated_at desc').limit(10).offset(@page * 10)
+    #     when "current_user"
+    #       @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
+    #     else
+    #       if @user == User.current
    #         blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
-      # 减少数据库交互
-      if @user == User.current
-        watched_user_ids = User.watched_by(@user.id).count == 0 ? " " : ("," + User.watched_by(@user.id).map{|u| u.id.to_s }.join(','))
-        user_ids = "(" + @user.id.to_s + watched_user_ids + ")"
-      else
-        user_ids = "(" + @user.id.to_s + ")"
-      end
-      watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}")
-      blog_ids = watched_user_blog_ids.empty? ? "(-1)" : "(" + watched_user_blog_ids.map { |blog| blog.id}.join(",") + ")"
-
-      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-                                                "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-                                                "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-                                                "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
-    end
+    #       else
+    #         blog_ids = "("+@user.blog.id.to_s+")"
+    #       end
+    #       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+    #                                                 "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+    #                                                 "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+    #                                                 "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
+    #   end
+    # else
+    #   #  @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
+    #   # blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+    #   # 减少数据库交互
+    #   if @user == User.current
+    #     watched_user_ids = User.watched_by(@user.id).count == 0 ? " " : ("," + User.watched_by(@user.id).map{|u| u.id.to_s }.join(','))
+    #     user_ids = "(" + @user.id.to_s + watched_user_ids + ")"
+    #   else
+    #     user_ids = "(" + @user.id.to_s + ")"
+    #   end
+    #   watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}")
+    #   blog_ids = watched_user_blog_ids.empty? ? "(-1)" : "(" + watched_user_blog_ids.map { |blog| blog.id}.join(",") + ")"
+    #
+    #   @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+    #                                             "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+    #                                             "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+    #                                             "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
+    # end
    # @user_activities = paginateHelper @user_activities,500
    @type = params[:type]
    respond_to do |format|
--- a/app/helpers/school_helper.rb
+++ b/app/helpers/school_helper.rb
@ -1,6 +1,6 @@
 module SchoolHelper
  def schoolMember_num school
-    count = student_num(school) + teacher_num(school)
+    count = UserExtensions.where("school_id = #{school.id} or occupation = '#{school.name}'").count
    count.to_s
  end

--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@ -22,9 +22,13 @@ module StudentWorkHelper
  end

  #获取指定用户对某一作业的评分结果
-  def student_work_score work,user
+  def student_work_score work,user,reviewer_role=0
+    if reviewer_role != 0
+      StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id,:reviewer_role => reviewer_role).last
+    else
      StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).last
    end
+  end

  #获取指定评分的角色
  def student_work_score_role score
--- a/app/models/at_message.rb
+++ b/app/models/at_message.rb
@ -184,8 +184,10 @@ class AtMessage < ActiveRecord::Base
      when 'JournalsForMessage'
        if at_message.jour_type == 'Principal'
          {controller: :users, action: :user_messages, id: at_message.at_user}
-        else
+        elsif at_message.jour_type == 'HomeworkCommon'
          {controller: :homework_common, action: :index, course: at_message.jour.course_id}
+        elsif at_message.jour_type == 'Course'
+          {controller: :courses, action: :feedback, id: at_message.jour_id}
        end

      else
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@ -941,46 +941,36 @@ class CoursesService
     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation}
  end

-
-  def student_homework_score(groupid,course_id, nums, score_sort_by)
-    #teachers = find_course_teachers(@course)
-    #start_from = start_from * nums
+  def student_homework_score(groupid,course_id, nums, score_sort_by, sort_type = 'score')
    sql_select = ""
    if groupid == 0
-      if nums == 0
-        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-            WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id
-        AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id}) GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id} AND
-        students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by}"
+      sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.work_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = course_id
+          AND student_works.user_id = members.user_id
+        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{course_id} AND ccs.user_id = members.user_id
+        ) AS act_score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{course_id} ORDER BY #{sort_type} #{score_sort_by}"
    else
-        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-            WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id
-        AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id})  GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id} AND
-        students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by} " #limit #{start_from}, #{nums}"
-
-      end
-    else
-      sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-        WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id
-        and members.course_group_id = #{groupid} AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id})
-        GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id}
-        and members.course_group_id = #{groupid} AND
-        students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by}"
+      sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.work_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{course_id}
+          AND student_works.user_id = members.user_id
+        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{course_id} AND ccs.user_id = members.user_id
+        ) AS act_score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{course_id} AND members.course_group_id = #{groupid} ORDER BY #{sort_type} #{score_sort_by}"
    end
    sql = ActiveRecord::Base.connection()
    homework_scores = Member.find_by_sql(sql_select)
--- a/app/views/admin/schools.html.erb
+++ b/app/views/admin/schools.html.erb
@ -20,8 +20,8 @@
      <th style="width: 100px;">
        学校名称
      </th>
-      <th style="width: 35px;">
-        用户数
+      <th style="width: 35px;" class = "<%= @order == 'num' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '用户数', admin_schools_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'num') %>
      </th>
      <th style="width: 90px;">
        创建时间
--- a/app/views/attachments/update_file_dense.js.erb
+++ b/app/views/attachments/update_file_dense.js.erb
@ -1,9 +1,11 @@
 <% if @attachment.container_type == 'Course' %>
-$("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)),
+    $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>@attachment.id, :course_id => @attachment.container_id, :tag_name => @tag_name, :other => @other,:newtype=>(@attachment.is_public? ? 0:1)),
                                                              :remote=>true,:class=>"postOptionLink",:method => :post) %>");
+    $("#tip_attachment_count").html("<%= escape_javascript( render :partial => 'files/tip_attachment_count') %>");
 <% elsif @attachment.container_type == 'Project' %>
-    $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid => @attachment.id, :newtype => (@attachment.is_public? ? 0:1)),
+    $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid => @attachment.id, :project_id => @attachment.container_id, :tag_name => @tag_name, :other => @other ,:newtype => (@attachment.is_public? ? 0:1)),
                                                              :remote => true, :class => "postOptionLink", :method => :post) %>");
+    $("#tip_attachment_count").html("<%= escape_javascript( render :partial => 'files/tip_attachment_count') %>");

 <% else %>
    $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)),
--- a/app/views/avatar/upload.js.erb
+++ b/app/views/avatar/upload.js.erb
@ -1,4 +1,4 @@
-<% if @is_direct == '1' && (@source_type=='User'|| @source_type == 'Course' || @source_type == 'Project') %>
+<% if @is_direct == '1' && (@source_type=='User'|| @source_type == 'Course' || @source_type == 'Project' || @source_type == 'Organization') %>
 var imgSpan = $("img[nhname='avatar_image']");
 imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'});
 <% else %>
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@ -134,7 +134,7 @@
                <div class="homepagePostReplyPortrait">
                  <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
                </div>
-                <div class="homepagePostReplyDes">
+                <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=comment.id%>').show();" onmouseout="$('#delete_reply_<%=comment.id%>').hide();">
                  <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>

                  <% if !comment.content_detail.blank? %>
@ -161,7 +161,8 @@
                                  l(:button_delete),
                                  {:controller => 'blog_comments', :action => 'destroy', :id => comment.id},
                                  :method => :delete,
-                                  :class => 'fr mr20',
+                                  :id => "delete_reply_#{comment.id}",
+                                  :class => 'fr mr20 undis',
                                  :data => {:confirm => l(:text_are_you_sure)},
                                  :title => l(:button_delete)
                          ) %>
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@ -11,27 +11,27 @@
        $("#relateProject,.relatePInfo").mouseout(function(){
            $(".relatePInfo").css("display","none");
        })
-        $(".homepagePostPortrait").mouseover(function(){
-            onImage = true;
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            var cur = $(this);
-            onImage = false;
-            setTimeout(function(){
-                if (onUserCard == false && onImage == false){
-                    $(cur).children(".userCard").css("display", "none");
-                }
-            }, 500);
-        })
-        $(".userCard").mouseover(function(){
-            onUserCard = true;
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            onUserCard = false;
-            $(this).css("display","none");
-        })
+//        $(".homepagePostPortrait").mouseover(function(){
+//            onImage = true;
+//            $(this).children(".userCard").css("display","block");
+//        })
+//        $(".homepagePostPortrait").mouseout(function(){
+//            var cur = $(this);
+//            onImage = false;
+//            setTimeout(function(){
+//                if (onUserCard == false && onImage == false){
+//                    $(cur).children(".userCard").css("display", "none");
+//                }
+//            }, 500);
+//        })
+//        $(".userCard").mouseover(function(){
+//            onUserCard = true;
+//            $(this).css("display","block");
+//        })
+//        $(".userCard").mouseout(function(){
+//            onUserCard = false;
+//            $(this).css("display","none");
+//        });
        $(".coursesLineGrey").mouseover(function(){
            $(this).css("color","#ffffff");
        })
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@ -5,7 +5,7 @@
          <div class="ping_dispic">
            <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
          </div>
-          <div class="ping_discon upload_img" style="width: 610px;">
+          <div class="ping_discon upload_img" style="width: 610px;" onmouseover="$('#delete_reply_<%=journal.id %>').show();" onmouseout="$('#delete_reply_<%=journal.id %>').hide();">
            <div class="ping_distop f14">
              <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                  <span>
@ -28,17 +28,17 @@
              <span id="reply_praise_count_<%=journal.id %>">
                <%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
              </span>
-              <% if journal.user == User.current|| User.current.admin? || (@course && User.current.allowed_to?(:as_teacher,@course)) %>
-                  <%= link_to(l(:label_bid_respond_delete),
-                              {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
-                              :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
-                              :class => "delete", :title => l(:button_delete))  %>
-              <% end %>
              <% if reply_allow %>
                  <%#= link_to l(:label_bid_respond_quote),'',
                                {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
                  <%= link_to l(:label_bid_respond_quote),'javascript:;',{:nhname=>"reply_btn"} %>
              <% end %>
+              <% if journal.user == User.current|| User.current.admin? || (@course && User.current.allowed_to?(:as_teacher,@course)) %>
+                  <%= link_to(l(:label_bid_respond_delete),
+                              {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
+                              :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :id => "delete_reply_#{journal.id}",
+                              :class => "delete undis", :title => l(:button_delete))  %>
+              <% end %>
            </div>
            <div class="cl"></div>
            <% ids = 'project_respond_form_'+ journal.id.to_s%>
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@ -54,11 +54,11 @@
            </a>
            <ul>
              <li>
-                <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
+                <%= link_to("#{l(:label_bidding_user_studentname)}：<span class='hidden st_info_block'>#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
              </li>
              <br/>
              <% unless member.user.user_extensions.student_id == ''%>
-                  <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
+                  <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span class='hidden st_info_block'>#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
              <% end%>
            </ul>
            <% unless @course.course_groups.empty? %>
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@ -218,8 +218,12 @@
      <% end %>
    </div>
    <div class="ur_buttons">
+      <% if exercise.time == -1 %>
          <%= link_to "保存",commit_exercise_exercise_path(exercise,:save => 1),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:format => 'js',:remote=>true %>
          <%= link_to "提交",commit_exercise_exercise_path(exercise), :data => {:confirm => "您确定要提交吗？"},:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:20px;",:format => 'js',:remote=>true %>
+      <% else %>
+          <%= link_to "提交",commit_exercise_exercise_path(exercise), :data => {:confirm => "您确定要提交吗？"},:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:84px;",:format => 'js',:remote=>true %>
+      <% end %>
    </div>
    <div class="cl"></div>
    <!--contentbox end-->
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@ -115,22 +115,21 @@
      </div>
      <div class="cl"></div>
      <div class="re_con_top">
-        <!--<p class="f_l  fontBlue f_b f_14" id="tip_attachment_count">-->
-          <!--<%#= render :partial => "files/tip_attachment_count" %>-->
-        <!--</p>-->
-        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count%></span>&nbsp;个资源</p>
+        <p class="f_l  fontBlue f_b f_14" id="tip_attachment_count">
+          <%= render :partial => "files/tip_attachment_count" %>
+        </p>
        <p class="f_r" style="color: #808080" id="course_filter_order">
          <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %>
        </p>
      </div>
    </div>
    <div class="cl"></div>
-    <!--<div class="resource_tip_box fontGrey2">-->
-      <!--<em></em>-->
-      <!--<span></span>-->
-      <!--<p class="mb5">私有资源：<br/>仅对本班级成员可见</p>-->
-      <!--<p>公共资源：<br/>对所有用户可见</p>-->
-  <!--</div>-->
+    <div class="resource_tip_box fontGrey2">
+      <em></em>
+      <span></span>
+      <p class="mb5">私有资源：<br/>仅对本班级成员可见</p>
+      <p>公共资源：<br/>对所有用户可见</p>
+    </div>
  </div>
  <div  id="course_list">
    <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@ -85,10 +85,9 @@
      </div>
      <div class="cl"></div>
      <div class="re_con_top">
-        <!--<p class="f_l  fontBlue f_b f_14" id="tip_attachment_count">-->
-          <!--<%#= render :partial => "files/tip_attachment_count" %>-->
-        <!--</p>-->
-        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count%></span>&nbsp;个资源</p>
+        <p class="f_l  fontBlue f_b f_14" id="tip_attachment_count">
+          <%= render :partial => "files/tip_attachment_count" %>
+        </p>
        <p class="f_r" style="color: #808080">
          <% if @order == "asc" %>
              按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
@ -103,14 +102,14 @@
      </div>
    </div>
    <div class="cl"></div>
-    <%# if !User.current.member_of?(@project) && show_attachment_tip(@project.id, "Project") %>
-        <!--<div class="resource_tip_box fontGrey2">-->
-          <!--<em></em>-->
-          <!--<span></span>-->
-          <!--<p class="mb5">私有资源：<br/>仅对本项目成员可见</p>-->
-          <!--<p>公共资源：<br/>对所有用户可见</p>-->
-        <!--</div>-->
-    <%# end %>
+    <% if !User.current.member_of?(@project) && show_attachment_tip(@project.id, "Project") %>
+        <div class="resource_tip_box fontGrey2">
+          <em></em>
+          <span></span>
+          <p class="mb5">私有资源：<br/>仅对本项目成员可见</p>
+          <p>公共资源：<br/>对所有用户可见</p>
+        </div>
+    <% end %>
  </div>
  <div id="course_list">
    <%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}  %>
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@ -70,7 +70,11 @@
                          <% if @course.is_public? %>
                              <li>
                                <span id="is_public_<%= file.id %>">
-                                  <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
+                                  <% if params[:tag_name].blank? %>
+                                    <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid => file.id, :newtype=>(file.is_public? ? 0:1), :course_id => @course.id), :remote=>true,:class=>"postOptionLink",:method => :post %>
+                                  <% else %>
+                                    <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid => file.id, :newtype=>(file.is_public? ? 0:1), :tag_name => params[:tag_name].force_encoding("UTF-8"), :course_id => @course.id, :other => params[:other]), :remote=>true,:class=>"postOptionLink",:method => :post %>
+                                  <% end %>
                                </span>
                              </li>
                          <%end%>
--- a/app/views/files/_tool_settings.html.erb
+++ b/app/views/files/_tool_settings.html.erb
@ -9,11 +9,20 @@
                  <% else %>
                      <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')") %></li>
                  <% end %>
-                  <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
+                  <% if params[:tag_name].blank? %>
+                      <li><%= link_to '更新版本',attachments_versions_path(file, :project_id => project.id), :class => "postOptionLink", :remote => true %></li>
+                  <% else %>
+                      <li><%= link_to '更新版本',attachments_versions_path(file, :tag_name => params[:tag_name].force_encoding("UTF-8"), :project_id => project.id, :other => params[:other]),:class => "postOptionLink",:remote=>true %></li>
+                  <% end %>
+
                  <% if project.is_public? %>
                      <li>
                        <span id="is_public_<%= file.id %>">
-                          <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid => file.id, :newtype=>(file.is_public? ? 0:1)), :remote=>true,:class=>"postOptionLink",:method => :post %>
+                          <% if params[:tag_name].blank? %>
+                            <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid => file.id, :newtype=>(file.is_public? ? 0:1), :project_id => project.id), :remote=>true,:class=>"postOptionLink",:method => :post %>
+                          <% else %>
+                            <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid => file.id, :newtype=>(file.is_public? ? 0:1), :tag_name => params[:tag_name].force_encoding("UTF-8"), :project_id => project.id, :other => params[:other]), :remote=>true,:class=>"postOptionLink",:method => :post %>
+                          <% end %>
                        </span>
                      </li>
                  <% end %>
--- a/app/views/files/search.js.erb
+++ b/app/views/files/search.js.erb
@ -1,3 +1,4 @@

    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
+    $("#tip_attachment_count").html("<%= escape_javascript( render :partial => 'files/tip_attachment_count') %>");
--- a/app/views/files/search_tag_attachment.js.erb
+++ b/app/views/files/search_tag_attachment.js.erb
@ -3,6 +3,6 @@
 $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% else %>
 $("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>");
-//    $("#tip_attachment_count").html("<%#= escape_javascript( render :partial => 'files/tip_attachment_count') %>");
+$("#tip_attachment_count").html("<%= escape_javascript( render :partial => 'files/tip_attachment_count') %>");
 $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% end %>
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@ -10,7 +10,7 @@
        <div class="homepagePostReplyPortrait" >
          <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
        </div>
-        <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=comment.id %>').show();" onmouseout="$('#delete_reply_<%=comment.id %>').hide();">
          <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>

          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
@ -40,7 +40,8 @@
                              l(:button_delete),
                              {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>comment.id},
                              :method => :get,
-                              :class => 'fr mr20',
+                              :id => "delete_reply_#{comment.id}",
+                              :class => 'fr mr20 undis',
                              :data => {:confirm => l(:text_are_you_sure)},
                              :title => l(:button_delete)
                      ) if comment.user_id == User.current.id %>
--- a/app/views/issues/update.js.erb
+++ b/app/views/issues/update.js.erb
@ -6,7 +6,7 @@ $("#issue_detail").show();
 $("#issue_edit").hide();
 $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
 sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
-$(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
+$(".homepagePostReplyBannerCount").html('<%= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');
 //edit里的编辑器貌似显示不出来，所以手动js生成。
 issue_desc_editor = KindEditor.create('#issue_description',
        {"width":"85%",
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@ -31,7 +31,7 @@
 <div class="cl"></div>
 <div class="sy_class_logo fl">
  <div class="pr" style="width: 96px; height:96px;">
-     <% if User.current.logged? && (User.current == @course.teacher || User.current.admin?)%>
+     <% if is_teacher%>
       <%=link_to image_tag(url_to_avatar(@course),width:"96", height: "96", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:course => @course.id), :remote => true%>
       <div class="homepageEditProfile undis">
         <%=link_to '', my_clear_user_avatar_temp_path(:course => @course.id), :class => 'homepageEditProfileIcon', :title => '点击编辑头像', :remote => true %>
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@ -3,6 +3,7 @@
 <div class="scrollsidebar" id="scrollsidebar">
  <div class="side_content">
    <div class="side_list">
+      <div class="qr-code-border borderBottomNone"><img src="/images/wechat/trustie_QR.jpg" width="150" style="display:block;" /> </div>
      <div class="side_title">
        <a title="<%= l(:button_hide) %>" class="close_btn">
          <span>
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@ -128,7 +128,7 @@
          <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！</a></li>
      <% elsif ma.forge_message_type == "Issue" && ma.status != 1 %>
          <li><a href="<%=issue_path(:id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%></a></li>
-      <% elsif ma.forge_message_type == "Journal" %>
+      <% elsif ma.forge_message_type == "Journal" && ma.forge_message %>
          <li><a href="<%=issue_path(:id => ma.forge_message.journalized_id) %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 更新了问题状态：<%= ma.forge_message.journalized.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>更新了问题状态：<%= ma.forge_message.journalized.subject%></a></li>
      <% elsif ma.forge_message_type == "Message" %>
          <li><a href="<%=board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
--- a/app/views/layouts/_syllabus_eng_name.html.erb
+++ b/app/views/layouts/_syllabus_eng_name.html.erb
@ -1,9 +1,9 @@
 <p style="position:relative; display:inline;"><% if syllabus.eng_name && !syllabus.eng_name.empty? %>
    <span><%=syllabus.eng_name %></span>
 <% else%>
-    <span style="color: #888">课程英文名称</span>
+    <span style="color: #888"></span>
 <% end %>
 <% if User.current == syllabus.user || User.current.admin? %>
-    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_ng_name_png", :style => "width:15px; position:absolute; right: -20px; top: 5px;", :class => "none", :onclick => "show_edit_eng_name('#{syllabus.eng_name}');"%>
+    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_ng_name_png", :style => "width:15px; position:absolute; right: -20px; top: 5px;", :class => "none", :onclick => "show_edit_eng_name('#{syllabus.eng_name}');", :title => '编辑课程英文名称'%>
 <% end %>
 </p>
--- a/app/views/layouts/_syllabus_teacher_list.html.erb
+++ b/app/views/layouts/_syllabus_teacher_list.html.erb
@ -8,7 +8,7 @@
      <li >
        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sy_teachers_img fl mr15"), user_path(teacher), :target => "_blank", :alt => "用户头像" %>
        <div class="sy_teachers_txt fl">
-          <%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name", :target => "_blank" %>
+          <%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name hidden", :target => "_blank", :title => teacher.show_name %>
          <span class="sy_teachers_span">
            <% if teacher.user_extensions && teacher.user_extensions.identity %>
                <%= get_user_roll teacher %>
--- a/app/views/layouts/_syllabus_title.html.erb
+++ b/app/views/layouts/_syllabus_title.html.erb
@ -1,5 +1,6 @@
-<h2 style="position:relative; display:inline;">课程名称：<%=syllabus.title %>
+<h2 style="position:relative; display:inline;">
+  <%=syllabus.title %>
  <% if User.current == syllabus.user || User.current.admin? %>
-      <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_title_png", :class => "none", :style => "width:15px; position:absolute; right: -20px; top: 15px;", :onclick => "show_edit_title('#{syllabus.title}');"%>
+      <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_title_png", :class => "none", :style => "width:15px; position:absolute; right: -20px; top: 15px;", :onclick => "show_edit_title('#{syllabus.title}');", :title => '编辑课程名称'%>
  <% end %>
 </h2>
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -1,6 +1,6 @@
 <%# course_model %>
-<% course_file_num = visable_attachemnts_incourse(@course).count%>
-<%# course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
+<%# course_file_num = visable_attachemnts_incourse(@course).count%>
+<% course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <% homework_num = visable_course_homework @course %>

--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@ -13,7 +13,7 @@
  <%= javascript_heads %>
  <%= heads_for_theme %>
  <%= stylesheet_link_tag  'prettify','jquery/jquery-ui-1.9.2','css/common','css/structure','css/public','repository','css/courses','css/org','css/project', 'css/popup' %>
-  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+  <%= javascript_include_tag 'cookie','project',"avatars", 'organization','header','prettify','select_list_move','org'%>
  <%= javascript_include_tag 'attachments' %>
  <%= call_hook :view_layouts_base_html_head %>
  <!-- page specific tags -->
@ -77,16 +77,14 @@
        <!--<div class="pr_info_logo fl mr10 mb5">-->
        <!--<%#= image_tag(url_to_avatar(@organization), :width=>"60",  :height=>"60", :alt=>"组织logo") %>-->
        <!--</div>-->
-        <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
-          <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
-          <% if User.current.logged?%>
-              <% if User.current.id == @organization.creator_id%>
-                  <div id="edit_org_file_btn" class="none">
-                    <div class="homepageEditProfile">
-                      <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
+        <div class="pr_info_logo fl fl mr10 mb5 pr" id="homepage_portrait_image">
+          <% if User.current.logged? && User.current.admin_of_org?(@organization)%>
+              <%=link_to image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true%>
+              <div class="homepageEditProfile undis">
+                <%=link_to '', my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true, :class => 'homepageEditProfileIcon', :title => '点击编辑Logo' %>
              </div>
-                  </div>
-              <% end %>
+          <% else %>
+              <%= image_tag(url_to_avatar(@organization), :width => "60", :height => "60", :alt => "组织logo") %>
          <% end %>
        </div>
        <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
@ -172,6 +170,10 @@
  <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 => @organization} %>
+</div>
+
 <script type="text/javascript">
    $("#courseMenu").mouseenter(function(){
        $("#topnav_course_menu").show();
--- a/app/views/layouts/base_org_custom.html.erb
+++ b/app/views/layouts/base_org_custom.html.erb
@ -34,9 +34,12 @@
 <%# 弹框 %>
 <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 => @organization} %>
+</div>
 <%= call_hook :view_layouts_base_body_bottom %>
 <%# JS提前加载 %>
-<%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+<%= javascript_include_tag 'cookie','project',"avatars", 'organization','header','prettify','select_list_move','org'%>
 <%= javascript_include_tag 'attachments' %>
 </body>
 </html>
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@ -38,7 +38,16 @@
  <% end%>
 </div>
 <div class="cl"></div>
-
+<div style="width:1000px; margin: 5px auto;">
+  <p class="sy_cgrey">
+    位置：&nbsp;&nbsp;
+    <%= link_to User.current, user_path(User.current.id), :class => 'sy_cgrey', :target => '_blank' %>
+    &nbsp;&gt;&nbsp;
+    <%= link_to '课程', user_courselist_user_path(User.current.id), :class => "sy_cgrey", :target => '_blank' %>
+    &nbsp;&gt;&nbsp;
+    <%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_cgrey" %>
+  </p>
+</div>
 <div class="sy_contanier">
  <div class="sy_top">
    <div class="sy_top_con" onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();"> <!-- onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();" -->
@ -50,7 +59,7 @@
    <div class="sy_con_l fl mb15">
      <%= yield %>
    </div><!--sy_con_l end-->
-    <div class="sy_con_r fr ">
+    <div class="sy_con_r fr mb10">
      <div class="sy_right_box" id="syllabus_base_info">
        <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>
      </div>
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@ -33,31 +33,31 @@
      $(document).ready(function(){
          $("#relateProject,.relatePInfo").mouseover(function(){
              $(".relatePInfo").css("display","block");
-          })
+          });
          $("#relateProject,.relatePInfo").mouseout(function(){
              $(".relatePInfo").css("display","none");
-          })
-          $(".homepagePostPortrait").mouseover(function(){
-              onImage = true;
-              $(this).children(".userCard").css("display","block");
-          })
-          $(".homepagePostPortrait").mouseout(function(){
-              var cur = $(this);
-              onImage = false;
-              setTimeout(function(){
-                  if (onUserCard == false && onImage == false) {
-                      $(cur).children(".userCard").css("display","none");
-                  }
-              },500);
-          })
-          $(".userCard").mouseover(function(){
-              onUserCard = true;
-              $(this).css("display","block");
-          })
-          $(".userCard").mouseout(function(){
-              onUserCard = false;
-              $(this).css("display","none");
-          })
+          });
+//          $(".homepagePostPortrait").mouseover(function(){
+//              onImage = true;
+//              $(this).children(".userCard").css("display","block");
+//          });
+//          $(".homepagePostPortrait").mouseout(function(){
+//              var cur = $(this);
+//              onImage = false;
+//              setTimeout(function(){
+//                  if (onUserCard == false && onImage == false) {
+//                      $(cur).children(".userCard").css("display","none");
+//                  }
+//              },500);
+//          });
+//          $(".userCard").mouseover(function(){
+//              onUserCard = true;
+//              $(this).css("display","block");
+//          });
+//          $(".userCard").mouseout(function(){
+//              onUserCard = false;
+//              $(this).css("display","none");
+//          });
          $(".coursesLineGrey").mouseover(function(){
              $(this).css("color","#ffffff");
          })
--- a/app/views/layouts/new_base_user_show.html.erb
+++ b/app/views/layouts/new_base_user_show.html.erb
@ -33,34 +33,34 @@
      $(document).ready(function(){
          $("#relateProject,.relatePInfo").mouseover(function(){
              $(".relatePInfo").css("display","block");
-          })
+          });
          $("#relateProject,.relatePInfo").mouseout(function(){
              $(".relatePInfo").css("display","none");
-          })
-          $(".homepagePostPortrait").mouseover(function(){
-              onImage = true;
-              $(this).children(".userCard").css("display","block");
-          })
-          $(".homepagePostPortrait").mouseout(function(){
-              var cur = $(this);
-              onImage = false;
-              setTimeout(function(){
-                  if (onUserCard == false && onImage == false) {
-                      $(cur).children(".userCard").css("display","none");
-                  }
-              },500);
-          })
-          $(".userCard").mouseover(function(){
-              onUserCard = true;
-              $(this).css("display","block");
-          })
-          $(".userCard").mouseout(function(){
-              onUserCard = false;
-              $(this).css("display","none");
-          })
+          });
+//          $(".homepagePostPortrait").mouseover(function(){
+//              onImage = true;
+//              $(this).children(".userCard").css("display","block");
+//          });
+//          $(".homepagePostPortrait").mouseout(function(){
+//              var cur = $(this);
+//              onImage = false;
+//              setTimeout(function(){
+//                  if (onUserCard == false && onImage == false) {
+//                      $(cur).children(".userCard").css("display","none");
+//                  }
+//              },500);
+//          });
+//          $(".userCard").mouseover(function(){
+//              onUserCard = true;
+//              $(this).css("display","block");
+//          });
+//          $(".userCard").mouseout(function(){
+//              onUserCard = false;
+//              $(this).css("display","none");
+//          });
          $(".coursesLineGrey").mouseover(function(){
              $(this).css("color","#ffffff");
-          })
+          });
          $(".coursesLineGrey").mouseout(function(){
              $(this).css("color","#808080");
          });
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@ -42,7 +42,6 @@
        <ul>
          <li class="homepagePostSettingIcon">
            <ul class="homepagePostSettiongText">
-              <% if @topic.author.id == User.current.id  %>
                  <li>
                      <%= link_to(
                                  l(:button_edit),
@ -59,7 +58,6 @@
                                  :class => 'postOptionLink'
                          ) if @message.course_destroyable_by?(User.current) %>
                  </li>
-              <% end %>
              <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{@message.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
            </ul>
          </li>
@ -109,7 +107,7 @@
            <div class="homepagePostReplyPortrait">
              <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
            </div>
-            <div class="homepagePostReplyDes">
+            <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=reply.id %>').show();" onmouseout="$('#delete_reply_<%=reply.id %>').hide();">
              <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>

              <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
@ -134,7 +132,8 @@
                              l(:button_delete),
                              {:action => 'destroy', :id => reply},
                              :method => :post,
-                              :class => 'fr mr20',
+                              :id => "delete_reply_#{reply.id}",
+                              :class => 'fr mr20 undis',
                              :data => {:confirm => l(:text_are_you_sure)},
                              :title => l(:button_delete)
                      ) if reply.course_destroyable_by?(User.current) %>
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@ -104,18 +104,15 @@
              <ul>
                <li class="homepagePostSettingIcon">
                  <ul class="homepagePostSettiongText">
-
                    <li>
                      <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %>
                    </li>
-                    <% if @topic.author.id == User.current.id %>
                    <li>
                      <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic},:method => :post,
                                  :data => {:confirm => l(:text_are_you_sure)},
                                  :class => 'postOptionLink'
                          ) if @message.destroyable_by?(User.current) %>
                    </li>
-                    <% end %>
                    <% if hidden_unproject_infos %>
                        <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{@message.id},#{User.current.id},'message');", :class => 'postOptionLink' %></li>
                    <% else %>
@ -174,7 +171,7 @@
              <div class="homepagePostReplyPortrait">
                <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
              </div>
-              <div class="homepagePostReplyDes">
+              <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=reply.id %>').show();" onmouseout="$('#delete_reply_<%=reply.id %>').hide();">
                <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>

                <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
@ -199,10 +196,11 @@
                              l(:button_delete),
                              {:action => 'destroy', :id => reply},
                              :method => :post,
-                              :class => 'fr mr20',
+                              :id => "delete_reply_#{reply.id}",
+                              :class => 'fr mr20 undis',
                              :data => {:confirm => l(:text_are_you_sure)},
                              :title => l(:button_delete)
-                      ) if reply.course_destroyable_by?(User.current) %>
+                      ) if reply.destroyable_by?(User.current) %>
                </span>

                    <div class="cl"></div>
--- a/app/views/my/save_user_avatar.js.erb
+++ b/app/views/my/save_user_avatar.js.erb
@ -10,5 +10,15 @@ if($("#course_avatar_form").length > 0) {
 $("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@project), :id=>'nh_source_tx',:style=>"width:60px;height:60px;overflow:hidden",:alt=>"项目logo") %>');
 if($("#project_avatar_form").length > 0) {
    window.location.href = "<%=settings_project_path(@project) %>";
-}<% end %>
+}
+<% elsif @organization %>
+<% if @organization.show_mode == 1 %>
+$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@organization), :id=>'nh_source_tx',:style=>"width:51px;height:51px;overflow:hidden",:alt=>"组织logo") %>');
+<% else %>
+$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@organization), :id=>'nh_source_tx',:style=>"width:60px;height:60px;overflow:hidden",:alt=>"组织logo") %>');
+<% end %>
+if($("#org_avatar_form").length > 0) {
+    window.location.href = "<%=setting_organization_path(@organization) %>";
+}
+<% end %>
 hideModal();
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@ -82,7 +82,7 @@
  </div>
  <div class="cl"></div>
  <div class="homepagePostReply">
-    <%= render :partial => 'news/news_all_replies' %>
+    <%= render :partial => 'news/news_all_replies', :locals => {:object => @course} %>
  </div>
 </div>
 <script type="text/javascript">
--- a/app/views/news/_news_all_replies.html.erb
+++ b/app/views/news/_news_all_replies.html.erb
@ -19,7 +19,7 @@
            <div class="homepagePostReplyPortrait">
              <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
            </div>
-            <div class="homepagePostReplyDes">
+            <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=comment.id %>').show();" onmouseout="$('#delete_reply_<%=comment.id %>').hide();">
              <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>

              <% if !comment.content_detail.blank? %>
@ -47,10 +47,11 @@
                               :action => 'destroy', :id => @news,
                               :comment_id => comment},
                              :method => :delete,
-                              :class => 'fr mr20',
+                              :id => "delete_reply_#{comment.id}",
+                              :class => 'fr mr20 undis',
                              :data => {:confirm => l(:text_are_you_sure)},
                              :title => l(:button_delete)
-                      ) if @news.author == User.current %>
+                      ) if User.current.allowed_to?(:manage_news, object) %>
                        </span>
                      <div class="cl"></div>
                    </div>
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@ -26,7 +26,11 @@
            <ul>
              <li class="homepagePostSettingIcon">
                <ul class="homepagePostSettiongText">
+                  <% if hidden_unproject_infos %>
                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{@news.id}','#{User.current.id}','news')")  %></li>
+                  <% else %>
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send_hidden('#{@news.id}','#{User.current.id}','news')")  %></li>
+                  <% end %>
                  <li>
                    <%= link_to(
                                l(:button_edit),
@ -82,7 +86,7 @@
  </div>
  <div class="cl"></div>
  <div class="homepagePostReply">
-    <%= render :partial => 'news/news_all_replies' %>
+    <%= render :partial => 'news/news_all_replies', :locals => {:object => @project} %>
  </div>
 </div>
 <script type="text/javascript">
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@ -102,7 +102,7 @@
                <div class="homepagePostReplyPortrait">
                  <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
                </div>
-                <div class="homepagePostReplyDes">
+                <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=comment.id%>').show();" onmouseout="$('#delete_reply_<%=comment.id%>').hide();">
                  <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>

                  <% if !comment.content_detail.blank? %>
@ -129,7 +129,8 @@
                                  l(:button_delete),
                                  {:controller => 'org_document_comments',:action => 'delete_reply', :id => comment.id},
                                  :method => :delete,
-                                  :class => 'fr mr20',
+                                  :id => "delete_reply_#{comment.id}",
+                                  :class => 'fr mr20 undis',
                                  :data => {:confirm => l(:text_are_you_sure)},
                                  :title => l(:button_delete)) %>
                    <% end %>
--- a/app/views/organizations/_new_org_avatar_form.html.erb
+++ b/app/views/organizations/_new_org_avatar_form.html.erb
@ -24,7 +24,8 @@
                           :upload_path => upload_avatar_path(:format => 'js'),
                           :description_placeholder => nil ,# l(:label_optional_description)
                           :source_type => source.class.to_s,
-                           :source_id => source.id.to_s
+                           :source_id => source.id.to_s,
+                           :is_direct => 0
                   } %>
 <!--</span>-->
 <% content_for :header_tags do %>
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@ -1,7 +1,17 @@

 <div class="por_header_top">
  <div class="por_header_con">
-    <%= image_tag(url_to_avatar(@organization), width:"51", height: "51", :id => 'nh_user_tx', :class => "por_logo fl mt1", :target => "_blank") %>
+    <div class="pr fl">
+        <% if User.current.logged? && User.current.admin_of_org?(@organization)%>
+            <%=link_to image_tag(url_to_avatar(@organization),width:"51", height: "51", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true%>
+            <div class="homepageEditProfile undis">
+              <%=link_to '', my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true, :class => 'homepageEditProfileIcon', :title => '点击编辑Logo' %>
+            </div>
+        <% else %>
+            <%= image_tag(url_to_avatar(@organization), :width => "51", :height => "51", :alt => "组织logo") %>
+        <% end %>
+    </div>
+    <%#= image_tag(url_to_avatar(@organization), width:"51", height: "51", :id => 'nh_user_tx', :class => "por_logo fl mt1", :target => "_blank") %>
    <% if User.current.logged? %>
        <div class="navHomepageProfile" id="navHomepageProfile">
          <ul>
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@ -4,45 +4,45 @@
    $(document).ready(function(){
        $("#relateProject,.relatePInfo").mouseover(function(){
            $(".relatePInfo").css("display","block");
-        })
+        });
        $("#relateProject,.relatePInfo").mouseout(function(){
            $(".relatePInfo").css("display","none");
-        })
-        $(".homepagePostPortrait").mouseover(function(){
-            onImage = true;
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            var cur = $(this);
-            onImage = false;
-            setTimeout(function(){
-                if (onUserCard == false && onImage == false) {
-                    $(cur).children(".userCard").css("display", "none");
-                }
-            }, 500);
-        })
-        $(".userCard").mouseover(function(){
-            onUserCard = true;
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            onUserCard = false;
-            $(this).css("display","none");
-        })
+        });
+//        $(".homepagePostPortrait").mouseover(function(){
+//            onImage = true;
+//            $(this).children(".userCard").css("display","block");
+//        });
+//        $(".homepagePostPortrait").mouseout(function(){
+//            var cur = $(this);
+//            onImage = false;
+//            setTimeout(function(){
+//                if (onUserCard == false && onImage == false) {
+//                    $(cur).children(".userCard").css("display", "none");
+//                }
+//            }, 500);
+//        });
+//        $(".userCard").mouseover(function(){
+//            onUserCard = true;
+//            $(this).css("display","block");
+//        });
+//        $(".userCard").mouseout(function(){
+//            onUserCard = false;
+//            $(this).css("display","none");
+//        });
        $(".coursesLineGrey").mouseover(function(){
            $(this).css("color","#ffffff");
-        })
+        });
        $(".coursesLineGrey").mouseout(function(){
            $(this).css("color","#808080");
-        })
+        });
        $(".homepagePostSetting,.coursesLineGrey").mouseover(function(){
            $(this).prev().css("color","#ffffff");
            $(this).css("z-index", "9999");
-        })
+        });
        $(".homepagePostSetting").mouseout(function(){
            $(this).prev().css("color","#808080");
            $(this).css("z-index", "1");
-        })
+        });

        //二级菜单滑动时箭头方向控制
        $(".homepageLeftMenuMoreIcon").toggle(function(){
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@ -47,7 +47,9 @@
          <!--<a href="javascript:void(0);" class="logoEnter fl linkGrey4">上传图片</a>-->
        <%#= form_for( @organization,{:controller => 'organizations',:action => 'update',:id=>@organization,:html=>{:id=>'update_org_form',:method=>'put'}}) do %>
        <%= labelled_form_for @organization do |f|%>
+            <div id="org_avatar_form">
              <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %>
+            </div>
            <!--<div class="cl"></div>-->
            <!--</div>-->
            <div class="orgRow mb10"><span class="c_red">*&nbsp;</span>组织名称：<input type="text" name="organization[name]" id="organization_name" maxlength="100" onblur="check_uniq(<%=@organization.id %>);" onfocus="$('#check_name_hint').hide()" class="orgNameInput"  value="<%= @organization.name%>" />
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@ -1,3 +1,4 @@
+<% project_file_num = Attachment.where(:container_type => "Project", :container_id => @project.id).count %>
 <div class="subNav">
  <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
  <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
@ -30,8 +31,8 @@
 <% unless @project.enabled_modules.where("name = 'files'").empty? %>
 <div class="subNav">
  <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
-  <% unless @project.project_score.attach_num == 0 %>
-    <%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
+  <% unless project_file_num == 0 %>
+    <%= link_to "(#{project_file_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
  <% end %>
  <% if User.current.member_of?(@project) %>
    <%#= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
--- a/app/views/projects/_friend_group.html.erb
+++ b/app/views/projects/_friend_group.html.erb
@ -1,3 +1,4 @@
+<% project_file_num = Attachment.where(:container_type => "Project", :container_id => @project.id).count %>
 <div class="subNav">
  <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
  <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
@ -18,8 +19,8 @@
 <% unless @project.enabled_modules.where("name = 'files'").empty? %>
  <div class="subNav">
    <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
-    <% unless @project.project_score.attach_num == 0 %>
-        <%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
+    <% unless project_file_num == 0 %>
+        <%= link_to "(#{project_file_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
    <% end %>
    <% if User.current.member_of?(@project) %>
      <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml105" %>
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@ -3,7 +3,7 @@
        <% for journal in journals %>
            <div class="ping_C" id='word_li_<%= journal.id.to_s %>'>
              <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %></div>
-              <div class="ping_discon" style="width: 610px;">
+              <div class="ping_discon" style="width: 610px;" onmouseover="$('#delete_reply_<%=journal.id %>').show();" onmouseout="$('#delete_reply_<%=journal.id %>').hide();">
                <div class="ping_distop f14">
                  <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                  <span><%= link_to journal.user.show_name, user_path(journal.user), :class => 'c_blue fb fl mb10 f14', :target => "_blank" %>
@ -20,17 +20,17 @@
                    <%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
                  </span>
                    <% if journal.user == User.current|| User.current.admin? %>
-                      <%= link_to(l(:label_bid_respond_delete),
-                                  {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
-                                  :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
-                                  :class => "delete", :title => l(:button_delete))  %>
-                    <% end %>
                      <% if reply_allow %>
                        <%#= link_to l(:label_bid_respond_quote),'',
                                    {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
                        <%= link_to l(:label_bid_respond_quote),'javascript:;', {:nhname=>"reply_btn"} %>

                      <% end %>
+                      <%= link_to(l(:label_bid_respond_delete),
+                                  {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
+                                  :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :id => "delete_reply_#{journal.id}",
+                                  :class => "delete undis", :title => l(:button_delete))  %>
+                    <% end %>
                </div>
                <div class="cl"></div>
                <% ids = 'project_respond_form_'+ journal.id.to_s%>
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@ -5,41 +5,41 @@
    $(document).ready(function(){
        $("#relateProject,.relatePInfo").mouseover(function(){
            $(".relatePInfo").css("display","block");
-        })
+        });
        $("#relateProject,.relatePInfo").mouseout(function(){
            $(".relatePInfo").css("display","none");
-        })
-        $(".homepagePostPortrait").mouseover(function(){
-            onImage = true;
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            var cur = $(this);
-            onImage = false;
-            setTimeout(function(){
-                if (onUserCard == false && onImage == false) {
-                    $(cur).children(".userCard").css("display", "none");
-                }
-            }, 500);
-        })
-        $(".userCard").mouseover(function(){
-            onUserCard = true;
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            onUserCard = false;
-            $(this).css("display","none");
-        })
+        });
+//        $(".homepagePostPortrait").mouseover(function(){
+//            onImage = true;
+//            $(this).children(".userCard").css("display","block");
+//        });
+//        $(".homepagePostPortrait").mouseout(function(){
+//            var cur = $(this);
+//            onImage = false;
+//            setTimeout(function(){
+//                if (onUserCard == false && onImage == false) {
+//                    $(cur).children(".userCard").css("display", "none");
+//                }
+//            }, 500);
+//        });
+//        $(".userCard").mouseover(function(){
+//            onUserCard = true;
+//            $(this).css("display","block");
+//        });
+//        $(".userCard").mouseout(function(){
+//            onUserCard = false;
+//            $(this).css("display","none");
+//        });
        $(".coursesLineGrey").mouseover(function(){
            $(this).css("color","#ffffff");
-        })
+        });
        $(".coursesLineGrey").mouseout(function(){
            $(this).css("color","#808080");
-        })
+        });
        $(".homepagePostSetting,.coursesLineGrey").mouseover(function(){
            $(this).prev().css("color","#ffffff");
            $(this).css("z-index", "9999");
-        })
+        });
        $(".homepagePostSetting").mouseout(function(){
            $(this).prev().css("color","#808080");
            $(this).css("z-index", "1");
--- a/app/views/projects/_research_team.html.erb
+++ b/app/views/projects/_research_team.html.erb
@ -1,3 +1,4 @@
+<% project_file_num = Attachment.where(:container_type => "Project", :container_id => @project.id).count %>
 <div class="subNav">
  <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
  <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
@ -29,8 +30,8 @@
 <% unless @project.enabled_modules.where("name = 'files'").empty? %>
  <div class="subNav">
    <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
-    <% unless @project.project_score.attach_num == 0 %>
-        <%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
+    <% unless project_file_num == 0 %>
+        <%= link_to "(#{project_file_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
    <% end %>
    <% if User.current.member_of?(@project) %>
      <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml105" %>
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@ -127,7 +127,7 @@
    <p class="fontBlue2"><%= @ha["functions"].to_i %></p>
  </div>
 </div>
-<% unless @user_quality_infos.blank? %>
+<% if !@user_quality_infos.blank? %>
    <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>
    <div class="analysis-block mt10 f12">
      <ul class="contribute-list">
@ -141,7 +141,7 @@

      <% @user_quality_infos.each do |author_info| %>
          <% user = get_user_by_mail(author_info[:email]) %>
-          <% unless author_info[:changes] == 0 %>
+          <%# unless author_info[:changes] == 0 %>
              <ul class="contribute-list">
                <li class="fl fontGrey2 contribute-list-avatar contribute-list-height">
                  <div class="mt8">
@ -155,7 +155,7 @@
                <li class="fl contribute-list-rate fontBlue2 contribute-list-height contribute-list-line-height"><%= author_info[:ratio] %></li>
                <div class="cl"></div>
              </ul>
-          <% end %>
+          <%# end %>
      <% end %>

    </div>
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@ -3,8 +3,12 @@
  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
  <% unless @entries.nil? %>
      <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
-      <% if quality_analysis(User.current.try(:login), @repository.id).nil? && User.current.member_of?(@project) && @project.is_public? %>
-        <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
+      <% if User.current.member_of?(@project) && @project.is_public? %>
+          <% if quality_analysis(User.current.try(:login), @repository.id).nil?  %>
+              <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch, :type => "1"), :remote => true, :class => "btn_zipdown fr" %>
+          <% else %>
+              <%= link_to "重新分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch, :type => "2"), :remote => true, :class => "btn_zipdown fr" %>
+          <% end %>
      <% end %>
  <% end %>
  <!--quality_analysis-->
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@ -81,7 +81,7 @@
      </td>
  <% end%>

-  <% my_score = student_work_score(student_work,User.current) %>
+  <% my_score = student_work_score(student_work,User.current,3) %>
  <td class="hworkList70 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10">
    <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
  </td>
--- a/app/views/student_work/_student_work_score.html.erb
+++ b/app/views/student_work/_student_work_score.html.erb
@ -1,5 +1,5 @@
 <ul class="ping_box_ul <%= is_last ? '' : 'ping_line'%> fl">
-  <% show_real_name = @is_teacher || score.user == User.current || score.user.allowed_to?(:as_teacher,@course) %>
+  <% show_real_name = @is_teacher || score.user == User.current || score.user.allowed_to?(:as_teacher,@course) || 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" %>
  <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" %>
--- a/app/views/student_work/_work_information.html.erb
+++ b/app/views/student_work/_work_information.html.erb
@ -6,7 +6,7 @@
    </p>
    <div class="f14 mt5" style="max-width: 425px; color:#808181; max-height:300px; overflow: auto;">
      <div class="fb fl dis">作品描述：</div>
-      <div class="upload_img fl" style="max-width: 330px;"><%=@student_work.description.html_safe %></div>
+      <div id="worksDescription" class="upload_img fl" style="max-width: 330px;"><%=@student_work.description.html_safe %></div>
      <div class="cl"></div>
    </div>
    <p class="mt5">
--- a/app/views/syllabuses/_syllabus_course_list.html.erb
+++ b/app/views/syllabuses/_syllabus_course_list.html.erb
@ -27,7 +27,7 @@
              <span class="<%= course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
              <div class="cl"></div>
              <p class="sy_cgrey">
-                <span class=" mr15">主讲老师：<%=link_to course.teacher.show_name, user_path(course.teacher), :class => 'sy_cblue' %></span>
+                <span class=" mr15">创建老师：<%=link_to course.teacher.show_name, user_path(course.teacher), :class => 'sy_cblue' %></span>
                <% if User.current.admin? || User.current.allowed_to?(:as_teacher,course) %>
                    <% homework_num = course.homework_commons.count %>
                <% else %>
--- a/app/views/syllabuses/edit_syllabus_eng_name.js.erb
+++ b/app/views/syllabuses/edit_syllabus_eng_name.js.erb
@ -1,3 +1,4 @@
 $("#syllabus_eng_name_show").html("<%= escape_javascript render :partial => 'layouts/syllabus_eng_name', :locals => {:syllabus => @syllabus} %>");
 $("#syllabus_eng_name_show").show();
+$("#syllabus_edit_ng_name_png").show();
 $("#syllabus_eng_name_edit").hide();
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@ -215,15 +215,18 @@
                </script>

              <div class="mr10 mb10 mt10 fl w100 fontGrey2" style="text-align: center;">
-                <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
-                    <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %>
-                <% else %>
-                    <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
-                <% end %>
                <% com_time = project.project_score.commit_time %>
                <% forge_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
-                <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(forge_time) ? com_time : forge_time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
+                    <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像", :target => '_blank' %>
+                    <p class="mh18 hidden"><%=link_to (User.find project.user_id).show_name+"(组长)", project_path(project.id,:host=>Setting.host_name), :target => '_blank', :title => "#{(User.find project.user_id).show_name}(组长)" %></p>
+                    <% update_time = time_from_now !com_time.nil? && format_time(com_time) > format_time(forge_time) ? com_time : forge_time %>
+                    <p class="mh18 hidden"><%=link_to update_time+"  "+project.project_score.changeset_num.to_s+"提交", project_path(project.id,:host=>Setting.host_name), :target => '_blank', :title => "#{update_time}  #{project.project_score.changeset_num.to_s}提交" %></p>
+                <% else %>
+                    <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像",:title => "私有项目不可访问") %>
+                    <p class="mh18 hidden" title="私有项目不可访问"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
+                    <p class="mh18 hidden" title="私有项目不可访问"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(forge_time) ? com_time : forge_time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                <% end %>
                <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                  项目名称：<%=project.name %><br />
                  创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
@ -295,7 +298,7 @@
    <% comments = activity.journals_for_messages.reorder("created_on desc").limit(3) %>
    <% if count > 0 %>
        <div class="" id="reply_div_<%= user_activity_id %>">
-          <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'HomeworkCommon', :is_in_course => -1,:course_activity=>course_activity, :is_teacher => is_teacher, :user_activity_id => user_activity_id} %>
+          <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'HomeworkCommon', :is_in_course => -1,:course_activity=>course_activity, :is_teacher => is_teacher, :user_activity_id => user_activity_id, :activity_id => activity.id} %>
        </div>
    <% end %>

--- a/app/views/users/_message_replies.html.erb
+++ b/app/views/users/_message_replies.html.erb
@ -10,7 +10,7 @@
        <div class="homepagePostReplyPortrait">
          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
        </div>
-        <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=activity_id %>_<%=comment.id %>').show();" onmouseout="$('#delete_reply_<%=activity_id %>_<%=comment.id %>').hide();">
          <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>

          <% if !comment.content_detail.blank? %>
@ -33,13 +33,14 @@
                                    :title => l(:button_reply)) %>
                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
                    </span>
-                    <% if comment.course_destroyable_by?(User.current) %>
+                    <% if comment.course_destroyable_by?(User.current) || comment.destroyable_by?(User.current) %>
                      <%= link_to(
                                  l(:button_delete),
                                  delete_board_message_path(comment,:board_id =>comment.board.id, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board),
                                  :method => :post,
                                  :remote => true,
-                                  :class => 'fr mr20',
+                                  :id => "delete_reply_#{activity_id}_#{comment.id}",
+                                  :class => 'fr mr20 undis',
                                  :data => {:confirm => l(:text_are_you_sure)},
                                  :title => l(:button_delete)
                          ) %>
@ -56,7 +57,7 @@
                    </span>
                      <% if comment.creator_user == User.current || User.current.admin? %>
                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user, :user_activity_id => user_activity_id, :activity_id => activity_id},
-                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                                    :id => "delete_reply_#{activity_id}_#{comment.id}",:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20 undis", :title => l(:button_delete))  %>
                      <% end %>
                  <% elsif type == 'OrgDocumentComment' %>
                      <span style="position: relative" class="fr mr20">
@ -74,7 +75,8 @@
                                  {:controller => 'org_document_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id},
                                  :method => :delete,
                                  :remote => true,
-                                  :class => 'fr mr20',
+                                  :id => "delete_reply_#{activity_id}_#{comment.id}",
+                                  :class => 'fr mr20 undis',
                                  :data => {:confirm => l(:text_are_you_sure)},
                                  :title => l(:button_delete)) %>
                      <% end %>
@ -94,7 +96,8 @@
                                  {:controller => 'blog_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id, :homepage => homepage, :user_id => user_id},
                                  :method => :delete,
                                  :remote => true,
-                                  :class => 'fr mr20',
+                                  :id => "delete_reply_#{activity_id}_#{comment.id}",
+                                  :class => 'fr mr20 undis',
                                  :data => {:confirm => l(:text_are_you_sure)},
                                  :title => l(:button_delete)) %>
                      <% end %>
--- a/app/views/users/_news_replies.html.erb
+++ b/app/views/users/_news_replies.html.erb
@ -10,7 +10,7 @@
        <div class="homepagePostReplyPortrait">
          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
        </div>
-        <div class="homepagePostReplyDes">
+        <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=activity_id %>_<%=comment.id %>').show();" onmouseout="$('#delete_reply_<%=activity_id %>_<%=comment.id %>').hide();">
          <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>

          <% if !comment.content_detail.blank? || comment.class == Journal %>
@ -44,7 +44,7 @@
                        </span>
                        <% if User.current.admin? ||is_teacher || comment.user == User.current%>
                            <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity},
-                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                                        :id => "delete_reply_#{activity_id}_#{comment.id}",:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20 undis", :title => l(:button_delete))  %>
                        <% end %>
                    <% elsif type == 'News' %>
                        <span style="position: relative" class="fr mr20">
@ -56,8 +56,9 @@
                                    :title => l(:button_reply)) %>
                            <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
                        </span>
+                        <% news = News.find(activity_id) %>
                        <%= link_to('删除', {:controller => 'comments', :action => 'destroy', :id => activity_id, :comment_id => comment, :user_activity_id => user_activity_id},
-                                  :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) if News.find(activity_id).author == User.current %>
+                                    :id => "delete_reply_#{activity_id}_#{comment.id}",:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20 undis", :title => l(:button_delete)) if (User.current.allowed_to?(:manage_news, news.course) || User.current.allowed_to?(:manage_news, news.project)) %>
                    <% elsif type == 'Issue' %>
                        <span style="position: relative" class="fr mr20">
                            <%= link_to(
@ -74,7 +75,8 @@
                                  :method => 'get',
                                  :confirm => l(:text_are_you_sure),
                                  :remote=>true,
-                                  :class => 'fr mr20',
+                                  :id => "delete_reply_#{activity_id}_#{comment.id}",
+                                  :class => 'fr mr20 undis',
                                  :title => l(:button_delete)
                          ) if comment.user_id == User.current.id %>
                    <% elsif type == 'Syllabus' %>
@ -88,8 +90,8 @@
                          <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
                        </span>
                      <% if User.current.admin? || User.current == Syllabus.find(activity_id).user || comment.user == User.current%>
-                            <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user},
-                                        :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                            <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user},:id => "delete_reply_#{activity_id}_#{comment.id}",
+                                        :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20 undis", :title => l(:button_delete))  %>
                        <% end %>
                    <% end %>
                </span>
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@ -225,15 +225,18 @@
                  </script>

                  <div class="mr10 mb10 mt10 fl w100 fontGrey2" style="text-align: center;">
-                    <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
-                        <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %>
-                    <% else %>
-                        <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %>
-                    <% end %>
                    <% com_time = project.project_score.commit_time %>
                    <% forge_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
-                    <p class="mh18"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                    <p class="mh18"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(forge_time) ? com_time : forge_time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                    <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
+                        <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像", :target => '_blank' %>
+                        <p class="mh18 hidden"><%=link_to (User.find project.user_id).show_name+"(组长)", project_path(project.id,:host=>Setting.host_name), :target => '_blank', :title => "#{(User.find project.user_id).show_name}(组长)" %></p>
+                        <% update_time = time_from_now !com_time.nil? && format_time(com_time) > format_time(forge_time) ? com_time : forge_time %>
+                        <p class="mh18 hidden"><%=link_to update_time+"  "+project.project_score.changeset_num.to_s+"提交", project_path(project.id,:host=>Setting.host_name), :target => '_blank', :title => "#{update_time}  #{project.project_score.changeset_num.to_s}提交" %></p>
+                    <% else %>
+                        <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像",:title => "私有项目不可访问") %>
+                        <p class="mh18 hidden" title="私有项目不可访问"><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
+                        <p class="mh18 hidden" title="私有项目不可访问"><%=time_from_now !com_time.nil? && format_time(com_time) > format_time(forge_time) ? com_time : forge_time %>&nbsp;&nbsp;<%= project.project_score.changeset_num %>提交</p>
+                    <% end %>
                    <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
                      项目名称：<%=project.name %><br />
                      创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
@ -307,7 +310,7 @@
    <% comments = homework_common.journals_for_messages.reorder("created_on desc").limit(3) %>
    <% if count > 0 %>
        <div class="" id="reply_div_<%= homework_common.id %>">
-          <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'HomeworkCommon', :is_in_course => is_in_course,:course_activity=>-1, :is_teacher => is_teacher, :user_activity_id => -1} %>
+          <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'HomeworkCommon', :is_in_course => is_in_course,:course_activity=>-1, :is_teacher => is_teacher, :user_activity_id => -1, :activity_id => homework_common.id} %>
        </div>
    <% end %>

--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@ -130,7 +130,7 @@
            </ul>
        <% end %>
    <% end %>
-    <% if ma.forge_message_type == "Journal" %>
+    <% if ma.forge_message_type == "Journal" && ma.forge_message %>
        <ul class="homepageNewsList fl">
          <li class="homepageNewsPortrait fl">
            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %></a>
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@ -1,5 +1,5 @@
 <% if params[:type] == 'HomeworkCommon' %>
-$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :type => @type, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :type => @type, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id, :activity_id => params[:id].to_i}) %>');
 <% elsif params[:type] == 'JournalsForMessage' %>
 $('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id =>params[:id].to_i}) %>');
 <% elsif params[:type] == 'Message' %>
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@ -34,7 +34,9 @@
        <ul class="homepagePostTypeProject fl">
          <li class="f14">更多</li>
          <li class="mt-4"><%= link_to "个人留言", {:controller => "users", :action => "show", :type => "user_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-          <li class="mt-4"><%= link_to @user == User.current ? "我的动态" : "他的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%>
+          <% if @user == User.current %>
+            <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%>
+          <% end %>
          <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
        </ul>
      </li>
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@ -39,15 +39,15 @@
          <span id="reply_praise_count_<%=reply.id %>">
            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
          </span>
-          <% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
-              <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
-                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
-          <% end %>
          <% if reply_allow %>
              <%#= link_to l(:button_reply),'',
                                     {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
              <%= link_to l(:button_reply),'javascript:;',{:nhname=>"reply_btn"} %>
          <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
+          <% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
+              <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
+                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
+          <% end %>
        </div>
        <div class="cl"></div>
        <div id='<%=id%>' class="respond-form">
--- a/public/assets/kindeditor/at/jquery.atwho.js
+++ b/public/assets/kindeditor/at/jquery.atwho.js
@ -1140,7 +1140,7 @@ $.fn.atwho["default"] = {
  searchKey: "name",
  suffix: void 0,
  hideWithoutSuffix: false,
-  startWithSpace: true,
+  startWithSpace: false,
  highlightFirst: true,
  limit: 5,
  maxLen: 20,
--- a/public/assets/wechat/join_class.html
+++ b/public/assets/wechat/join_class.html
@ -13,6 +13,7 @@
        <div class="f12 c-grey6 mt10 ml15">
            <span class="f13 c-grey3">提示</span>
            <ul class="mb15 mt5 ml10 new-tip">
+                <li><span class="project-intro-dot">•</span>邀请码在创建班级时产生，请向班级老师获取</li>
                <li><span class="project-intro-dot">•</span>教师、助教角色需要班级管理员审批</li>
                <li><span class="project-intro-dot">•</span>学生角色无需管理员审批</li>
            </ul>
--- a/public/assets/wechat/join_project.html
+++ b/public/assets/wechat/join_project.html
@ -12,6 +12,7 @@
        <div class="f12 c-grey6 mt10 ml15">
            <span class="f13 c-grey3">提示</span>
            <ul class="mb15 mt5 ml10 new-tip">
+                <li><span class="project-intro-dot">•</span>邀请码在创建项目时产生，请向项目管理员获取</li>
                <li><span class="project-intro-dot">•</span>管理人员、开发人员角色需要项目管理员审批</li>
                <li><span class="project-intro-dot">•</span>报告人员角色无需管理员审批</li>
            </ul>
--- a/public/images/syllabus/icons_syllabus.png
+++ b/public/images/syllabus/icons_syllabus.png
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@ -25,28 +25,28 @@ function description_show_hide(id){

 //名片的显示
 function user_card_show_hide() {
-    $(".homepagePostPortrait").mouseover(function(){
-        $(".userCard").css("display","none");
-        onImage = true;
-        $(this).children(".userCard").css("display","block");
-    });
-    $(".homepagePostPortrait").mouseout(function(){
-        var cur = $(this);
-        onImage = false;
-        setTimeout(function(){
-            if (onUserCard == false && onImage == false){
-                $(cur).children(".userCard").css("display", "none");
-            }
-        }, 500);
-    });
-    $(".userCard").mouseover(function(){
-        onUserCard = true;
-        $(this).css("display","block");
-    });
-    $(".userCard").mouseout(function(){
-        onUserCard = false;
-        $(this).css("display","none");
-    });
+//    $(".homepagePostPortrait").mouseover(function(){
+//        $(".userCard").css("display","none");
+//        onImage = true;
+//        $(this).children(".userCard").css("display","block");
+//    });
+//    $(".homepagePostPortrait").mouseout(function(){
+//        var cur = $(this);
+//        onImage = false;
+//        setTimeout(function(){
+//            if (onUserCard == false && onImage == false){
+//                $(cur).children(".userCard").css("display", "none");
+//            }
+//        }, 500);
+//    });
+//    $(".userCard").mouseover(function(){
+//        onUserCard = true;
+//        $(this).css("display","block");
+//    });
+//    $(".userCard").mouseout(function(){
+//        onUserCard = false;
+//        $(this).css("display","none");
+//    });
 }

 function cleanArray (actual){
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@ -537,3 +537,6 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 /*20160520作品列表table*/
 .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
 .hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;}
+
+/*20160901作品信息确认*/
+#worksDescription p {word-wrap:break-word;}
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@ -116,6 +116,7 @@ a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px n
 .softwareIcon {background:url(/images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;}

 /*意见反馈*/
+.qr-code-border {border:2px solid #269ac9;}
 html{ overflow-x:hidden;}
 .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
 .side_content{width:154px; height:auto; overflow:hidden; float:left; }
@ -750,6 +751,7 @@ a:hover.st_add{ color:#ff8e15;}
 .classbox_on{ border:1px solid #f8df8c; background:#f6f098;   padding:0 3px; float:left; margin-left:15px;}
 .classbox_on a{ color:#716cad;}
 .st_list_score {width:105px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; vertical-align:middle; font-size:12px; text-align:center;}
+.st_info_block {width:150px; display:inline-block; vertical-align:bottom;}

 /* 创建作品 homework,项目配置 */
 .hwork_new{  color:#4c4c4c;}
@ -1385,7 +1387,7 @@ a.content-username:hover{ color:#297fb8;}
 .orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
 .orig_user{ margin:10px 15px 10px 5px;}
 .orig_user span{ color:#999; padding-right:5px;}
-.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
+.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; word-wrap:break-word; }
 .orig_content img {max-width:100%;}
 .orig_right{ width:80%; margin-top:5px;}
 a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@ -499,7 +499,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
 .user_leftnav{ width:240px;}
 .users_accordion li > a {
    display: block;
-    padding: 0 10px 0 32px;
+    padding: 0 25px 0 32px;
    height:49px;
    line-height:49px;
    color: #333;
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@ -74,8 +74,8 @@ input.syllabus_input_min{

 /*课程大纲-课程列表*/
 .icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;}
-.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -53px no-repeat; width:20px; height:23px; display:block;  cursor:pointer; }
-.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -53px no-repeat; width:20px; height:23px; display:block;  }
+.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -50px no-repeat; width:20px; height:23px; display:block;  cursor:pointer; }
+.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -52px no-repeat; width:20px; height:23px; display:block;  }
 .syllabus_courses_box {position:relative;}
 .icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; position:absolute; right:10px; top:10px; }
 .icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; }
@ -113,12 +113,13 @@ a.syllabus_class_title{ font-size:14px; color:#333; max-width:480px; margin-bott
 /* 课程大纲头部 */
 .sy_top{
    background:#f5f5f5;
-    width: 100%;
+    width: 1000px;
    height: 138px;
+    margin: 0 auto;
 }
 .sy_top_con{
    background: url(../images/sy/bg_sy.jpg) no-repeat;
-    width: 1280px;
+    width: 1000px;
    margin: 0 auto;
    height: 108px;
    text-align:center;