diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb
index f5e3314bb..7220eec27 100644
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@@ -91,8 +91,12 @@ class BlogCommentsController < ApplicationController
 
   def edit
     @article = BlogComment.find(params[:id])
-    respond_to do |format|
-      format.html {render :layout=>'new_base_user'}
+    if User.current.admin? || User.current.id == @article.author_id
+      respond_to do |format|
+        format.html { render :layout => 'new_base_user' }
+      end
+    else
+      render_403
     end
   end
 
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f06a782bc..24f5fd52c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -902,10 +902,7 @@ class CoursesController < ApplicationController
   end
 
   def feedback
-    @course.journals_for_messages.each do |messages|
-      query = messages.course_messages.where("user_id = ?", User.current.id)
-      query.update_all(:viewed => true);
-    end
+    CourseMessage.where("user_id = ? and course_id = ?", User.current, @course.id).update_all(:viewed => true)
 
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 9f754a0fc..3532a9e4c 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -1,378 +1,380 @@
-class HomeworkCommonController < ApplicationController
-  require 'net/http'
-  require 'json'
-  require "base64"
-  layout "base_courses"
-
-  include StudentWorkHelper
-  before_filter :find_course, :only => [:index,:new,:create]
-  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
-  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
-  before_filter :member_of_course, :only => [:index]
-
-  def index
-    @new_homework = HomeworkCommon.new
-    @new_homework.homework_detail_manual = HomeworkDetailManual.new
-    @new_homework.course = @course
-    @page = params[:page] ? params[:page].to_i + 1 : 0
-    @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
-    if @is_teacher
-      @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
-    else
-      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
-    end
-    @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
-    @is_new = params[:is_new]
-
-    #设置at已读
-    @homeworks.each do |homework|
-      homework.journals_for_messages.each do |j|
-        User.current.at_messages.unviewed('JournalsForMessage', j.id).each {|x| x.viewed!}
-      end
-    end
-
-    respond_to do |format|
-      format.js
-      format.html
-    end
-  end
-
-  #新建作业，在个人作业列表创建作业
-  def new
-    render_404
-  end
-
-  #新建作业，在个人作业列表创建作业
-  def create
-    redirect_to user_homeworks_user_path(User.current.id)
-  end
-
-  def edit
-    @user = User.current
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
-    respond_to do |format|
-      format.html{render :layout => 'new_base_user'}
-    end
-  end
-
-  def update
-    if params[:homework_common]
-      @homework.name = params[:homework_common][:name]
-      @homework.description = params[:homework_common][:description]
-      if params[:homework_common][:publish_time] == ""
-        @homework.publish_time = Date.today
-      else
-        @homework.publish_time = params[:homework_common][:publish_time]
-      end
-      @homework.end_time = params[:homework_common][:end_time] || Time.now
-      @homework.course_id = params[:course_id]
-      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
-
-      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
-      if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
-        homework_detail_manual.comment_status = 1
-      end
-      homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? @homework.end_time + 7 : params[:evaluation_start]
-      homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
-
-      @homework.save_attachments(params[:attachments])
-      render_attachment_warning_if_needed(@homework)
-
-      #编程作业相关属性
-      if @homework.homework_type == 2
-          @homework.homework_detail_programing ||= HomeworkDetailPrograming.new
-          @homework_detail_programing = @homework.homework_detail_programing
-          @homework_detail_programing.language = params[:language_type].to_i
-
-          @homework.homework_tests.delete_all
-          inputs = params[:program][:input]
-          if Array === inputs
-            inputs.each_with_index do |val, i|
-              @homework.homework_tests << HomeworkTest.new(
-                  input: val,
-                  output: params[:program][:output][i]
-              )
-            end
-          end
-      end
-
-      #分组作业
-      if @homework.homework_type == 3
-        @homework.homework_detail_group ||= HomeworkDetailGroup.new
-        @homework_detail_group = @homework.homework_detail_group
-        @homework_detail_group.min_num = params[:min_num].to_i
-        @homework_detail_group.max_num = params[:max_num].to_i
-        @homework_detail_group.base_on_project = params[:base_on_project].to_i
-      end
-
-      if @homework.save
-        @homework_detail_manual.save if @homework_detail_manual
-        @homework_detail_programing.save if @homework_detail_programing
-        @homework_detail_group.save if @homework_detail_group
-
-        if params[:is_in_course] == "1"
-          redirect_to homework_common_index_path(:course => @course.id)
-        elsif params[:is_in_course] == "0"
-          redirect_to user_homeworks_user_path(User.current.id)
-        elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
-          redirect_to user_path(User.current.id)
-        elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
-          redirect_to course_path(@course.id)
-        end
-      end
-    end
-  end
-
-  def destroy
-    if @homework.destroy
-      respond_to do |format|
-        format.html {
-          if params[:is_in_course] == "1"
-            redirect_to homework_common_index_path(:course => @course.id)
-          elsif params[:is_in_course] == "0"
-            redirect_to user_homeworks_user_path(User.current.id)
-          elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
-            redirect_to user_path(User.current.id)
-          elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
-            redirect_to course_path(@course.id)
-          end
-        }
-      end
-    end
-  end
-
-  #开启匿评
-  #statue 1:启动成功，2：启动失败，作业总数大于等于2份时才能启动匿评，3:已开启匿评，请务重复开启,4:没有开启匿评的权限
-  def start_anonymous_comment
-    @statue = 4 and return unless User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
-    @statue = 5 and return if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-    if @homework_detail_manual.comment_status == 1
-      student_works = @homework.student_works
-      if student_works && student_works.size >= 2
-        if @homework.homework_type == 3
-          student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
-          student_work_projects.each_with_index do |pro_work, pro_index|
-            n = @homework_detail_manual.evaluation_num
-            n = n < student_works.size ? n : student_works.size - 1
-            work_index = -1
-            student_works.each_with_index do |stu_work, stu_index|
-              if stu_work.id.to_i == pro_work.student_work_id.to_i
-                work_index = stu_index
-              end
-            end
-            assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
-            assigned_homeworks.each do |h|
-              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
-              student_works_evaluation_distributions.save
-            end
-          end
-        else
-          student_works.each_with_index do |work, index|
-            user = work.user
-            n = @homework_detail_manual.evaluation_num
-            n = n < student_works.size ? n : student_works.size - 1
-            assigned_homeworks = get_assigned_homeworks(student_works, n, index)
-            assigned_homeworks.each do |h|
-              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
-              student_works_evaluation_distributions.save
-            end
-          end
-        end
-        @homework_detail_manual.update_column('comment_status', 2)
-        @homework_detail_manual.update_column('evaluation_start', Date.today)
-        @statue = 1
-        # 匿评开启消息邮件通知
-        send_message_anonymous_comment(@homework, m_status = 2)
-        Mailer.send_mail_anonymous_comment_open(@homework).deliver
-      else
-        @statue = 2
-
-    end
-    else
-      @statue = 3
-    end
-    @user_activity_id = params[:user_activity_id].to_i
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
-  end
-
-  #关闭匿评
-  def stop_anonymous_comment
-    @homework_detail_manual.update_column('comment_status', 3)
-    @homework_detail_manual.update_column('evaluation_end', Date.today)
-    #计算缺评扣分
-    work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
-    @homework.student_works.each do |student_work|
-      absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
-      student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
-      student_work.save
-    end
-    # 匿评关闭消息邮件通知
-    send_message_anonymous_comment(@homework, m_status = 3)
-    Mailer.send_mail_anonymous_comment_close(@homework).deliver
-    @user_activity_id = params[:user_activity_id].to_i
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  # 开启/关闭匿评消息通知
-  def send_message_anonymous_comment(homework, m_status )
-     # status 标记匿评状态 1为关闭 0为开启
-     course = homework.course
-     course.members.each do |m|
-       @homework.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => m_status)
-     end
-  end
-  #提示
-  def alert_anonymous_comment
-    @cur_size = 0
-    @totle_size = 0
-    if @homework_detail_manual.comment_status == 1
-      @totle_size = @course.student.count
-      @cur_size = @homework.student_works.size
-    elsif @homework_detail_manual.comment_status == 2
-      @homework.student_works.map { |work| @totle_size += work.student_works_evaluation_distributions.count}
-      @cur_size = 0
-      @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
-    end
-    @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
-    @user_activity_id = params[:user_activity_id].to_i
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def alert_forbidden_anonymous_comment
-    if params[:user_activity_id]
-      @user_activity_id = params[:user_activity_id]
-    else
-      @user_activity_id = -1
-    end
-    @is_in_course = params[:is_in_course] if params[:is_in_course]
-    @course_activity = params[:course_activity] if params[:course_Activity]
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def open_student_works
-    if @homework.is_open == 0
-      @homework.update_attribute(:is_open, 1)
-    else
-      @homework.update_attribute(:is_open, 0)
-    end
-    @user_activity_id = params[:user_activity_id]
-    @is_in_course = params[:is_in_course] if params[:is_in_course]
-    @course_activity = params[:course_activity] if params[:course_Activity]
-  end
-
-  def alert_open_student_works
-    if params[:user_activity_id]
-      @user_activity_id = params[:user_activity_id]
-    else
-      @user_activity_id = -1
-    end
-    @is_in_course = params[:is_in_course] if params[:is_in_course]
-    @course_activity = params[:course_activity] if params[:course_Activity]
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def programing_test
-    test = {language:params[:language],src:Base64.encode64(params[:src]),input:[params[:input]],output:[params[:output]]}
-    @index = params[:index]
-    uri = URI('http://192.168.80.21:8080/api/realtime.json')
-    body = test.to_json
-    res = Net::HTTP.new(uri.host, uri.port).start do |client|
-      request                 = Net::HTTP::Post.new(uri.path)
-      request.body            = body
-      request["Content-Type"] = "application/json"
-      client.request(request)
-    end
-    result = JSON.parse(res.body)
-    @err_msg = result["compile_error_msg"]
-    result["results"].each do |re|
-      @result = re["status"]
-    end
-  end
-
-  #启动匿评参数设置
-  def start_evaluation_set
-    if params[:user_activity_id]
-      @user_activity_id = params[:user_activity_id]
-    else
-      @user_activity_id = -1
-    end
-    @is_in_course = params[:is_in_course]
-    @course_activity = params[:course_activity].to_i
-  end
-
-  #设置匿评参数
-  def set_evaluation_attr
-    if @homework_detail_manual
-      unless params[:evaluation_start].to_s == @homework_detail_manual.evaluation_start.to_s
-        @homework_detail_manual.evaluation_start = params[:evaluation_start]
-      end
-
-      unless @homework_detail_manual.evaluation_end.to_s == params[:evaluation_end].to_s
-        @homework_detail_manual.evaluation_end = params[:evaluation_end]
-      end
-
-      @homework_detail_manual.evaluation_num = params[:evaluation_num]
-      @homework_detail_manual.save
-      @user_activity_id = params[:user_activity_id].to_i
-      @is_in_course = params[:is_in_course].to_i
-      @course_activity = params[:course_activity].to_i
-    end
-  end
-
-  #评分设置
-  def score_rule_set
-    if params[:user_activity_id]
-      @user_activity_id = params[:user_activity_id]
-    else
-      @user_activity_id = -1
-    end
-    @is_in_course = params[:is_in_course]
-    @course_activity = params[:course_activity].to_i
-  end
-
-  private
-  #获取课程
-  def find_course
-    @course = Course.find params[:course]
-  rescue
-    render_404
-  end
-  #获取作业
-  def find_homework
-    @homework = HomeworkCommon.find params[:id]
-    @homework_detail_manual = @homework.homework_detail_manual
-    @homework_detail_programing = @homework.homework_detail_programing
-    @homework_detail_group = @homework.homework_detail_group
-    @course = @homework.course
-  rescue
-    render_404
-  end
-  #是不是课程的老师
-  def teacher_of_course
-    render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-  end
-
-  #当前用户是不是课程的成员
-  def member_of_course
-    render_403 unless @course.is_public==1 || User.current.member_of_course?(@course) || User.current.admin?
-  end
-
-  def get_assigned_homeworks(student_works, n, index)
-    student_works += student_works
-    student_works[index + 1 .. index + n]
-  end
-end
+class HomeworkCommonController < ApplicationController
+  require 'net/http'
+  require 'json'
+  require "base64"
+  layout "base_courses"
+
+  include StudentWorkHelper
+  before_filter :find_course, :only => [:index,:new,:create]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
+  before_filter :member_of_course, :only => [:index]
+
+  def index
+    @new_homework = HomeworkCommon.new
+    @new_homework.homework_detail_manual = HomeworkDetailManual.new
+    @new_homework.course = @course
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
+    if @is_teacher
+      @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
+    else
+      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
+    end
+    @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
+    @is_new = params[:is_new]
+
+    #设置at已读
+    @homeworks.each do |homework|
+      homework.journals_for_messages.each do |j|
+        User.current.at_messages.unviewed('JournalsForMessage', j.id).each {|x| x.viewed!}
+      end
+    end
+
+    respond_to do |format|
+      format.js
+      format.html
+    end
+  end
+
+  #新建作业，在个人作业列表创建作业
+  def new
+    render_404
+  end
+
+  #新建作业，在个人作业列表创建作业
+  def create
+    redirect_to user_homeworks_user_path(User.current.id)
+  end
+
+  def edit
+    @user = User.current
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+    respond_to do |format|
+      format.html{render :layout => 'new_base_user'}
+    end
+  end
+
+  def update
+    if params[:homework_common]
+      @homework.name = params[:homework_common][:name]
+      @homework.description = params[:homework_common][:description]
+      if params[:homework_common][:publish_time] == ""
+        @homework.publish_time = Date.today
+      else
+        @homework.publish_time = params[:homework_common][:publish_time]
+      end
+      @homework.end_time = params[:homework_common][:end_time] || Time.now
+      @homework.course_id = params[:course_id]
+      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
+
+      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
+      if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
+        homework_detail_manual.comment_status = 1
+      end
+      eval_start = homework_detail_manual.evaluation_start
+      if eval_start <= @homework.end_time && homework_detail_manual.comment_status <= 1
+        homework_detail_manual.evaluation_start = @homework.end_time + 7
+        homework_detail_manual.evaluation_end = homework_detail_manual.evaluation_start + 7
+      end
+      @homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(@homework)
+
+      #编程作业相关属性
+      if @homework.homework_type == 2
+          @homework.homework_detail_programing ||= HomeworkDetailPrograming.new
+          @homework_detail_programing = @homework.homework_detail_programing
+          @homework_detail_programing.language = params[:language_type].to_i
+
+          @homework.homework_tests.delete_all
+          inputs = params[:program][:input]
+          if Array === inputs
+            inputs.each_with_index do |val, i|
+              @homework.homework_tests << HomeworkTest.new(
+                  input: val,
+                  output: params[:program][:output][i]
+              )
+            end
+          end
+      end
+
+      #分组作业
+      if @homework.homework_type == 3
+        @homework.homework_detail_group ||= HomeworkDetailGroup.new
+        @homework_detail_group = @homework.homework_detail_group
+        @homework_detail_group.min_num = params[:min_num].to_i
+        @homework_detail_group.max_num = params[:max_num].to_i
+        @homework_detail_group.base_on_project = params[:base_on_project].to_i
+      end
+
+      if @homework.save
+        @homework_detail_manual.save if @homework_detail_manual
+        @homework_detail_programing.save if @homework_detail_programing
+        @homework_detail_group.save if @homework_detail_group
+
+        if params[:is_in_course] == "1"
+          redirect_to homework_common_index_path(:course => @course.id)
+        elsif params[:is_in_course] == "0"
+          redirect_to user_homeworks_user_path(User.current.id)
+        elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
+          redirect_to user_path(User.current.id)
+        elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
+          redirect_to course_path(@course.id)
+        end
+      end
+    end
+  end
+
+  def destroy
+    if @homework.destroy
+      respond_to do |format|
+        format.html {
+          if params[:is_in_course] == "1"
+            redirect_to homework_common_index_path(:course => @course.id)
+          elsif params[:is_in_course] == "0"
+            redirect_to user_homeworks_user_path(User.current.id)
+          elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
+            redirect_to user_path(User.current.id)
+          elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
+            redirect_to course_path(@course.id)
+          end
+        }
+      end
+    end
+  end
+
+  #开启匿评
+  #statue 1:启动成功，2：启动失败，作业总数大于等于2份时才能启动匿评，3:已开启匿评，请务重复开启,4:没有开启匿评的权限
+  def start_anonymous_comment
+    @statue = 4 and return unless User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
+    @statue = 5 and return if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+    if @homework_detail_manual.comment_status == 1
+      student_works = @homework.student_works
+      if student_works && student_works.size >= 2
+        if @homework.homework_type == 3
+          student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
+          student_work_projects.each_with_index do |pro_work, pro_index|
+            n = @homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            work_index = -1
+            student_works.each_with_index do |stu_work, stu_index|
+              if stu_work.id.to_i == pro_work.student_work_id.to_i
+                work_index = stu_index
+              end
+            end
+            assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
+          end
+        else
+          student_works.each_with_index do |work, index|
+            user = work.user
+            n = @homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
+          end
+        end
+        @homework_detail_manual.update_column('comment_status', 2)
+        @homework_detail_manual.update_column('evaluation_start', Date.today)
+        @statue = 1
+        # 匿评开启消息邮件通知
+        send_message_anonymous_comment(@homework, m_status = 2)
+        Mailer.send_mail_anonymous_comment_open(@homework).deliver
+      else
+        @statue = 2
+
+    end
+    else
+      @statue = 3
+    end
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+  end
+
+  #关闭匿评
+  def stop_anonymous_comment
+    @homework_detail_manual.update_column('comment_status', 3)
+    @homework_detail_manual.update_column('evaluation_end', Date.today)
+    #计算缺评扣分
+    work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
+    @homework.student_works.each do |student_work|
+      absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+      student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
+      student_work.save
+    end
+    # 匿评关闭消息邮件通知
+    send_message_anonymous_comment(@homework, m_status = 3)
+    Mailer.send_mail_anonymous_comment_close(@homework).deliver
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  # 开启/关闭匿评消息通知
+  def send_message_anonymous_comment(homework, m_status )
+     # status 标记匿评状态 1为关闭 0为开启
+     course = homework.course
+     course.members.each do |m|
+       @homework.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => m_status)
+     end
+  end
+  #提示
+  def alert_anonymous_comment
+    @cur_size = 0
+    @totle_size = 0
+    if @homework_detail_manual.comment_status == 1
+      @totle_size = @course.student.count
+      @cur_size = @homework.student_works.size
+    elsif @homework_detail_manual.comment_status == 2
+      @homework.student_works.map { |work| @totle_size += work.student_works_evaluation_distributions.count}
+      @cur_size = 0
+      @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
+    end
+    @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def alert_forbidden_anonymous_comment
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def open_student_works
+    if @homework.is_open == 0
+      @homework.update_attribute(:is_open, 1)
+    else
+      @homework.update_attribute(:is_open, 0)
+    end
+    @user_activity_id = params[:user_activity_id]
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+  end
+
+  def alert_open_student_works
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def programing_test
+    test = {language:params[:language],src:Base64.encode64(params[:src]),input:[params[:input]],output:[params[:output]]}
+    @index = params[:index]
+    uri = URI('http://192.168.80.21:8080/api/realtime.json')
+    body = test.to_json
+    res = Net::HTTP.new(uri.host, uri.port).start do |client|
+      request                 = Net::HTTP::Post.new(uri.path)
+      request.body            = body
+      request["Content-Type"] = "application/json"
+      client.request(request)
+    end
+    result = JSON.parse(res.body)
+    @err_msg = result["compile_error_msg"]
+    result["results"].each do |re|
+      @result = re["status"]
+    end
+  end
+
+  #启动匿评参数设置
+  def start_evaluation_set
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course]
+    @course_activity = params[:course_activity].to_i
+  end
+
+  #设置匿评参数
+  def set_evaluation_attr
+    if @homework_detail_manual
+      unless params[:evaluation_start].to_s == @homework_detail_manual.evaluation_start.to_s
+        @homework_detail_manual.evaluation_start = params[:evaluation_start]
+      end
+
+      unless @homework_detail_manual.evaluation_end.to_s == params[:evaluation_end].to_s
+        @homework_detail_manual.evaluation_end = params[:evaluation_end]
+      end
+
+      @homework_detail_manual.evaluation_num = params[:evaluation_num]
+      @homework_detail_manual.save
+      @user_activity_id = params[:user_activity_id].to_i
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
+    end
+  end
+
+  #评分设置
+  def score_rule_set
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course]
+    @course_activity = params[:course_activity].to_i
+  end
+
+  private
+  #获取课程
+  def find_course
+    @course = Course.find params[:course]
+  rescue
+    render_404
+  end
+  #获取作业
+  def find_homework
+    @homework = HomeworkCommon.find params[:id]
+    @homework_detail_manual = @homework.homework_detail_manual
+    @homework_detail_programing = @homework.homework_detail_programing
+    @homework_detail_group = @homework.homework_detail_group
+    @course = @homework.course
+  rescue
+    render_404
+  end
+  #是不是课程的老师
+  def teacher_of_course
+    render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+  end
+
+  #当前用户是不是课程的成员
+  def member_of_course
+    render_403 unless @course.is_public==1 || User.current.member_of_course?(@course) || User.current.admin?
+  end
+
+  def get_assigned_homeworks(student_works, n, index)
+    student_works += student_works
+    student_works[index + 1 .. index + n]
+  end
+end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index eb78c4c5b..44f0d15f4 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -118,6 +118,9 @@ class IssuesController < ApplicationController
   end
 
   def show
+    # 打开编辑内容
+    @is_edit = true unless params[:edit].nil?
+
     # 当前用户查看指派给他的缺陷消息，则设置消息为已读
     query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
     query.update_attribute(:viewed, true) unless query.nil?
@@ -387,6 +390,9 @@ class IssuesController < ApplicationController
   end
 
   def destroy
+    # 增加删除页面类型，如果是个人主页，则返回该主页，项目动态则返回项目动态页眉
+    page_classify = params[:page_classify] unless params[:page_classify].nil?
+    page_id = params[:page_id] unless params[:page_id].nil?
     @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
     if @hours > 0
       case params[:todo]
@@ -415,7 +421,11 @@ class IssuesController < ApplicationController
       end
     end
     respond_to do |format|
-      format.html { redirect_back_or_default _project_issues_path(@project) }
+      if page_classify
+        format.html { redirect_back_or_default _project_issues_path(@project, page_classify, page_id) }
+      else
+        format.html { redirect_back_or_default _project_issues_path(@project) }
+      end
       format.api  { render_api_ok }
     end
   end
diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index f250b46de..d1a8b23dd 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -1,6 +1,6 @@
 class OrgDocumentCommentsController < ApplicationController
   before_filter :find_organization, :only => [:new, :create, :show, :index]
-  helper :attachments
+  helper :attachments,:organizations
   layout 'base_org'
 
   def new
diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 9337c5fd2..ba4c1f18f 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -5,9 +5,8 @@ class OrgSubfieldsController < ApplicationController
   def create
     if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0
       @res = true
-      @subfield = OrgSubfield.create(:name => params[:name])
       @organization = Organization.find(params[:organization_id])
-      @organization.org_subfields << @subfield
+      @subfield = OrgSubfield.create(:name => params[:name], :organization_id => params[:organization_id],:priority => @organization.org_subfields.order("priority").last.priority + 1)
       if !params[:sub_dir].blank?
         sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
               "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
@@ -15,7 +14,7 @@ class OrgSubfieldsController < ApplicationController
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir])
         end
       end
-      @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
+      @subfield.update_attributes(:field_type => params[:field_type])
     else
       @res = false
     end
@@ -125,6 +124,12 @@ class OrgSubfieldsController < ApplicationController
     end
   end
 
+  def update_priority
+    @org_subfield = OrgSubfield.find(params[:id])
+    @org_subfield.update_attribute(:priority, params[:priority].to_i)
+    @organization = @org_subfield.organization
+  end
+
   def show_attachments obj
     @attachments = []
     obj.each do |container|
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 711663c3d..239253d82 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -317,7 +317,7 @@ class OrganizationsController < ApplicationController
     @organization = Organization.find(params[:id])
     admins = User.where("admin=1")
     admins.each do |admin|
-      OrgMessage.create(:user_id => admin.id, :organization_id => @organization.id, :message_type => 'ApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:domain])
+      OrgMessage.create(:user_id => admin.id, :organization_id => @organization.id, :message_type => 'ApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:domain].downcase)
     end
   end
 
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 05c80a9fc..2ced977be 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -300,66 +300,27 @@ class ProjectsController < ApplicationController
     end
     # 统计访问量
     @project.update_attribute(:visits, @project.visits.to_i + 1)
-=begin
-    cond = @project.project_condition(Setting.display_subprojects_issues?)
-    has = {
-      "show_issues" => true ,
-      "show_files" => true,
-      "show_documents" => true,
-      "show_messages" => true,
-      "show_news" => true,
-      "show_bids" => true,
-      "show_contests" => true,
-      "show_wiki_edits"=>true,
-      "show_journals_for_messages" => true
-    }
-    # 读取项目默认展示的动态时间天数
-    @days = Setting.activity_days_default.to_i
-    @date_to ||= Date.today + 1
-    # 时间跨度不能太大，不然很慢，所以删掉了-1.years
-    @date_from = @date_to - @days
-    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-=end
-
     @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
-    # 决定显示所用用户或单个用户活动
-=begin
-    @activity = Redmine::Activity::Fetcher.new(User.current,
-                                                   :project => @project,
-                                                   :with_subprojects => @with_subprojects,
-                                                   :author => @author)
-    @activity.scope_select {|t| !has["show_#{t}"].nil?}
-=end
-
     @page = params[:page] ? params[:page].to_i + 1 : 0
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
       case params[:type]
         when nil
-          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo')",@project).order("updated_at desc").limit(10).offset(@page * 10)
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo', 'Attachment')",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'issue'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'news'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'message'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'attachment'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Attachment'",@project).order("updated_at desc").limit(10).offset(@page * 10)
       end
-
-      #events = @activity.events(@date_from, @date_to)
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public
                                                     = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc")
                                                           .page(params['page'|| 1]).per(10);
-     # @events = @activity.events(@date_from, @date_to, :is_public => 1)
     end
-
-=begin
-    @events_pages = Paginator.new events.count, 10, params['page']
-    # 总的数据中取出某一页
-    events = events.slice(@events_pages.offset,10)
-    # 按天分组
-    @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-=end
     boards = @project.boards.includes(:last_message => :author).all
     @topic_count = @project.boards.count
     # 根据对应的请求，返回对应的数据
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 06b2df862..33b6e8643 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -388,12 +388,12 @@ class UsersController < ApplicationController
       @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     end
     @type = params[:type]
-    @limit = 15
+    @limit = 25
     @is_remote = true
     @hw_count = @homeworks.count
     @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
     @offset ||= @hw_pages.offset
-    @homeworks = paginateHelper @homeworks,15
+    @homeworks = paginateHelper @homeworks,25
     respond_to do |format|
       format.js
       format.html {render :layout => 'static_base'}
@@ -547,13 +547,13 @@ class UsersController < ApplicationController
     end
     @type = params[:type]
     @property = params[:property]
-    @limit = 15
+    @is_import = params[:is_import]
+    @limit = params[:is_import].to_i == 1 ? 15 : 25
     @is_remote = true
     @hw_count = @homeworks.count
     @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
     @offset ||= @hw_pages.offset
-    @homeworks = paginateHelper @homeworks,15
-    @is_import = params[:is_import]
+    @homeworks = paginateHelper @homeworks,@limit
     respond_to do |format|
       format.js
     end
@@ -573,6 +573,7 @@ class UsersController < ApplicationController
     @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     search = params[:name].to_s.strip.downcase
+    type_ids = params[:property] ? "(" + params[:property] + ")" : "(1, 2, 3)"
     if(params[:type].blank? || params[:type] == "1") #全部
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
@@ -580,24 +581,40 @@ class UsersController < ApplicationController
       all_user_ids = all_homeworks.map{|hw| hw.user_id}
       user_str_ids = search_user_by_name all_user_ids, search
       user_ids = user_str_ids.empty? ? "(-1)" : "(" + user_str_ids.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}")
+      if @order == "course_name"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_type in #{type_ids} and course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%' or homework_commons.user_id in #{user_ids}) order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        @homeworks = HomeworkCommon.find_by_sql(sql)
+      elsif @order == "user_name"
+        @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and homework_type in #{type_ids} and (name like '%#{search}%' or user_id in #{user_ids})").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+      else
+        @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and homework_type in #{type_ids} and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}")
+      end
     elsif params[:type] == "2" #课程资源
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("#{@order} #{@b_sort}")
+      if @order == "course_name"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        @homeworks = HomeworkCommon.find_by_sql(sql)
+      elsif @order == "user_name"
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+      else
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+      end
     end
+=begin
     if params[:property] && params[:property] == "1"
-      @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
+      @homeworks = @homeworks.where("homework_type = 1")
     elsif params[:property] && params[:property] == "2"
-      @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
+      @homeworks = @homeworks.where("homework_type = 2")
     elsif params[:property] && params[:property] == "3"
-      @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
+      @homeworks = @homeworks.where("homework_type = 3")
     end
+=end
     @type = params[:type]
-    @limit = 15
+    @limit = params[:is_import].to_i == 1 ? 15 : 25
     @is_remote = true
     @hw_count = @homeworks.count
     @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
     @offset ||= @hw_pages.offset
-    @homeworks = paginateHelper @homeworks,15
+    @homeworks = paginateHelper @homeworks,@limit
     @is_import = params[:is_import]
     @property = params[:property]
     @search = search
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ca8e0fc28..42911cc33 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1044,9 +1044,9 @@ module ApplicationHelper
       elsif @organization
         title << @organization.name
       elsif @user
-        title << @user.login
+        title << @user.try(:realname)
       else
-        title << User.current.login
+        title << User.current.try(:realname)
       end
       if first_page.nil? || first_page.web_title.nil?
         title << Setting.app_title unless Setting.app_title == title.last
@@ -2069,7 +2069,7 @@ module ApplicationHelper
       candown = User.current.member_of?(project) || (project.is_public && attachment_history.is_public == 1)
     elsif attachment_history.container_type == "OrgSubfield"
       org = OrgSubfield.find(attachment_history.container_id)
-      candown = User.current.member_of_org?(org) || (org.organization.is_public && attachment_history.is_public == 1)
+      candown = User.current.member_of_org?(org) || (org.organization.is_public && attachment_history.is_public == 1 && (User.current.logged? || org.organization.allow_guest_download?))
     end
   end
 
@@ -2943,41 +2943,86 @@ int main(int argc, char** argv){
 end
 
 def user_url_in_org(user_id)
-  if Rails.env.development?
-    return "http://localhost:3000/users/" + user_id.to_s
-  elsif Rails.env.test?
-    return "https://www.test.forge.trustie.net/users/" + user_id.to_s
-  else
-    return "https://www.trustie.net/users/" + user_id.to_s
-  end
+  Setting.protocol + "://" + Setting.host_name + "/users/" + user_id.to_s
+end
+
+def project_issues_url_in_org(project_id)
+  Setting.protocol + "://" + Setting.host_name + "/projects/" + project_id.to_s + "/issues"
+end
+
+def issue_url_in_org(id)
+  Setting.protocol + "://" + Setting.host_name + "/issues/" + id.to_s
+end
+
+def project_boards_url_in_org(id)
+  Setting.protocol + "://" + Setting.host_name + "/projects/" + id.to_s + "/boards"
+end
+
+def board_message_url_in_org(board_id, message_id)
+  Setting.protocol + "://" + Setting.host_name + "/boards/" + board_id.to_s + "/topics/" + message_id.to_s
+end
+
+def project_url_in_org(id)
+  Setting.protocol + "://" + Setting.host_name + "/projects/" + id.to_s
+end
+
+def homework_common_index_url_in_org(course_id)
+  Setting.protocol + "://" + Setting.host_name + "/homework_common?course=" + course_id.to_s
+end
+
+def student_work_index_url_in_org(homework_id)
+  Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
+end
+
+def course_url_in_org(course_id)
+  Setting.protocol + "://" + Setting.host_name + "/courses/" + course_id.to_s
+end
+
+def user_watchlist_url_in_org(id)
+  Setting.protocol + "://" + Setting.host_name + "/users/" + id.to_s + "/user_watchlist"
+end
+
+def user_fanslist_url_in_org(id)
+  Setting.protocol + "://" + Setting.host_name + "/users/" + id.to_s + "/user_fanslist"
+end
+
+def user_blogs_url_in_org(user_id)
+  Setting.protocol + "://" + Setting.host_name + "/users/" + user_id.to_s + "/blogs"
+end
+
+def feedback_url_in_org(user_id)
+  Setting.protocol + "://" + Setting.host_name + "/users/" + user_id.to_s + "/user_newfeedback"
+end
+
+def user_activities_url_in_org(user_id)
+  Setting.protocol + "://" + Setting.host_name + "/users/" + user_id.to_s + "/user_activities"
+end
+
+def course_news_index_url_in_org(course_id)
+  Setting.protocol + "://" + Setting.host_name + "/courses/" + course_id.to_s + "/news"
+end
+
+def news_url_in_org(news_id)
+  Setting.protocol + "://" + Setting.host_name + "/news/" + news_id.to_s
+end
+
+def course_boards_url_in_org(course_id)
+  Setting.protocol + "://" + Setting.host_name + "/courses/" + course_id.to_s + "/boards"
 end
 
 def logout_url_without_domain
-  if Rails.env.development?
-    return "http://localhost:3000/logout"
-  elsif Rails.env.test?
-    return "https://test.forge.trustie.net/logout"
-  else
-    return "https://www.trustie.net/logout"
-  end
+  Setting.protocol + "://" + Setting.host_name + "/logout"
 end
 
 def signin_url_without_domain
-  if Rails.env.development?
-    return "http://localhost:3000/login?login=true"
-  elsif Rails.env.test?
-    return "https://test.forge.trustie.net/login?login=true"
-  else
-    return "https://www.trustie.net/login?login=true"
-  end
+  Setting.protocol + "://" + Setting.host_name + "/login?login=true"
 end
 
 def register_url_without_domain
-  if Rails.env.development?
-    return "http://localhost:3000/login?login=false"
-  elsif Rails.env.test?
-    return "https://test.forge.trustie.net/login?login=false"
-  else
-    return "https://www.trustie.net/login?login=false"
-  end
+  Setting.protocol + "://" + Setting.host_name + "/login?login=false"
 end
+#判断是否为默认的组织栏目
+def is_default_field? field
+  (field.name == 'activity' || field.name == 'course' || field.name == 'project') && field.field_type == 'default'
+end
+
diff --git a/app/helpers/routes_helper.rb b/app/helpers/routes_helper.rb
index 15c809964..8d08f22da 100644
--- a/app/helpers/routes_helper.rb
+++ b/app/helpers/routes_helper.rb
@@ -22,10 +22,18 @@ module RoutesHelper
   # Returns the path to project issues or to the cross-project
   # issue list if project is nil
   def _project_issues_path(project, *args)
-    if project
-      project_issues_path(project, *args)
+    if args[0].to_s.include? '_page'
+      if args[0].to_s == "user_page"
+        user_activities_path(args[1].to_i)
+      else
+        project_path(project)
+      end
     else
-      issues_path(*args)
+      if project
+        project_issues_path(project, *args)
+      else
+        issues_path(*args)
+      end
     end
   end
 
diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index 9c1431d5d..a02eb750c 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -5,7 +5,7 @@ class CourseActivity < ActiveRecord::Base
   belongs_to :course
   belongs_to :user
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity, :add_course_activity
+  after_save :add_user_activity, :add_org_activity
   after_create :add_course_lead
   before_destroy :destroy_user_activity, :destroy_org_activity
 
@@ -31,14 +31,16 @@ class CourseActivity < ActiveRecord::Base
     end
   end
 
-  def add_course_activity
+  def add_org_activity
     org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'").first
     if org_activity
+      org_activity.updated_at = self.updated_at
       org_activity.save
     else
       if self.course_act_type == 'Message' && !self.course_act.parent_id.nil?
         org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.course_act.parent.id}").first
         org_activity.created_at = self.created_at
+        org_activity.updated_at = self.updated_at
         org_activity.save
       else
         OrgActivity.create(:user_id => self.user_id,
@@ -66,12 +68,13 @@ class CourseActivity < ActiveRecord::Base
   # 导语要放置在课程创建信息之后
   # 导语
   def add_course_lead
-    if self.course_act_type == "Course"
+    if self.course_act_type == "Course" and Message.where("id=12440").any?
       lead_message = Message.find(12440)
       name = lead_message.subject
       content = lead_message.content
       # message的status状态为0为正常，为1表示创建课程时发送的message
-      message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
+      # author_id 默认为课程使者创建
+      message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => 1 , :sticky => true, :status => true )
       # 更新的目的是为了排序，因为该条动态的时间可能与课程创建的动态创建时间一直
       message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1) if message.course_acts.first
     end
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index c98c5475b..c044392a0 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -48,7 +48,7 @@ class ForgeActivity < ActiveRecord::Base
   def add_org_activity
     org_activity = OrgActivity.where("org_act_type = '#{self.forge_act_type.to_s}' and org_act_id = #{self.forge_act_id}").first
     if org_activity
-      org_activity.created_at = self.created_at
+      org_activity.updated_at = self.updated_at
       org_activity.save
     else
       if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index c62cbf4f8..8cec49686 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -9,6 +9,7 @@ class OrgSubfield < ActiveRecord::Base
   has_many :news, :dependent => :destroy
   acts_as_attachable
   after_create :create_board_sync
+  after_destroy :update_priority
   # 创建资源栏目讨论区
   def create_board_sync
     @board = self.boards.build
@@ -25,4 +26,11 @@ class OrgSubfield < ActiveRecord::Base
 
   def project
   end
+
+  def update_priority
+    OrgSubfield.where("organization_id=? and priority>?", self.organization_id, self.priority).each do |field|
+      field.decrement(:priority)
+      field.save
+    end
+  end
 end
\ No newline at end of file
diff --git a/app/models/organization.rb b/app/models/organization.rb
index fcb777fb6..248783a26 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -16,8 +16,8 @@ class Organization < ActiveRecord::Base
   end
 
   def add_default_subfields
-    OrgSubfield.create(:organization_id => self.id, :name => 'activity', :field_type => 'default')
-    OrgSubfield.create(:organization_id => self.id, :name => 'course', :field_type => 'default')
-    OrgSubfield.create(:organization_id => self.id, :name => 'project', :field_type => 'default')
+    OrgSubfield.create(:organization_id => self.id, :name => 'activity', :field_type => 'default', :priority => 1)
+    OrgSubfield.create(:organization_id => self.id, :name => 'course', :field_type => 'default', :priority => 2)
+    OrgSubfield.create(:organization_id => self.id, :name => 'project', :field_type => 'default', :priority => 3)
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index a74c20751..78d823ea7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -116,7 +116,7 @@ class User < Principal
   has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
   has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"
   has_one :blog,  :class_name => 'Blog', :foreign_key => "author_id"
-  has_many :org_document_comments, :dependent =>:destroy
+  has_many :org_document_comments, :dependent =>:destroy, :foreign_key => "creator_id"
   has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
   belongs_to :auth_source
   has_many :org_members
@@ -822,6 +822,9 @@ class User < Principal
   end
 
   def member_of_org?(org)
+    if !self.logged?
+      return false
+    end
     OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count > 0
   end
 
@@ -1064,6 +1067,16 @@ class User < Principal
     anonymous_user
   end
 
+  # refactor User model find function,
+  # return anonymous user when can not find user id = user_id
+  def self.find (*args, &block)
+    begin
+      super
+    rescue
+      self.anonymous
+    end
+    # super
+  end
   # Salts all existing unsalted passwords
   # It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
   # This method is used in the SaltPasswords migration and is to be kept as is
diff --git a/app/views/blog_comments/edit.html.erb b/app/views/blog_comments/edit.html.erb
index 704342fc0..1e29d0a14 100644
--- a/app/views/blog_comments/edit.html.erb
+++ b/app/views/blog_comments/edit.html.erb
@@ -1,6 +1,5 @@
-<% if User.current.logged? && User.current.id == @user.id %>
-    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage],:in_act => params[:in_act]},:method=>'PUT',
-                          :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
-        <%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
-    <% end %>
-<% end %>
\ No newline at end of file
+
+<%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage],:in_act => params[:in_act]},:method=>'PUT',
+                       :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
+     <%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
+<% end %>
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index c80274db4..de7f1647d 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -38,7 +38,7 @@
       <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %>
     </div>
     <div class="postThemeWrap">
-      <% if @article.author.id == User.current.id%>
+      <% if @article.author.id == User.current.id || User.current.admin? %>
           <div class="homepagePostSetting" id="message_setting_<%= @article.id%>" style="display: none">
             <ul>
               <li class="homepagePostSettingIcon">
@@ -48,7 +48,7 @@
                                 l(:button_edit),
                                 {:action => 'edit', :id => @article.id,:in_act => params[:in_act]},
                                 :class => 'postOptionLink'
-                        ) if User.current && User.current.id == @article.author.id %>
+                        ) if User.current.admin? || User.current.id == @article.author.id %>
                   </li>
                   <li>
                     <%= link_to(
@@ -57,7 +57,7 @@
                                 :method => :delete,
                                 :data => {:confirm => l(:text_are_you_sure)},
                                 :class => 'postOptionLink'
-                        ) if User.current && User.current.id == @article.author.id %>
+                        ) if User.current.admin? || User.current.id == @article.author.id %>
                   </li>
                   <li>
                     <% if @article.id == @article.blog.homepage_id %>
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index a5aa8b780..edbce26d3 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <% if activity.author.id == User.current.id%>
+      <% if activity.author.id == User.current.id || User.current.admin? %>
           <div class="homepagePostSetting" id="message_setting_<%= activity.id%>" style="display: none">
             <ul>
               <li class="homepagePostSettingIcon">
@@ -14,7 +14,7 @@
                                 l(:button_edit),
                                 {:controller => 'blog_comments',:action => 'edit',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
                                 :class => 'postOptionLink'
-                        ) if User.current && User.current.id == activity.author.id %>
+                        ) if User.current.admin? || User.current.id == activity.author.id %>
                   </li>
                   <li>
                     <%= link_to(
@@ -23,7 +23,7 @@
                                 :method => :delete,
                                 :data => {:confirm => l(:text_are_you_sure)},
                                 :class => 'postOptionLink'
-                        ) if User.current && User.current.id == activity.author.id %>
+                        ) if User.current.admin? || User.current.id == activity.author.id %>
                   </li>
                   <li>
                     <% if activity.id == activity.blog.homepage_id %>
diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb
index 80ae8c9f4..5dbee59d6 100644
--- a/app/views/blogs/_homepage.html.erb
+++ b/app/views/blogs/_homepage.html.erb
@@ -43,6 +43,8 @@
       <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.content} %>
       
       <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index 31cdf41eb..3deb04f6c 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -1,7 +1,123 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: true, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
-
+<script type="text/javascript">
+    function nh_check_field(params){
+        var result=true;
+        if(!regexTopicSubject()) {
+            result=false;
+            return result;
+        }
+        if(params.content!=undefined){
+            if(params.content.isEmpty()){
+                result=false;
+            }
+            if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+                params.textarea.html(params.content.html());
+                params.content.sync();
+                if(params.content.isEmpty())
+                {
+                    params.contentmsg.text("描述不能为空");
+                    params.contentmsg.css('color','#ff0000');
+                }
+                else if(params.content.html().length >=20000){
+                    params.contentmsg.text("描述最多20000个汉字(或40000个英文字符)");
+                    params.contentmsg.css('color','#ff0000');
+                    result=false;
+                }
+                else
+                {
+                    params.contentmsg.text("填写正确");
+                    params.contentmsg.css('color','#008000');
+                }
+            }
+        }
+        return result;
+    }
+    function init_homework_form(params){
+        params.form.submit(function(){
+            params.textarea.html(params.editor.html());
+            params.editor.sync();
+            var flag = false;
+            if(params.form.attr('data-remote') != undefined ){
+                flag = true
+            }
+            var is_checked = false;
+            is_checked = nh_check_field({
+             issubmit:true,
+             content:params.editor,
+             contentmsg:params.contentmsg,
+             textarea:params.textarea
+             });
+            if(is_checked){
+                if(flag){
+                    return true;
+                }else{
+                    $(this)[0].submit();
+                    return false;
+                }
+            }
+            return false;
+        });
+    }
+    function init_homework_editor(params){
+        params.textarea.removeAttr('placeholder');
+        var editor = params.kindutil.create(params.textarea, {
+            resizeType : 1,minWidth:"1px",width:"100%",minHeight:"30px",height:"30px",
+            items : ['code','emoticons','fontname',
+                'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+                'formatblock', 'fontsize', '|','indent', 'outdent',
+                '|','imagedirectupload','table',   'media', 'preview',"more"
+            ],
+            afterChange:function(){//按键事件
+                var edit = this.edit;
+                var body = edit.doc.body;
+                //paramsHeight = params.kindutil.removeUnit(this.height);
+                edit.iframe.height(150);
+                this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) +  33, 150));
+            },
+            afterCreate:function(){
+                //init
+                var edit = this.edit;
+                var body = edit.doc.body;
+                edit.iframe[0].scroll = 'no';
+                body.style.overflowY = 'hidden';
+                //reset height
+                var edit = this.edit;
+                var body = edit.doc.body;
+                edit.html(params.textarea.innerHTML);
+                //paramsHeight = params.kindutil.removeUnit(this.height);
+                edit.iframe.height(150);
+                this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150));
+                elocalStorage(message_content_editor,'topic_course_<%=course.id %>');
+            }
+        }).loadPlugin('paste');
+        return editor;
+    }
+    KindEditor.ready(function(K){
+        $("div[nhname='topic_form']").each(function(){
+            var params = {};
+            params.kindutil = K;
+            params.div_form = $(this);
+            params.form = $("form",params.div_form);
+            if(params.form==undefined || params.form.length==0){
+                return;
+            }
+            params.textarea = $("textarea[nhname='topic_textarea']",params.div_form);
+            params.contentmsg = $("#message_content_span");
+            params.submit_btn = $("#new_message_submit_btn");
+            if(params.textarea.data('init') == undefined) {
+                params.editor = init_homework_editor(params);
+                message_content_editor = params.editor;
+                init_homework_form(params);
+                params.submit_btn.click(function () {
+                    params.form.submit();
+                });
+                params.textarea.data('init', 1);
+            }
+        });
+    });
+</script>
 <%= error_messages_for 'message' %>
 <div class="resources mt10">
   <div id="new_course_topic">
@@ -25,7 +141,7 @@
           <%= text_area :quote,:quote,:style => 'display:none' %>
           <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
 
-          <%= f.kindeditor :content, :editor_id => 'message_content_editor',
+          <%#= f.kindeditor :content, :editor_id => 'message_content_editor',
                            :owner_id => topic.nil? ? 0: topic.id,
                            :owner_type => OwnerTypeHelper::MESSAGE,
                            :width => '100%',
@@ -37,8 +153,11 @@
                                             :maxlength => 5000 },
                            at_id: topic.id, at_type: topic.class.to_s
           %>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='topic_textarea' name="message[content]"><%=topic.content %></textarea>
           <div class="cl"></div>
           <p id="message_content_span"></p>
+          <p id="e_tip" class="c_grey"></p>
+          <p id="e_tips" class="c_grey"></p>
         </div>
         <div class="cl"></div>
         <div class="mt10">
@@ -49,11 +168,11 @@
         <div class="cl"></div>
         <div class="mt5">
           <%if !edit_mode %>
-              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_topic();">确定</a>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_message_submit_btn">确定</a>
               <span class="fr mr10 mt3">或</span>
               <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_topic();">取消</a>
           <% else %>
-              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_topic();">确定</a>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_message_submit_btn" onclick="submit_topic();">确定</a>
               <span class="fr mr10 mt3">或</span>
               <%= link_to "取消",board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "fr mr10 mt3"%>
         <% end %>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 16b4fcd3d..d33b75f82 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -25,11 +25,13 @@
       课程问答区
     </div>
   </div>
+  <div nhname="topic_form">
   <% if User.current.logged? %>
     <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},
                           :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
         <%= render :partial => 'course_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => @board.course} %>
     <% end %>
   <% end %>
+  </div>
   <%= render :partial=> 'course_show_detail',:locals =>{:topics => @topics, :page => 0} %>
 </div>
diff --git a/app/views/courses/private_or_public.js.erb b/app/views/courses/private_or_public.js.erb
index 10b787dd4..4e512a6a0 100644
--- a/app/views/courses/private_or_public.js.erb
+++ b/app/views/courses/private_or_public.js.erb
@@ -9,10 +9,10 @@
     }
 <% else %>
     <% if @course.is_public? %>
-        $("#set_course_public_<%= @course.id %>").text("设为私有");
         $("#show_course_<%= @course.id %>").attr("title","公开课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% else %>
-        $("#set_course_public_<%= @course.id %>").text("设为公开");
         $("#show_course_<%= @course.id %>").attr("title","私有课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% end %>
+    $("#set_course_public_<%= @course.id %>").replaceWith('<%= escape_javascript(link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => "courses", :action => "private_or_public", :id => @course,:user_page => true},
+                                :id => "set_course_public_#{@course.id.to_s}",:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗") %>');
 <% end %>
\ No newline at end of file
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index b839128da..ab547db87 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -11,7 +11,7 @@
             <div class="homepagePostTitle break_word mt-4">
               <%# 如果有历史版本则提供历史版本下载 %>
               <% if file.attachment_histories.count == 0 %>
-                  <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                  <%= link_to file.is_public? ? truncate(file.filename, length: 45) : truncate(file.filename,length: 35, omission: '...'),
                               download_named_attachment_path(file.id, file.filename),
                               :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
               <% else %>
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 7fb9e2e0a..9e0dd41d0 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -41,9 +41,10 @@
           <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
           <%= submit_tag "栏目内搜索", :class => "blueBtn mr5 fl",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
           <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
-          <input class="blueBtn fr mr5" value="上传资源" onclick="org_upload_files(<%= org_subfield.id %>);">
-          <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :subfield_file_id => @org_subfield.id), :class => "blue-btn fr mr5", :remote => true) %>
-          <%#= link_to "上传资源",subfield_upload_file_org_subfield_files_path(@org_subfield.id, :in_org => 1),:method => "post",:class=>"blueBtn fr mr5",:remote => true %>
+          <% if User.current.member_of_org?(org_subfield.organization) %>
+              <input class="blueBtn fr mr5" value="上传资源" onclick="org_upload_files(<%= org_subfield.id %>);">
+              <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :subfield_file_id => @org_subfield.id), :class => "blue-btn fr mr5", :remote => true) %>
+          <% end %>
       <% end %>
     </div><!---re_top end-->
     <div class="cl"></div>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index b9d463855..4b82f8665 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -9,6 +9,9 @@
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
+        if(<%= @is_edit %>) {
+            issueEditShow();
+        }
     });
 </script>
 <div  class="homepageRight mt0 ml10" >
diff --git a/app/views/layouts/_org_courses.html.erb b/app/views/layouts/_org_courses.html.erb
index 648f62ecf..282447f0f 100644
--- a/app/views/layouts/_org_courses.html.erb
+++ b/app/views/layouts/_org_courses.html.erb
@@ -1,7 +1,7 @@
 <% courses.each do |course|%>
     <%# pro = Project.find course.course_id %>
     <li class="homepageLeftMenuCoursesLine" style="position:relative;">
-      <%= link_to course.name, course_path(course.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => course.name%>
+      <%= link_to course.name, course_url_in_org(course.id), :class => "coursesLineGrey hidden", :title => course.name%>
       <!--<div class="homepagePostSetting mt5 mr10">-->
         <!--<ul>-->
           <!--<li class="menuSetting">-->
diff --git a/app/views/layouts/_org_projects.html.erb b/app/views/layouts/_org_projects.html.erb
index 2e5041d20..b4ddccd9b 100644
--- a/app/views/layouts/_org_projects.html.erb
+++ b/app/views/layouts/_org_projects.html.erb
@@ -1,7 +1,7 @@
 <% projects.each do |project|%>
     <%# pro = Project.find project.project_id %>
     <li class="homepageLeftMenuCoursesLine" style="position:relative;">
-      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => project.name%>
+      <%= link_to project.name, project_url_in_org(project.id), :class => "coursesLineGrey hidden", :title => project.name%>
       <!--<div class="homepagePostSetting mt5 mr10">-->
         <!--<ul>-->
           <!--<li class="menuSetting">-->
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 30a911d09..872d842be 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -1,7 +1,7 @@
 <% courses.each do |course|%>
     <li class="homepageLeftMenuCoursesLine pr">
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
-      <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
+      <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
                   :id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
         <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
         <ul class="<%= count > 0 ? 'shild shildP':'subNavArrow'%>">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 7b19d2f9b..1df3caab2 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -227,6 +227,7 @@
         </ul>
     <% end %>
 
+    <% if @course.description && !@course.description.blank? %>
       <div class="project_intro">
         <div id="course_description" class="course_description">
           <h4 ><%= l(:label_course_brief_introduction)%>：</h4>
@@ -241,6 +242,7 @@
           </span>
         </div>
       </div><!--项目简介 end-->
+    <% end %>
       <div class="project_Label">
         <h4 class="mb5" ><%= l(:label_tag)%>：</h4>
         <div class="tag_h" >
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 4a8e00c96..f2ece1f35 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -44,14 +44,14 @@
       </li>
       <% if User.current.logged? %>
           <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
-            <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), request.local? ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
-            <%= link_to User.current, (request.local? || request.subdomain.blank?) ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
+            <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), user_url_in_org(User.current.id),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
+            <%= link_to User.current, user_url_in_org(User.current.id),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
             <%= link_to "退出",logout_url_without_domain, :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
-          <li class="navOrgMenu fr"><a href="<%= (request.local? || request.subdomain.blank?) ? signin_path(:login=>true):'https://www.trustie.net/login?login=true' %>" class="linkGrey8 f14">登录</a></li>
-          <li class="navOrgMenu fr"><a href="<%= (request.local? || request.subdomain.blank?) ? signin_path(:login=>false):'https://www.trustie.net/login?login=false' %>" class="linkGrey8 f14 mr15">注册</a></li>
+          <li class="navOrgMenu fr"><a href="<%= signin_url_without_domain %>" class="linkGrey8 f14">登录</a></li>
+          <li class="navOrgMenu fr"><a href="<%= register_url_without_domain %>" class="linkGrey8 f14 mr15">注册</a></li>
       <% end %>
     </ul>
     <!--<div class="navHomepageProfile">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index eaf58ed7e..dd83ec968 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -193,7 +193,7 @@
               <% end%>
           <% end%>
         </div>
-        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
+        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" id="homepageLeftMenuCourses">
           <ul>
             <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 49207d5c5..f36f8a63c 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -34,11 +34,7 @@
 <div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @topic.id%>').show();" onmouseout="$('#message_setting_<%= @topic.id%>').hide();">
   <div class="postThemeContainer">
     <div class="postDetailPortrait">
-      <% if @topic.status == 1 %>
-          <%= image_tag("/images/trustie_logo1.png", width: "50px", height: "50px") %>
-      <% else %>
-          <%= link_to image_tag(url_to_avatar(@topic.author), :width => 50, :height => 50,:alt=>'图像' ), user_path(@topic.author) %>
-      <% end %>
+      <%= link_to image_tag(url_to_avatar(@topic.author), :width => 50, :height => 50,:alt=>'图像' ), user_path(@topic.author) %>
     </div>
     <div class="postThemeWrap">
       <% if User.current.logged? %>
@@ -74,16 +70,11 @@
         <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">主题: <%= @topic.subject%></a>
       </div>
       <div class="cl"></div>
-
       <div class="postDetailCreater">
-        <% if @topic.status == 1 %>
-            <span class="fontBlue2">确实团队</span>
+        <% if @topic.try(:author).try(:realname) == ' ' %>
+            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
         <% else %>
-            <% if @topic.try(:author).try(:realname) == ' ' %>
-                <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-            <% else %>
-                <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-            <% end %>
+            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
         <% end %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 89fe71c65..324b1edf1 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -12,6 +12,7 @@
         <% end %>
 
 <% elsif @message.course %>
+    <div  nhname="topic_form">
     <%= form_for @message, {
             :as => :message,
             :url => {:action => 'edit',:is_course=>@is_course,:is_board=>@is_board},
@@ -22,7 +23,7 @@
         <%= render :partial => 'boards/course_message_edit',
                    :locals => {:f => f, :edit_mode => true, :topic => @message, :course => @message.course} %>
     <% end %>
-
+    </div>
 <% elsif @message.board.org_subfield %>
     <%= form_for @message, {
                                  :as => :message,
diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb
index 9e77d3fa8..f462df2c9 100644
--- a/app/views/org_document_comments/_new.html.erb
+++ b/app/views/org_document_comments/_new.html.erb
@@ -50,6 +50,8 @@
         </div>
         <div class="cl"></div>
         <p id="homework_course_id_span" class="c_red mt5"></p>
+        <p id="e_tip" class="c_grey"></p>
+        <p id="e_tips" class="c_grey"></p>
         <div class="cl"></div>
         <div class="mt10">
           <div class="fl" id="topic_attachments">
diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb
index ed7413850..3ad388bd2 100644
--- a/app/views/org_document_comments/edit.html.erb
+++ b/app/views/org_document_comments/edit.html.erb
@@ -39,6 +39,8 @@
         <div class="cl"></div>
 
         <p id="homework_course_id_span" class="c_red mt5"></p>
+        <p id="e_tip" class="c_grey"></p>
+        <p id="e_tips" class="c_grey"></p>
         <div class="cl"></div>
 
         <div class="mt10">
diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb
index 2a261bd5f..fea89459b 100644
--- a/app/views/org_document_comments/new.html.erb
+++ b/app/views/org_document_comments/new.html.erb
@@ -46,6 +46,8 @@
       </div>
       <div class="cl"></div>
       <p id="homework_course_id_span" class="c_red mt5"></p>
+      <p id="e_tip" class="c_grey"></p>
+      <p id="e_tips" class="c_grey"></p>
       <div class="cl"></div>
       <div class="mt10">
         <div class="fl" id="topic_attachments">
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index be504a674..f5b186197 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -8,11 +8,11 @@
 <div class="resources" id="organization_document_<%= @document.id %>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_path(@document.creator_id) %>
+      <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(@document.creator_id) %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo">
-        <%= link_to User.find(@document.creator_id), user_path(@document.creator.id), :class => "newsBlue mr15" %>
+        <%= link_to User.find(@document.creator_id), user_url_in_org(@document.creator_id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to @document.organization.name, organization_path(@document.organization), :class => "newsBlue" %>
         |
         <% if @document.organization.home_id == @document.id %>
@@ -89,10 +89,10 @@
               <% user = User.find(reply.creator_id) %>
               <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id %>').hide();">
                 <div class="homepagePostReplyPortrait">
-                  <%= link_to image_tag(url_to_avatar(user), :width => 33,:height => 33), user_path(user) %>
+                  <%= link_to image_tag(url_to_avatar(user), :width => 33,:height => 33), user_url_in_org(user.id) %>
                 </div>
                 <div class="homepagePostReplyDes">
-                  <%= link_to User.find(reply.creator_id).realname, user_path(reply.creator_id), :class => "newsBlue mr10 f14" %>
+                  <%= link_to User.find(reply.creator_id).realname, user_url_in_org(reply.creator_id), :class => "newsBlue mr10 f14" %>
                   <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe unless reply.content.nil? %>
                   </div>
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index d035ab5cd..84b69717a 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -1,8 +1,7 @@
 <% if @res %>
     $("#org_subfield_list").html("");
     $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
-        :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
-        :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>");
+        :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
     $("#subfield_name").val("");
diff --git a/app/views/org_subfields/destroy.js.erb b/app/views/org_subfields/destroy.js.erb
index 2ba03fc36..d069b1cd8 100644
--- a/app/views/org_subfields/destroy.js.erb
+++ b/app/views/org_subfields/destroy.js.erb
@@ -1,6 +1,5 @@
 $("#org_subfield_list").html("");
 $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
-    :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
-    :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>");
+    :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
diff --git a/app/views/org_subfields/update_priority.js.erb b/app/views/org_subfields/update_priority.js.erb
new file mode 100644
index 000000000..475649aac
--- /dev/null
+++ b/app/views/org_subfields/update_priority.js.erb
@@ -0,0 +1,2 @@
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields.order("priority")}) %>");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
diff --git a/app/views/organizations/_org_course_create.html.erb b/app/views/organizations/_org_course_create.html.erb
index 3e22f33e1..875c45059 100644
--- a/app/views/organizations/_org_course_create.html.erb
+++ b/app/views/organizations/_org_course_create.html.erb
@@ -12,10 +12,10 @@
             <%= link_to activity.try(:teacher).try(:realname), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.name.to_s+" | 课程", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+        <%= link_to activity.name.to_s+" | 课程", course_url_in_org(activity.id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word" >
-        <%= link_to activity.name, course_path(activity.id,:host=>Setting.host_course), :class => "postGrey" %>
+        <%= link_to activity.name, course_url_in_org(activity.id), :class => "postGrey" %>
       </div>
       <div class="homepagePostDate">
         创建时间：<%= format_time(activity.created_at) %>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 75401e765..e6af795a9 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -12,10 +12,10 @@
         <% else %>
             <%= link_to activity.try(:user).try(:realname), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
         <% end %> TO <!--+"(课程名称)" -->
-        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
+        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_url_in_org(activity.course.id), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
-        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
+        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :class => "postGrey"%>
       </div>
       <% if activity.homework_detail_manual%>
           <% if activity.homework_detail_manual.comment_status == 1%>
@@ -47,7 +47,7 @@
       <% end%>
       <div class="cl"></div>
       <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
-          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", "https://www.trustie.net/projects/new",:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
       <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
           <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
       <% end %>
@@ -73,7 +73,7 @@
 
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
-              <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
+              <%= link_to "模拟答题", "https://www.trustie.net/new_user_commit_homework?homework_id="+activity.id.to_s + "&is_test=true", class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
             </div>
         <% end %>
         <% if activity.homework_type == 2%>
@@ -129,7 +129,7 @@
       <% if activity.student_works.count != 0 %>
           <% sw = activity.student_works.reorder("created_at desc").first %>
           <div class="mt10 homepagePostDeadline mb10">
-            #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
+            #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_url_in_org(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
           </div>
       <% end %>
       <div class="cl"></div>
@@ -141,7 +141,7 @@
             <% last_score = student_work_scores.first %>
             <div>
               <p class="mb10 fontGrey2">#&nbsp;<%=time_from_now last_score.created_at %>
-                <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
+                <%= link_to last_score.user.show_name, user_activities_url_in_org(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
               </p>
             </div>
         <% end %>
@@ -154,18 +154,8 @@
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
-                <a href="javascript:void(0);" class="linkBlue">
-                  <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %>
-                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                      <p class="w100 hidden">
-                        <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%>
-                      </p>
-                  <% else %>
-                      <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
-                      <p class="w100 hidden">
-                        <a href="javascript:void(0);" title="该作业的作品暂未公开"><%=sw.user.show_name %></a>
-                      </p>
-                  <% end %>
+                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_url_in_org(activity.id)%></p>
                 </a>
                 <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
                 <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分</span></p>
@@ -175,7 +165,7 @@
               <% end %>
           <% end %>
           <% if student_works.count > 5 %>
-              <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+              <%= link_to "更多>>", student_work_index_url_in_org(activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
           <% end %>
           <div class="cl"></div>
         </div>
@@ -187,7 +177,7 @@
             <% sort_projects = project_sort_update projects %>
             <div class="mt10 relatePWrap" id="relatePWrap_<%=user_activity_id %>">
               <div class="mr5 fontGrey2">
-                #&nbsp;<%=time_from_now sort_projects.first.updated_at %><%= link_to User.find(sort_projects.first.user_id).show_name, user_activities_path(sort_projects.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
+                #&nbsp;<%=time_from_now sort_projects.first.updated_at %><%= link_to User.find(sort_projects.first.user_id).show_name, user_activities_url_in_org(sort_projects.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
               </div>
               <div class="cl"></div>
               <% sort_projects.each_with_index do |pro, i| %>
@@ -204,7 +194,7 @@
 
                   <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"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %>
+                        <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_url_in_org(project.id),: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",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %>
                     <% end %>
@@ -237,17 +227,17 @@
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity), :class => "postOptionLink"%>
+                    <%= link_to l(:button_edit),Setting.protocol + "://" + Setting.host_name + "/homework_common/" + activity.id.to_s + "/edit?", :class => "postOptionLink"%>
                   </li>
                   <li>
-                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                    <%= link_to(l(:label_bid_respond_delete), Setting.protocol + "://" + Setting.host_name + "/homework_common/" + activity.id.to_s + "?is_in_course=-1&course_activity=" + course_activity.to_s,:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
-                    <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => 0),:class => "postOptionLink", :remote => true) %>
+                    <%= link_to("评分设置", Setting.protocol + "://" + Setting.host_name + "/homework_common/" + activity.id.to_s + "/score_rule_set?is_in_course=0&user_activity_id=" + user_activity_id.to_s,:class => "postOptionLink", :remote => true) %>
                   </li>
                   <% if activity.anonymous_comment == 0 %>
                       <li>
-                        <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                        <%= link_to("匿评设置", Setting.protocol + "://" + Setting.host_name + "/homework_common/" + activity.id.to_s + "/start_evaluation_set",:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
                       </li>
                       <li>
                         <%= homework_anonymous_comment activity,-1,user_activity_id,course_activity %>
@@ -255,17 +245,17 @@
                   <% end %>
                   <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
                       <li>
-                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink",
+                        <%= link_to("禁用匿评", Setting.host_name + "/homework_common/" + activity.id.to_s + "/alert_forbidden_anonymous_comment?user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s,:class => "postOptionLink",
                                     :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品",:remote => true)%>
                       </li>
                   <% end %>
                   <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
                       <li>
-                        <%= link_to("公开作品", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                        <%= link_to("公开作品", Setting.protocol + "://" + Setting.host_name + "/homework_common/" + activity.id.to_s + "/alert_open_student_works?is_in_course=-1&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s,:class => "postOptionLink", :remote => true)%>
                       </li>
                   <% elsif activity.is_open == 1 %>
                       <li>
-                        <%= link_to("取消公开", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                        <%= link_to("取消公开", Setting.protocol + "://" + Setting.host_name + "/homework_common/" + activity.id.to_s + "/alert_open_student_works?is_in_course=-1&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s,:class => "postOptionLink", :remote => true)%>
                       </li>
                   <% end %>
                 </ul>
@@ -356,7 +346,7 @@
               <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
               <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 4873fbba9..9a9943e9b 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -12,13 +12,13 @@
             <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_url_in_org(activity.course.id), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-            <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "postGrey" %>
+            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :class=> "postGrey" %>
         <% else %>
-            <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "postGrey"%>
+            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :class=> "postGrey"%>
         <% end %>
       </div>
       <% if activity.sticky == 1%>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 3da0887ed..7f50b3725 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -1,123 +1,123 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-    </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
-        <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
-        <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
-      </div>
-      <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
-        <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
-      </div>
-      <% if activity.sticky == 1%>
-          <span class="sticky_btn_cir ml10">置顶</span>
-      <% end%>
-      <div class="cl"></div>
-      <div class="homepagePostDate fl">
-        发布时间：<%= format_time(activity.created_on) %>
-      </div>
-      <div class="homepagePostDate fl ml15">
-        更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
-      </div>
-      <div class="cl"></div>
-      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
-      <div class="cl"></div>
-      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
-      <div class="cl"></div>
-      <div class="mt10" style="font-weight:normal;">
-        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-      </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <% count=activity.comments.count %>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-
-    <% replies_all_i = 0 %>
-    <% if count > 0 %>
-        <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
-        </div>
-    <% end %>
-
-    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
-        <div class="cl"></div>
-      </div>
-      <div class="cl"></div>
-    </div>
-  </div>
-</div>
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if @ctivity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %> TO  <!--+"(课程名称)"-->
+        <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_url_in_org(activity.course.id), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
+        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :class => "postGrey" %>
+      </div>
+      <% if activity.sticky == 1%>
+          <span class="sticky_btn_cir ml10">置顶</span>
+      <% end%>
+      <div class="cl"></div>
+      <div class="homepagePostDate fl">
+        发布时间：<%= format_time(activity.created_on) %>
+      </div>
+      <div class="homepagePostDate fl ml15">
+        更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
+      </div>
+      <div class="cl"></div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count=activity.comments.count %>
+  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+      <%if count>3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.comments.reorder("created_on desc").each do |comment| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= comment.id %>');
+                    });
+                </script>
+                <% replies_all_i = replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if comment.try(:author).try(:realname) == ' ' %>
+                          <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(comment.created_on) %>
+                      <span id="reply_praise_count_<%=comment.id %>">
+                          <% if comment.author == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                      <%= comment.comments.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb
index c124e829f..cfd2fcb65 100644
--- a/app/views/organizations/_org_course_poll.html.erb
+++ b/app/views/organizations/_org_course_poll.html.erb
@@ -16,7 +16,7 @@
                 <%= link_to activity.try(:user).try(:realname), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
             <% end %>
             TO
-            <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %>
+            <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", Setting.protocol + "://" + Setting.host_name + "/poll?polls_type=Course&polls_group_id=" + activity.polls_group_id.to_s, :class => "newsBlue ml15" %>
             <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
           </div>
           <div class="homepagePostTitle break_word" >
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 449d95f4c..3db6ffb13 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -34,71 +34,76 @@
         })
     })
 </script>
-<% org_activity_field = organization.org_subfields.where('field_type="default" and name="activity" and field_type="default"').first %>
-<% org_course_field = organization.org_subfields.where('field_type="default" and name="course" and field_type="default"').first %>
-<% org_project_field = organization.org_subfields.where('field_type="default" and name="project" and field_type="default"').first %>
-<div class="homepageLeftMenuBlock" style="display:<%= is_hide_org_left(org_activity_field) ? 'block':'none' %>;" id="org_subfield_<%= org_activity_field.id %>">
-  <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %>
-</div>
-<div style="display:<%= is_hide_org_left(org_project_field) ? 'block':'none' %>;" id="org_subfield_<%= org_project_field.id %>">
-    <div class="homepageLeftMenuBlock">
-      <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
-      <% if User.current.logged? and User.current.admin_of_org?(organization) %>
-        <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
-      <% end %>
-    </div>
-    <div class="homepageLeftMenuCourses" id="homepageLeftMenuProjects" style="display:<%= organization.projects.count == 0?'none':'' %>">
-      <ul >
 
-        <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
-      </ul>
-    </div>
-</div>
-<div style="display:<%= is_hide_org_left(org_course_field) ? 'block':'none' %>;" id="org_subfield_<%= org_course_field.id %>">
-    <div class="homepageLeftMenuBlock">
-      <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
-      <% if User.current.logged? and User.current.admin_of_org?(organization) %>
-        <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
-      <% end %>
-    </div>
-    <div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">
-      <ul >
-        <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
-      </ul>
-    </div>
-</div>
-<% organization.org_subfields.where("field_type != 'default'").each do |field| %>
-    <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
-      <% if field.field_type == "Post" %>
-          <% if !field.subfield_subdomain_dir.nil? %>
-              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
-                  <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+<% organization.org_subfields.order("priority").each do |field| %>
+    <% if is_default_field?(field) %>
+        <% case field.name %>
+        <% when 'activity' %>
+            <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0 ? 'block':'none' %>;" id="org_subfield_<%= field.id %>">
+              <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %>
+            </div>
+        <% when 'course' %>
+            <div style="display:<%= field.hide == 0 ? 'block':'none' %>;" id="org_subfield_<%= field.id %>">
+              <div class="homepageLeftMenuBlock">
+                <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
+                <% if User.current.logged? and User.current.admin_of_org?(organization) %>
+                    <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
+                <% end %>
+              </div>
+              <div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">
+                <ul >
+                  <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+                </ul>
+              </div>
+            </div>
+        <% when 'project' %>
+            <div style="display:<%= field.hide == 0 ? 'block':'none' %>;" id="org_subfield_<%= field.id %>">
+              <div class="homepageLeftMenuBlock">
+                <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
+                <% if User.current.logged? and User.current.admin_of_org?(organization) %>
+                    <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
+                <% end %>
+              </div>
+              <div class="homepageLeftMenuCourses" id="homepageLeftMenuProjects" style="display:<%= organization.projects.count == 0?'none':'' %>">
+                <ul>
+                  <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+                </ul>
+              </div>
+            </div>
+        <% end %>
+    <% else %>
+        <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
+          <% if field.field_type == "Post" %>
+              <% if !field.subfield_subdomain_dir.nil? %>
+                  <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
+                      <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                  <% else %>
+                      <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                  <% end %>
               <% else %>
-                  <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                  <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
+              <% end %>
+              <% if User.current.member_of_org?organization %>
+                  <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
               <% end %>
           <% else %>
-              <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
+              <% if !field.subfield_subdomain_dir.nil? %>
+                  <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
+                      <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                  <% else %>
+                      <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                  <% end %>
+              <% else %>
+                  <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
+              <% end %>
+              <% if User.current.member_of_org?organization %>
+                  <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
+                  <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
+              <% end %>
+              <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->
           <% end %>
-        <% if User.current.member_of_org?organization %>
-          <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
-       <% end %>
-      <% else %>
-        <% if !field.subfield_subdomain_dir.nil? %>
-          <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
-            <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
-          <% else %>
-            <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
-          <% end %>
-        <% else %>
-          <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
-        <% end %>
-        <% if User.current.member_of_org?organization %>
-          <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
-           <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
-        <% end %>
-          <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->
-      <% end %>
-    </div>
-    <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
-    </div>
+        </div>
+        <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
+        </div>
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb
index 53618fc92..b846b940f 100644
--- a/app/views/organizations/_org_members.html.erb
+++ b/app/views/organizations/_org_members.html.erb
@@ -14,7 +14,7 @@
                 <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
               </a>
               <span class="fl ml10 c_grey"><%= l(:label_username)%></span>
-              <%= link_to(member.user.show_name, user_path(member.user),:class => "ml5 c_blue02") %><br />
+              <%= link_to(member.user.show_name, user_url_in_org(member.user_id),:class => "ml5 c_blue02") %><br />
               <span class="fl c_grey ml10">身份：<%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %></span>
               <% if member.created_at %>
                  <span class="fr c_grey"><%= format_time(member.created_at) %></span>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 782412e43..9b7dbfa8f 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -1,141 +1,141 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-    </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>  TO
-        <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
-      </div>
-      <div class="homepagePostTitle break_word">
-        <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
-        <span class='<%#= get_issue_priority(activity.priority_id)[0] %>'>
-          <%#= get_issue_priority(activity.priority_id)[1] %>
-        </span>
-      </div>
-      <div class="homepagePostSubmitContainer">
-        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
-          <% unless activity.assigned_to_id.nil? %>
-              <% if activity.try(:assigned_to).try(:realname) == ' ' %>
-                  <%= link_to activity.try(:assigned_to), user_url_in_org(activity.assigned_to_id), :class => "newsBlue mr15" %>
-              <% else %>
-                  <%= link_to activity.try(:assigned_to).try(:realname), user_url_in_org(activity.assigned_to_id), :class => "newsBlue mr15" %>
-              <% end %>
-          <% end %>
-        </div>
-        <div class="homepagePostDeadline fl">
-          发布时间：
-          <%=format_time(activity.created_on) %>
-        </div>
-        <div class="homepagePostDate fl ml15">
-          更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
-        </div>
-        <div class="cl"></div>
-      </div>
-      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
-      <div class="cl"></div>
-      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
-      <div class="cl"></div>
-      <div class="mt10" style="font-weight:normal;">
-        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-      </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <% count = activity.journals.count %>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <% if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-
-    <% replies_all_i = 0 %>
-    <% if count > 0 %>
-        <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.journals.reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_url_in_org(reply.user_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
-                      <% if reply.try(:user).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:user), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:user).try(:realname), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.user == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <% if reply.details.any? %>
-                          <% details_to_strings(reply.details).each do |string| %>
-                          <p><%= string %></p>
-                          <% end %>
-                      <% end %>
-                      <P><%= reply.notes.nil? ? "" : reply.notes.html_safe %></P>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
-        </div>
-    <% end %>
-
-    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
-        <div class="cl"></div>
-      </div>
-      <div class="cl"></div>
-    </div>
-
-  </div>
-</div>
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>  TO
+        <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_url_in_org(activity.project.id), :class => "newsBlue ml15"%>
+      </div>
+      <div class="homepagePostTitle break_word">
+        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :class => "postGrey" %>
+        <span class='<%#= get_issue_priority(activity.priority_id)[0] %>'>
+          <%#= get_issue_priority(activity.priority_id)[1] %>
+        </span>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
+          <% unless activity.assigned_to_id.nil? %>
+              <% if activity.try(:assigned_to).try(:realname) == ' ' %>
+                  <%= link_to activity.try(:assigned_to), user_url_in_org(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% else %>
+                  <%= link_to activity.try(:assigned_to).try(:realname), user_url_in_org(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% end %>
+          <% end %>
+        </div>
+        <div class="homepagePostDeadline fl">
+          发布时间：
+          <%=format_time(activity.created_on) %>
+        </div>
+        <div class="homepagePostDate fl ml15">
+          更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count = activity.journals.count %>
+  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+      <% if count > 3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.journals.reorder("created_on desc").each do |reply| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= reply.id %>');
+                    });
+                </script>
+                <% replies_all_i=replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_url_in_org(reply.user_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if reply.try(:user).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:user), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:user).try(:realname), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(reply.created_on) %>
+                      <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.user == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+                      <% if reply.details.any? %>
+                          <% details_to_strings(reply.details).each do |string| %>
+                          <p><%= string %></p>
+                          <% end %>
+                      <% end %>
+                      <P><%= reply.notes.nil? ? "" : reply.notes.html_safe %></P>
+                    </div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+
+  </div>
+</div>
diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb
index e13f4128b..5003fd0e2 100644
--- a/app/views/organizations/_project_create.html.erb
+++ b/app/views/organizations/_project_create.html.erb
@@ -3,21 +3,21 @@
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_url_in_org(user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_url_in_org(user.id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if user.try(:realname) == ' ' %>
-            <%= link_to user, user_url_in_org(user), :class => "newsBlue mr15" %>
+            <%= link_to user, user_url_in_org(user.id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to user.try(:realname), user_url_in_org(user), :class => "newsBlue mr15" %>
+            <%= link_to user.try(:realname), user_url_in_org(user.id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+        <%= link_to project.to_s+" | 项目", project_url_in_org(project.id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word" >
-        <%= link_to project.name, project_path(project.id,:host=>Setting.host_course), :class => "postGrey" %>
+        <%= link_to project.name, project_url_in_org(project.id), :class => "postGrey" %>
       </div>
       <div class="homepagePostDate">
         创建时间：<%= format_time(project.created_on) %>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index 99a067dfb..a818939d6 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -1,136 +1,135 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-    </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>
-        TO
-        <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
-        <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
-      </div>
-      <div class="homepagePostTitle break_word">
-        <% if activity.parent_id.nil? %>
-            <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
-            %>
-        <% else %>
-            <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
-            %>
-        <% end %>
-      </div>
-      <div class="homepagePostDate fl">
-        发帖时间：<%= format_time(activity.created_on) %>
-      </div>
-      <div class="homepagePostDate fl ml15">
-        更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
-      </div>
-      <div class="cl"></div>
-      <% if activity.parent_id.nil? %>
-          <% content = activity.content%>
-      <% else %>
-          <% content = activity.parent.content%>
-      <% end %>
-      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
-      <div class="cl"></div>
-      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
-      <div class="cl"></div>
-      <div class="mt10" style="font-weight:normal;">
-        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-      </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <% count = 0 %>
-  <% if activity.parent %>
-      <% count=activity.parent.children.count%>
-  <% else %>
-      <% count=activity.children.count%>
-  <% end %>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
-      <%if count>3 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
-      <% end %>
-    </div>
-
-    <% activity= activity.parent_id.nil? ? activity : activity.parent %>
-    <% replies_all_i = 0 %>
-    <% if count > 0 %>
-        <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i+1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
-                      <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <%= reply.content.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
-        </div>
-    <% end %>
-
-    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="quote[quote]" value="">
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
-        <div class="cl"></div>
-      </div>
-      <div class="cl"></div>
-    </div>
-
-  </div>
-</div>
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_url_in_org(activity.project.id), :class => "newsBlue ml15 mr5"%>
+        <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
+      </div>
+      <div class="homepagePostTitle break_word">
+        <% if activity.parent_id.nil? %>
+            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id), :class=> "postGrey"
+            %>
+        <% else %>
+            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id), :class=> "postGrey" %>
+        <% end %>
+      </div>
+      <div class="homepagePostDate fl">
+        发帖时间：<%= format_time(activity.created_on) %>
+      </div>
+      <div class="homepagePostDate fl ml15">
+        更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+      </div>
+      <div class="cl"></div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count = 0 %>
+  <% if activity.parent %>
+      <% count=activity.parent.children.count%>
+  <% else %>
+      <% count=activity.children.count%>
+  <% end %>
+  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+      <%if count>3 %>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
+      <% end %>
+    </div>
+
+    <% activity= activity.parent_id.nil? ? activity : activity.parent %>
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.children.reorder("created_on desc").each do |reply| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= reply.id %>');
+                    });
+                </script>
+                <% replies_all_i=replies_all_i+1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if reply.try(:author).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(reply.created_on) %>
+                      <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.author == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+                      <%= reply.content.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="quote[quote]" value="">
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+
+  </div>
+</div>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index ed6e1e092..e3ed492a0 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -1,152 +1,152 @@
-<div class="resources mt10" id="organization_document_<%= document.id %>">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(document.creator_id)} %>
-    </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo">
-        <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
-        TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
-        |
-            <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
-      </div>
-      <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
-      <div class="homepagePostDate fl">
-        发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
-      </div>
-      <div class="homepagePostDate fl ml15">
-        更新时间：<%= format_time(OrgActivity.where("org_act_type='#{document.class}' and org_act_id =#{document.id}").first.updated_at) %>
-      </div>
-      <div class="cl"></div>
-      <% unless document.content.blank? %>
-          <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>document.id, :content=>document.content} %>
-      <% end %>
-      <div class="cl"></div>
-      <div id="intro_content_show_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
-      <div class="cl"></div>
-      <div class="mt10" style="font-weight:normal;">
-        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %>
-      </div>
-      <!--    <%# if defined?(home_id) %>
-        <div style="float:right;">最后编辑：<%#= User.find() %></div>
-    <%# end %>-->
-      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
-          <div class="homepagePostSetting">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li>
-                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>
-                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
-                    <% end %>
-                  </li>
-                  <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag, :org_subfield_id => params[:org_subfield_id] ), :class => "postOptionLink" %>
-                  </li>
-                  <li>
-                    <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :remote => true, :class => 'postOptionLink' %>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-    </div>
-  </div>
-  <% comments_for_doc = document.children.reorder("created_at desc") %>
-  <% count = document.children.count() %>
-
-  <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=document.id %>">
-          <% if document.creator_id.to_i == User.current.id.to_i %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(document) > 0 ? "（#{get_praise_num(document)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
-          <% end %>
-        </span>
-      </div>
-      <% if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-    <div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
-      <ul>
-        <% reply_id = 0 %>
-        <% comments_for_doc.each do |comment| %>
-            <% reply_id += 1 %>
-            <li style="display:<%= reply_id > 3 ? 'none' : '' %>">
-              <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
-              <div class="homepagePostReplyDes">
-                <div class="homepagePostReplyPublisher">
-                  <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
-                  <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
-                  <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.creator_id.to_i == User.current.id.to_i %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
-                  </span>
-                </div>
-                <% unless comment.content.blank? %>
-                    <div class="homepagePostReplyContent"><%= comment.content.html_safe %></div>
-                <% end %>
-              </div>
-              <div class="cl"></div>
-            </li>
-        <% end %>
-      </ul>
-    </div>
-    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
-        <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current) %>
-      </div>
-      <div class="homepagePostReplyInputContainer">
-        <div nhname='new_message_<%= act.id %>' style="display:none;">
-          <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
-              <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
-              <div nhname='toolbar_container_<%= act.id %>'></div>
-              <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="org_content"></textarea>
-              <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
-
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= act.id %>'></p>
-          <% end %>
-        </div>
-      </div>
-      <div class="cl"></div>
-    </div>
-    <div class="cl"></div>
-  </div>
-</div>
-
-<script type="text/javascript">
-    function expand_reply(container, btnid) {
-        var target = $(container);
-        var btn = $(btnid);
-        if (btn.data('init') == '0') {
-            btn.data('init', 1);
-            btn.html('收起回复');
-            target.show();
-        } else {
-            btn.data('init', 0);
-            btn.html('展开更多');
-            target.hide();
-            target.eq(0).show();
-            target.eq(1).show();
-            target.eq(2).show();
-        }
-    }
+<div class="resources mt10" id="organization_document_<%= document.id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(document.creator_id)} %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo">
+        <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
+        TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
+        |
+            <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
+      </div>
+      <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
+      <div class="homepagePostDate fl">
+        发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
+      </div>
+      <div class="homepagePostDate fl ml15">
+        更新时间：<%= format_time(OrgActivity.where("org_act_type='#{document.class}' and org_act_id =#{document.id}").first.updated_at) %>
+      </div>
+      <div class="cl"></div>
+      <% unless document.content.blank? %>
+          <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>document.id, :content=>document.content} %>
+      <% end %>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %>
+      </div>
+      <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>
+                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag, :org_subfield_id => params[:org_subfield_id] ), :class => "postOptionLink" %>
+                  </li>
+                  <li>
+                    <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :remote => true, :class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+  </div>
+  <% comments_for_doc = document.children.reorder("created_at desc") %>
+  <% count = document.children.count() %>
+
+  <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=document.id %>">
+          <% if document.creator_id.to_i == User.current.id.to_i %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(document) > 0 ? "（#{get_praise_num(document)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
+      <% if count > 3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+    <div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
+      <ul>
+        <% reply_id = 0 %>
+        <% comments_for_doc.each do |comment| %>
+            <% reply_id += 1 %>
+            <li style="display:<%= reply_id > 3 ? 'none' : '' %>">
+              <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
+              <div class="homepagePostReplyDes">
+                <div class="homepagePostReplyPublisher">
+                  <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
+                  <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
+                  <span id="reply_praise_count_<%=comment.id %>">
+                          <% if comment.creator_id.to_i == User.current.id.to_i %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                          <% end %>
+                  </span>
+                </div>
+                <% unless comment.content.blank? %>
+                    <div class="homepagePostReplyContent"><%= comment.content.html_safe %></div>
+                <% end %>
+              </div>
+              <div class="cl"></div>
+            </li>
+        <% end %>
+      </ul>
+    </div>
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
+        <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %>
+      </div>
+      <div class="homepagePostReplyInputContainer">
+        <div nhname='new_message_<%= act.id %>' style="display:none;">
+          <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
+              <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
+              <div nhname='toolbar_container_<%= act.id %>'></div>
+              <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="org_content"></textarea>
+              <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
+
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= act.id %>'></p>
+          <% end %>
+        </div>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+
+<script type="text/javascript">
+    function expand_reply(container, btnid) {
+        var target = $(container);
+        var btn = $(btnid);
+        if (btn.data('init') == '0') {
+            btn.data('init', 1);
+            btn.html('收起回复');
+            target.show();
+        } else {
+            btn.data('init', 0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
 </script>
\ No newline at end of file
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index eed0dabf6..0d490df77 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -1,4 +1,5 @@
 <ul class="orgListRow">
+  <li class="orgOrder fb">顺序</li>
   <li class="orgListUser fb">已有栏目</li>
   <li class="orgListStatus fb">状态</li>
   <li class="orgListStatus fb">类型</li>
@@ -6,48 +7,64 @@
   <div class="cl"></div>
 </ul>
 
-<% default_fields.each do |field| %>
-    <% name = get_default_name(field) %>
-    <ul class="orgListRow">
-      <li class="orgListUser"><%= name %></li>
-      <li class="orgListStatus">默认</li>
-      <li class="orgListStatus">默认</li>
-      <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为可见" %></a>
-      <div class="cl"></div>
-    </ul>
-<% end %>
-
 <% subfields.each do |field| %>
-    <ul class="orgListRow">
-      <li class="orgListUser">
-        <div id="subfield_show_<%= field.id %>"><%= field.name %></div>
-        <div id="subfield_edit_<%= field.id %>" style="display:none;">
-          <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;"/>
-        </div>
-      </li>
-      <li class="orgListStatus">新增</li>
-      <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-      <li class="orgListUser hidden">
-        <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-            <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
-              <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+    <% if is_default_field?(field) %>
+        <% name = get_default_name(field) %>
+        <ul class="orgListRow">
+          <li class="orgOrder">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+              <%= field.priority %>
             </div>
-        <% else %>
-            <div id="sub_dir_show_<%= field.id %>" >
-              <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+              <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
             </div>
-        <% end %>
-        <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
-          <input type="text" name="name" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
-        </div>
-      </li>
-      <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
-      <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为可见" %></a>
-      <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>
-      <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+          </li>
+          <li class="orgListUser"><%= name %></li>
+          <li class="orgListStatus">默认</li>
+          <li class="orgListStatus">默认</li>
+          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为可见" %></a>
+          <div class="cl"></div>
+        </ul>
+    <% else %>
+        <ul class="orgListRow">
+          <li class="orgOrder">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+              <%= field.priority %>
+            </div>
+            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+              <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
+            </div>
+          </li>
+          <li class="orgListUser">
+            <div id="subfield_show_<%= field.id %>"><%= field.name %></div>
+            <div id="subfield_edit_<%= field.id %>" style="display:none;">
+              <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <li class="orgListStatus">新增</li>
+          <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgListUser hidden">
+            <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
+                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+                  <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+                </div>
+            <% else %>
+                <div id="sub_dir_show_<%= field.id %>" >
+                  <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+                </div>
+            <% end %>
+            <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
+              <input type="text" name="name" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
+          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为可见" %></a>
+          <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>
+          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
 
-      <div class="cl"></div>
-    </ul>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
 <% end %>
 
 <script>
@@ -96,6 +113,35 @@
         $(show_id).show();
         $(edit_id).hide();
     }
+
+    function edit_priority(show_id, edit_id){
+        $(show_id).toggle();
+        $(edit_id).toggle();
+        $(edit_id).find("input").focus();
+        $(edit_id).find("input").on('keypress',function(e){
+            if (e.keyCode == 13){
+                this.blur();
+            }
+        });
+    }
+
+    function update_priority(show_id, edit_id, field_id, input_value){
+        var re = /^[0-9]*[1-9]*[0-9]$/
+        if(re.test(input_value) && $(show_id).html().trim() != input_value.trim() && input_value.trim() != ''){
+            if(confirm("确定修改为" + input_value + "?")){
+                $.ajax({
+                    url: "/org_subfields/" + field_id + "/update_priority?priority=" + input_value,
+                    type: 'put'
+                });
+            }
+        }
+        else
+        {
+            $(edit_id).find("input").val($(show_id).html().trim());
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+    }
     function hide(content, id){
         if (content.text() == '设为隐藏')
             $.ajax({
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 84ddce252..3ef5d547c 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -70,7 +70,7 @@
         </div>
         <div class="cl"></div>
         <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
-          <input type="checkbox" id="is_public" onblur="disable_down($(this), $('#allow_download'),$('#allow_down_hint'));" name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
+          <input type="checkbox" id="is_public" onclick="disable_down($(this), $('#allow_download'),$('#allow_down_hint'));"  name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
         </div>
         <div class="orgRow mb10 mt5"><span style="margin-left:10px;">下载支持&nbsp;: </span>
           <input id="allow_download" type="checkbox" style="margin-top:5px;" <%= @organization.is_public? ? "":"DISABLED" %> name="organization[allow_guest_download]" <%= @organization.allow_guest_download ? 'checked': ''%> class="ml3" />
@@ -119,8 +119,7 @@
       </div>
       <div class="undis ml15 mr15" id="orgContent_3">
         <div class="orgMemberList" id="org_subfield_list">
-          <%= render :partial => 'organizations/subfield_list', :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
-                                                                            :subfields => @organization.org_subfields.where("field_type != 'default'") } %>
+          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")} %>
         </div>
         <div class="fr orgMemContainer">
           <div class="fr">
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index 73163521e..c694393f3 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -66,7 +66,7 @@
             <%= render :partial => 'projects/project_create', :locals => {:activity => activity, :user_activity_id => activity.id} %>
             <!--缺陷动态-->
         <% when "Issue" %>
-            <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id} %>
+            <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :project_id => activity.project_id} %>
 
             <!--message    -->
         <% when "Message" %>
@@ -78,7 +78,7 @@
             <% end %>
             <!--Attachment   -->
         <% when "Attachment" %>
-            <%= render :partial => 'users/course_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
+            <%= render :partial => 'users/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
             <!--<div class="problem_main">-->
               <!--<a class="problem_pic fl"><%#= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %></a>-->
 
diff --git a/app/views/projects/set_public_or_private.js.erb b/app/views/projects/set_public_or_private.js.erb
index dbca3f65c..282a17091 100644
--- a/app/views/projects/set_public_or_private.js.erb
+++ b/app/views/projects/set_public_or_private.js.erb
@@ -1,7 +1,7 @@
 <% if @project.is_public? %>
-    $("#set_project_public_<%= @project.id %>").text("设为私有");
     $("#show_project_<%= @project.id %>").attr("title","公开项目：<%= @project.name %>");
 <% else %>
-    $("#set_project_public_<%= @project.id %>").text("设为公开");
     $("#show_project_<%= @project.id %>").attr("title","私有项目：<%= @project.name %>");
-<% end %>
\ No newline at end of file
+<% end %>
+$("#set_project_public_<%= @project.id %>").replaceWith('<%= escape_javascript(link_to @project.is_public? ? "设为私有" : "设为公开", {:controller => "projects", :action => "set_public_or_private", :id => @project.id,:user_page => true},
+                                :id => "set_project_public_"+ @project.id.to_s,:method => "post",:remote=>true,:confirm=>"您确定要设置为"+(@project.is_public? ? "私有" : "公开")+"吗") %>');
\ No newline at end of file
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 8e7c58dc3..20d6df9ba 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -25,7 +25,7 @@
 
     <li >
       <span class="tit_fb ">编程代码：</span>
-      <div class="showHworkP break_word"><pre id="work-src" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
+      <div class="showHworkP break_word"><pre id="work-src_<%= work.id%>" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
         </div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index d66a30718..67c04d71f 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -59,8 +59,8 @@
 
     <li >
       <span class="tit_fb ">内容：</span>
-      <div class="showHworkP break_word">
-        <%= text_format(work.description) if work.description%>
+      <div class="showHworkP break_word upload_img" id="student_work_img_<%=work.id %>">
+        <%= work.description.html_safe if work.description%>
       </div>
       <div class="cl"></div>
     </li>
@@ -105,6 +105,9 @@
   <div class="cl"></div>
 </div>
 <script type="text/javascript">
+    $(function(){
+        showNormalImage('student_work_img_<%=work.id %>');
+    });
     function show_upload(){
         $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
         showModal('ajax-modal', '452px');
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 53e57fd9c..f9f55456b 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -71,7 +71,7 @@
                               indentUnit: 2,
                               matchBrackets: true,
                               readOnly: true,
-                              value: $("#work-src").text()
+                              value: $("#work-src_<%= work.id%>").text()
                           });
               <% elsif @homework.homework_type == 1 %>
                   $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
diff --git a/app/views/student_work/_work_edit_information.html.erb b/app/views/student_work/_work_edit_information.html.erb
index 1934d15eb..38e7e7c7e 100644
--- a/app/views/student_work/_work_edit_information.html.erb
+++ b/app/views/student_work/_work_edit_information.html.erb
@@ -4,9 +4,11 @@
     <p class="f14 mt5">
       <span class="fb">作品名称：</span><%=@student_work.name%>
     </p>
-    <p class="f14 mt5">
-      <span class="fb">作品描述：</span><%=@student_work.description%>
-    </p>
+    <div class="f14 mt5" style="max-width: 425px; color:#808181">
+      <div class="fb fl dis">作品描述：</div>
+      <div class="upload_img fl" style="max-width: 350px;"><%=@student_work.description.html_safe %></div>
+      <div class="cl"></div>
+    </div>
     <p class="mt5">
       <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
       <% if @student_work.attachments.empty? %>
diff --git a/app/views/student_work/_work_information.html.erb b/app/views/student_work/_work_information.html.erb
index d23f21c4d..88684263a 100644
--- a/app/views/student_work/_work_information.html.erb
+++ b/app/views/student_work/_work_information.html.erb
@@ -4,9 +4,11 @@
     <p class="f14 mt5">
       <span class="fb">作品名称：</span><%=@student_work.name%>
     </p>
-    <p class="f14 mt5">
-      <span class="fb">作品描述：</span><%=@student_work.description%>
-    </p>
+    <div class="f14 mt5" style="max-width: 425px; color:#808181">
+      <div class="fb fl dis">作品描述：</div>
+      <div class="upload_img fl" style="max-width: 350px;"><%=@student_work.description.html_safe %></div>
+      <div class="cl"></div>
+    </div>
     <p class="mt5">
       <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
       <% if @student_work.attachments.empty? %>
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index 56636a48e..8e1a2a546 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -1,3 +1,7 @@
+<% content_for :header_tags do %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag 'homework','baiduTemplate' %>
+<% end %>
 <div class="homepageRightBanner mb10">
   <div class="NewsBannerName">编辑作品</div>
 </div>
@@ -25,7 +29,7 @@
   </div><!----HomeWorkBox end-->
   <div class="cl"></div>
 
-  <div class="HomeWorkCon mt15">
+  <div class="HomeWorkCon mt15" nhname='student_work_form'>
     <%= labelled_form_for @work,:html => { :multipart => true },:remote=>true   do |f|%>
         <div class=" c_red mb10">
           提示：作品名称和描述中不要出现真实的姓名信息
@@ -46,13 +50,16 @@
           <p id="student_work_name_span" class="c_red mb10"></p>
         </div>
         <div class="mt10">
-          <textarea  name="student_work[description]" id="student_work_description" placeholder="请输入作品描述"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
-          <script>
+          <textarea placeholder="请输入作品描述" style="display: none" nhname='student_work_textarea' name="student_work[description]"><%= @work.description%></textarea>
+          <!--<textarea  name="student_work[description]" id="student_work_description" placeholder="请输入作品描述"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%#= @work.description%></textarea>-->
+          <!--<script>
               var text = document.getElementById("student_work_description");
               autoTextarea(text);// 调用
-          </script>
+          </script>-->
           <div class="cl"></div>
           <p id="student_work_description_textarea" class="c_red mb10"></p>
+          <p id="e_tip" class="c_grey"></p>
+          <p id="e_tips" class="c_grey"></p>
         </div>
 
         <div id="homework_attachments">
@@ -66,7 +73,7 @@
         <% end %>
 
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();edit_student_work(<%= @work.id%>);">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_message_submit_btn">确定</a>
           <span class="fr mr10 mt3">或</span>
           <%= link_to "取消",  student_work_index_path(:homework => @homework), :class => "fr mr10 mt3"%>
         </div>
@@ -96,23 +103,130 @@
     }
 
     function popupRegex(){
-        if(regexStudentWorkName()&&regexStudentWorkDescription())
-        {
-            if($("#group_member_ids").length > 0) {
-                if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
-                    $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-                    showModal('ajax-modal', '500px');
-                    $('#ajax-modal').siblings().remove();
-                    $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-                    $('#ajax-modal').parent().addClass("anonymos");
-                }
-            } else {
+        if($("#group_member_ids").length > 0) {
+            if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
                 $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
                 showModal('ajax-modal', '500px');
                 $('#ajax-modal').siblings().remove();
                 $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
                 $('#ajax-modal').parent().addClass("anonymos");
             }
+        } else {
+            $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+            showModal('ajax-modal', '500px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+            $('#ajax-modal').parent().addClass("anonymos");
         }
     }
+
+    function nh_check_field(params){
+        var result=true;
+        if(!regexStudentWorkName()) {
+            result=false;
+            return result;
+        }
+        if(params.content!=undefined){
+            if(params.content.isEmpty()){
+                result=false;
+            }
+            if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+                params.textarea.html(params.content.html());
+                params.content.sync();
+
+                if(params.content.isEmpty()){
+                    params.contentmsg.html('作品描述不能为空');
+                }else{
+                    params.contentmsg.html('');
+                }
+            }
+        }
+        return result;
+    }
+    function init_homework_form(params){
+        params.form.submit(function(){
+            params.textarea.html(params.editor.html());
+            params.editor.sync();
+            var flag = false;
+            if(params.form.attr('data-remote') != undefined ){
+                flag = true
+            }
+            var is_checked = nh_check_field({
+                issubmit:true,
+                content:params.editor,
+                contentmsg:params.contentmsg,
+                textarea:params.textarea
+            });
+
+            if(is_checked){
+                if(flag){
+                    popupRegex();
+                    return true;
+                }else{
+                    $(this)[0].submit();
+                    $("#ajax-indicator").hide();
+                    return false;
+                }
+            }
+            return false;
+        });
+    }
+    function init_homework_editor(params){
+        params.textarea.removeAttr('placeholder');
+        var editor = params.kindutil.create(params.textarea, {
+            resizeType : 1,minWidth:"1px",width:"100%",minHeight:"30px",height:"30px",
+            items : ['code','emoticons','fontname',
+                'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+                'formatblock', 'fontsize', '|','indent', 'outdent',
+                '|','imagedirectupload','table',   'media', 'preview',"more"
+            ],
+            afterChange:function(){//按键事件
+                var edit = this.edit;
+                var body = edit.doc.body;
+                //paramsHeight = params.kindutil.removeUnit(this.height);
+                edit.iframe.height(150);
+                this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) +  33, 150));
+            },
+            afterCreate:function(){
+                //init
+                var edit = this.edit;
+                var body = edit.doc.body;
+                edit.iframe[0].scroll = 'no';
+                body.style.overflowY = 'hidden';
+                //reset height
+                var edit = this.edit;
+                var body = edit.doc.body;
+                edit.html(params.textarea.innerHTML);
+                //paramsHeight = params.kindutil.removeUnit(this.height);
+                edit.iframe.height(150);
+                this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150));
+                elocalStorage(editor2,'student_work_<%=@work.id %>');
+            }
+        }).loadPlugin('paste');
+        return editor;
+    }
+    KindEditor.ready(function(K){
+        $("div[nhname='student_work_form']").each(function(){
+            var params = {};
+            params.kindutil = K;
+            params.div_form = $(this);
+            params.form = $("form",params.div_form);
+            if(params.form==undefined || params.form.length==0){
+                return;
+            }
+            params.textarea = $("textarea[nhname='student_work_textarea']",params.div_form);
+            params.contentmsg = $("#student_work_description_textarea");
+            params.submit_btn = $("#new_message_submit_btn");
+            if(params.textarea.data('init') == undefined) {
+                params.editor = init_homework_editor(params);
+                editor2 = params.editor;
+                init_homework_form(params);
+                params.submit_btn.click(function () {
+                    params.form.submit();
+                    $("#ajax-indicator").hide();
+                });
+                params.textarea.data('init', 1);
+            }
+        });
+    });
 </script>
\ No newline at end of file
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 41ec2b61b..8e7d87302 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -172,7 +172,7 @@
         <div class="mt5">
           <% if @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status < 2 %>
             <div class="fontGrey2 db fl">提交截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
-          <% elsif @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status >= 2 %>
+          <% elsif @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status >= 2 && @homework.anonymous_comment == 0 %>
               <div class="fontGrey2 db fl">匿评截止时间：<%= @homework.homework_detail_manual.evaluation_end %>&nbsp;23:59</div>
           <% end %>
           <% if @homework.homework_detail_manual.comment_status == 0 %>
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 5d2b134a8..c43482299 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -1,4 +1,9 @@
 <!-- 此界面只用来新建匿评作业作品 -->
+<% content_for :header_tags do %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag 'homework','baiduTemplate' %>
+<% end %>
+
 <script type="text/javascript">
   <%if @homework.homework_detail_manual.comment_status != 1%>
     $(function(){
@@ -57,26 +62,136 @@
   }
   // 作品校验
   function popupRegex(){
-      if(regexStudentWorkName()&&regexStudentWorkDescription())
-      {
-          if($("#group_member_ids").length > 0) {
-              if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
-                  $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-                  showModal('ajax-modal', '500px');
-                  $('#ajax-modal').siblings().remove();
-                  $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
-                  $('#ajax-modal').parent().addClass("anonymos");
-              }
-          } else {
+      if($("#group_member_ids").length > 0) {
+          if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
               $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
               showModal('ajax-modal', '500px');
               $('#ajax-modal').siblings().remove();
               $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
               $('#ajax-modal').parent().addClass("anonymos");
           }
+      } else {
+          $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+          showModal('ajax-modal', '500px');
+          $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+          $('#ajax-modal').parent().addClass("anonymos");
       }
   }
 
+  var KE = {
+      MDU: "1234455",//当前文章标识符
+  };
+
+  function nh_check_field(params){
+      var result=true;
+      if(!regexStudentWorkName()) {
+          result=false;
+          return result;
+      }
+      if(params.content!=undefined){
+          if(params.content.isEmpty()){
+              result=false;
+          }
+          if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+              params.textarea.html(params.content.html());
+              params.content.sync();
+
+              if(params.content.isEmpty()){
+                  params.contentmsg.html('作品描述不能为空');
+              }else{
+                  params.contentmsg.html('');
+              }
+          }
+      }
+      return result;
+  }
+  function init_homework_form(params){
+      params.form.submit(function(){
+          params.textarea.html(params.editor.html());
+          params.editor.sync();
+          var flag = false;
+          if(params.form.attr('data-remote') != undefined ){
+              flag = true
+          }
+          var is_checked = nh_check_field({
+           issubmit:true,
+           content:params.editor,
+           contentmsg:params.contentmsg,
+           textarea:params.textarea
+           });
+
+          if(is_checked){
+              if(flag){
+                  popupRegex();
+                  return true;
+              }else{
+                  $(this)[0].submit();
+                  $("#ajax-indicator").hide();
+                  return false;
+              }
+          }
+          return false;
+      });
+  }
+  function init_homework_editor(params){
+      params.textarea.removeAttr('placeholder');
+      var editor = params.kindutil.create(params.textarea, {
+          resizeType : 1,minWidth:"1px",width:"100%",minHeight:"30px",height:"30px",
+          items : ['code','emoticons','fontname',
+              'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+              'formatblock', 'fontsize', '|','indent', 'outdent',
+              '|','imagedirectupload','table',   'media', 'preview',"more"
+          ],
+          afterChange:function(){//按键事件
+              var edit = this.edit;
+              var body = edit.doc.body;
+              //paramsHeight = params.kindutil.removeUnit(this.height);
+              edit.iframe.height(150);
+              this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) +  33, 150));
+          },
+          afterCreate:function(){
+              //init
+              var edit = this.edit;
+              var body = edit.doc.body;
+              edit.iframe[0].scroll = 'no';
+              body.style.overflowY = 'hidden';
+              //reset height
+              var edit = this.edit;
+              var body = edit.doc.body;
+              edit.html(params.textarea.innerHTML);
+              //paramsHeight = params.kindutil.removeUnit(this.height);
+              edit.iframe.height(150);
+              this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150));
+              elocalStorage(editor2,'student_work_<%=@homework.id %>');
+          }
+      }).loadPlugin('paste');
+      return editor;
+  }
+  KindEditor.ready(function(K){
+      $("div[nhname='student_work_form']").each(function(){
+          var params = {};
+          params.kindutil = K;
+          params.div_form = $(this);
+          params.form = $("form",params.div_form);
+          if(params.form==undefined || params.form.length==0){
+              return;
+          }
+          params.textarea = $("textarea[nhname='student_work_textarea']",params.div_form);
+          params.contentmsg = $("#student_work_description_textarea");
+          params.submit_btn = $("#new_message_submit_btn");
+          if(params.textarea.data('init') == undefined) {
+              params.editor = init_homework_editor(params);
+              editor2 = params.editor;
+              init_homework_form(params);
+              params.submit_btn.click(function () {
+                  params.form.submit();
+                  $("#ajax-indicator").hide();
+              });
+              params.textarea.data('init', 1);
+          }
+      });
+  });
 </script>
 
 <div class="homepageRightBanner mb10">
@@ -110,7 +225,7 @@
   </div><!----HomeWorkBox end-->
   <div class="cl"></div>
 
-  <div class="HomeWorkCon mt15">
+  <div class="HomeWorkCon mt15" nhname='student_work_form'>
     <%= form_for(@student_work,
                  :html => { :multipart => true },
                  :url => {:controller => 'student_work',
@@ -127,18 +242,21 @@
             <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>User.current.id %>
         <% end %>
         <div>
-          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请输入作品名称", :onkeyup => "regexStudentWorkName();" %>
+          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请输入作品名称",:value=>"#{@homework.name}的作品提交", :onkeyup => "regexStudentWorkName();" %>
           <div class="cl"></div>
           <p id="student_work_name_span" class="c_red mb10"></p>
         </div>
         <div class="mt10">
-          <%= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请输入作品描述", :onkeyup => "regexStudentWorkDescription();"%>
-          <script>
+          <textarea placeholder="请输入作品描述" style="display: none" nhname='student_work_textarea' name="student_work[description]"></textarea>
+          <%#= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请输入作品描述", :onkeyup => "regexStudentWorkDescription();"%>
+          <!--<script>
               var text = document.getElementById("student_work_description");
               autoTextarea(text);// 调用
-          </script>
+          </script>-->
           <div class="cl"></div>
           <p id="student_work_description_textarea" class="c_red mb10"></p>
+          <p id="e_tip" class="c_grey"></p>
+          <p id="e_tips" class="c_grey"></p>
         </div>
 
         <div id="homework_attachments">
@@ -167,9 +285,9 @@
         </div>-->
 
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">提交</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_message_submit_btn">提交</a>
           <span class="fr mr10 mt3">或</span>
-          <%= link_to "取消",  delete_work_student_work_index_path(:homework =>@homework.id), :class => "fr mr10 mt3"%>
+          <%= link_to "取消",  delete_work_student_work_index_path(:homework =>@homework.id),:id => 'new_message_cancel_btn', :class => "fr mr10 mt3"%>
         </div>
         <div class="cl"></div>
     <% end%>
diff --git a/app/views/student_work/show.js.erb b/app/views/student_work/show.js.erb
index c89180b16..135da3c0d 100644
--- a/app/views/student_work/show.js.erb
+++ b/app/views/student_work/show.js.erb
@@ -1,36 +1,36 @@
-if($("#about_hwork_<%= @work.id%>").children().length > 0){
-  $("#about_hwork_<%= @work.id%>").html("");
-}
-else{
-  <% if @homework.homework_type == 2%>
-    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
-
-    var program_name = "text/x-csrc";
-    var language = <%= @homework.language %>;
-    if (language == 1) {
-      program_name = 'text/x-csrc';
-    } else if(language==2){
-      program_name = 'text/x-c++src';
-    }else if(language==3){
-      program_name = 'text/x-cython';
-    } else if(language==4){
-      program_name = 'text/x-java';
-    }
-
-    var editor = CodeMirror(document.getElementById("work-code_<%= @work.id%>"), {
-          mode: {name: program_name,
-            version: 2,
-            singleLineStringErrors: false},
-          lineNumbers: true,
-          indentUnit: 2,
-          matchBrackets: true,
-      readOnly: true,
-      value: $("#work-src").text()
-        }
-    );
-
-  <% else%>
-    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
-  <% end%>
-  $('#score_<%= @work.id%>').peSlider({range: 'min'});
+if($("#about_hwork_<%= @work.id%>").children().length > 0){
+  $("#about_hwork_<%= @work.id%>").html("");
+}
+else{
+  <% if @homework.homework_type == 2%>
+    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
+
+    var program_name = "text/x-csrc";
+    var language = <%= @homework.language %>;
+    if (language == 1) {
+      program_name = 'text/x-csrc';
+    } else if(language==2){
+      program_name = 'text/x-c++src';
+    }else if(language==3){
+      program_name = 'text/x-cython';
+    } else if(language==4){
+      program_name = 'text/x-java';
+    }
+
+    var editor = CodeMirror(document.getElementById("work-code_<%= @work.id%>"), {
+          mode: {name: program_name,
+            version: 2,
+            singleLineStringErrors: false},
+          lineNumbers: true,
+          indentUnit: 2,
+          matchBrackets: true,
+      readOnly: true,
+      value: $("#work-src_<%= @work.id%>").text()
+        }
+    );
+
+  <% else%>
+    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
+  <% end%>
+  $('#score_<%= @work.id%>').peSlider({range: 'min'});
 }
\ No newline at end of file
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index df084357a..7477eaabd 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -1,23 +1,15 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <% if activity.status == 1 %>
-          <%= image_tag("/images/trustie_logo1.png", width: "50px", height: "50px") %>
-      <% else %>
-          <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
-          <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-      <% end %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
-        <% if activity.status == 1 %>
-            <span class="fontBlue2">确实团队</span>
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% else %>
-            <% if activity.try(:author).try(:realname) == ' ' %>
-                <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-            <% else %>
-                <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-            <% end %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
diff --git a/app/views/users/_homework_detail_information.html.erb b/app/views/users/_homework_detail_information.html.erb
index 07328e696..1829fa61c 100644
--- a/app/views/users/_homework_detail_information.html.erb
+++ b/app/views/users/_homework_detail_information.html.erb
@@ -1,7 +1,17 @@
 <div class="subject-pop-info">题目信息</div>
 <div class="subject-pop-wrap">
   <% if homework.nil? %>
-      <span class="c_red" id="homework_notice_span">请先在左侧选择作业</span>
+      <span id="homework_notice_span">本题库遵循创作共用许可证<br/><br/>
+
+教师给学生出题本质上是一种创作行为，题目的作者通常为此付出大量时间和精力。好的题目不仅能加深学生对知识点的理解，还能激发学生兴趣，提升学习效率。为此，本网站的题库许可证基于创作共用许可证（ Creative Commons License ）建立，其核心条款包括：<br/><br/>
+
+1. 署名：必须提到原作者。<br/><br/>
+
+2. 非商业用途：不得用于盈利性目的。<br/><br/>
+
+3. 相同方式共享：允许修改原作品，但必须使用相同的许可证发布。<br/><br/>
+
+对此许可证的支持或反对，请在网站中留言，我们不断完善，谢谢！</span>
   <% else %>
       <div class="subject-pop-intro mb15">标题：<%=homework.name %><br />
         来源：<%=homework.course.name %><br />
diff --git a/app/views/users/_homework_repository_detail.html.erb b/app/views/users/_homework_repository_detail.html.erb
index 7cf74e11e..efbf24955 100644
--- a/app/views/users/_homework_repository_detail.html.erb
+++ b/app/views/users/_homework_repository_detail.html.erb
@@ -2,7 +2,18 @@
   <div class="subjectInfo">题目信息</div>
   <div class="subject-content-wrapper">
     <% if homework.nil? %>
-        <span class="c_red" id="homework_notice_span">请先在左侧选择作业</span>
+        <span id="homework_notice_span"><span class="center db">本题库遵循创作共用许可证</span><br>
+
+教师给学生出题本质上是一种创作行为，题目的作者通常为此付出大量时间和精力。好的题目不仅能加深学生对知识点的理解，还能激发学生兴趣，提升学习效率。为此，本网站的题库许可证基于创作共用许可证（ Creative Commons License ）建立，其核心条款包括：<br/><br/>
+
+1. 署名：必须提到原作者。<br/><br/>
+
+2. 非商业用途：不得用于盈利性目的。<br/><br/>
+
+3. 相同方式共享：允许修改原作品，但必须使用相同的许可证发布。<br/><br/>
+
+对此许可证的支持或反对，请在网站中留言，我们不断完善，谢谢！
+</span>
     <% else %>
         <div class="subjectIntro mb15">标题：<%=homework.name %><br />
           来源：<%=homework.course.name %><br />
diff --git a/app/views/users/_homework_repository_list.html.erb b/app/views/users/_homework_repository_list.html.erb
index 67a8f47b4..99e6d4e27 100644
--- a/app/views/users/_homework_repository_list.html.erb
+++ b/app/views/users/_homework_repository_list.html.erb
@@ -1,18 +1,33 @@
 <ul class="subject-list-banner">
   <li class="subject-list-name fl hidden"><span style="padding-left:15px;">作业名称</span></li>
-  <li class="subject-list-from fl">来源</li>
-  <li class="subject-list-type fl">类别</li>
-  <li class="subject-list-publisher fl">贡献者</li>
+  <li class="subject-list-from fl">
+    <%= link_to "来源",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "course_name", :sort => @r_sort),:class => "fl ml55",:remote => true%>
+    <% if @order == "course_name"%>
+        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "course_name", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
+    <% end%>
+  </li>
+  <li class="subject-list-type fl">
+    <%= link_to "类别",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "homework_type", :sort => @r_sort),:class => "fl ml10",:remote => true%>
+    <% if @order == "homework_type"%>
+        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "homework_type", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
+    <% end%>
+  </li>
+  <li class="subject-list-publisher fl">
+    <%= link_to "贡献者",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "user_name", :sort => @r_sort),:class => "fl ml20",:remote => true%>
+    <% if @order == "user_name"%>
+        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "user_name", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
+    <% end%>
+  </li>
   <li class="subject-list-count fl">
-    <%= link_to "引用数",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "fl",:remote => true%>
+    <%= link_to "引用数",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "fl ml5",:remote => true%>
     <% if @order == "quotes"%>
-        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12" ,:remote => true%>
+        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
     <% end%>
   </li>
   <li class="fl subject-list-date">
     <%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "fl",:remote => true%>
     <% if @order == "created_at"%>
-        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12" ,:remote => true%>
+        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
     <% end%>
   </li>
 </ul>
diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb
index b98356c7b..deb0cb4c6 100644
--- a/app/views/users/_project_attachment.html.erb
+++ b/app/views/users/_project_attachment.html.erb
@@ -1,18 +1,32 @@
+
+
 <div class="resources mt10">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="50" height="50" alt="用户头像"/></a></div>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+    </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mt-4"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
-        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
-        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目附件）</a></div>
-      <div class="homepagePostSubmitContainer">
-        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
-        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to activity.project.name.to_s+" | 项目资源", project_files_path(activity.course), :class => "newsBlue ml15" %>
       </div>
-      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+      <div class="homepagePostTitle break_word" >
+        <%= link_to activity.filename, project_files_path(activity.course), :class => "postGrey" %>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline mr15">
+          文件大小：
+          <%= number_to_human_size activity.filesize%>
+        </div>
+        <div class="homepagePostDeadline">上传时间：<%= format_time(activity.created_on) %></div>
+      </div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 1ce03da17..5d472497d 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -13,6 +13,29 @@
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
       </div>
+      <div class="homepagePostSetting">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li>
+                <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
+              </li>
+              <li>
+                <% if !defined?(project_id) && !defined?(user_id) %>
+                    <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                <% elsif defined?(project_id) %>
+                    <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                <% elsif defined?(user_id) %>
+                    <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                <% end %>
+              </li>
+              <li>
+                <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </div>
       <div class="homepagePostTitle break_word">
         <% case activity.tracker_id %>
           <% when 1%>
@@ -51,6 +74,10 @@
         <div class="cl"></div>
       </div>
       <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
       <%# 局部刷新：修改xissue属性 %>
       <% if User.current.member_of?(activity.project) %>
           <% unless params[:action] == "index" %>
@@ -59,10 +86,7 @@
               </div>
           <% end %>
       <% end %>
-      <div class="cl"></div>
-      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
-      <div class="cl"></div>
+     <div class="cl"></div>
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
diff --git a/app/views/users/_show_detail_info.html.erb b/app/views/users/_show_detail_info.html.erb
index f2a2faeb3..7d4919149 100644
--- a/app/views/users/_show_detail_info.html.erb
+++ b/app/views/users/_show_detail_info.html.erb
@@ -1,6 +1,6 @@
 <div class="userCard boxShadow" style="<%= User.current == user ? 'top:-153px;':'' %>">
   <div class="userAvatarWrap fl">
-    <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_url_in_org(user), :alt => "用户头像", :target => '_blank' %>
+    <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_url_in_org(user.id), :alt => "用户头像", :target => '_blank' %>
     <%#= image_tag(url_to_avatar(user), :width => "50", :height => "50") %>
     <!--<img src="images/homepageImage.jpg" width="50" height="50" alt="个人头像"  />-->
   </div>
@@ -21,18 +21,18 @@
   <div class="cl"></div>
   <div>
     <div class="homepageImageBlock mb10">
-      <div><%= link_to User.watched_by(user.id).count, {:controller=>"users", :action=>"user_watchlist",:id=>user.id}, :class => 'homepageImageNumber',:target => "_blank" %></div>
-      <div class="homepageImageText"><%= link_to '关注',{:controller=>"users", :action=>"user_watchlist",:id=>user.id},:target => "_blank" %></div>
+      <div><%= link_to User.watched_by(user.id).count, user_watchlist_url_in_org(user.id), :class => 'homepageImageNumber',:target => "_blank" %></div>
+      <div class="homepageImageText"><%= link_to '关注',user_watchlist_url_in_org(user.id),:target => "_blank" %></div>
     </div>
     <div class="homepageVerDiv"></div>
     <div class="homepageImageBlock">
-      <div><%= link_to  user.watcher_users.count,{:controller=>"users", :action=>"user_fanslist",:id=>user.id}, :class => "homepageImageNumber fans_count_#{user.id}",:target => "_blank" %></div>
-      <div class="homepageImageText"><%= link_to '粉丝', {:controller=>"users", :action=>"user_fanslist",:id=>user.id},:target => "_blank" %></div>
+      <div><%= link_to  user.watcher_users.count,user_fanslist_url_in_org(user.id), :class => "homepageImageNumber fans_count_#{user.id}",:target => "_blank" %></div>
+      <div class="homepageImageText"><%= link_to '粉丝', user_fanslist_url_in_org(user.id),:target => "_blank" %></div>
     </div>
     <div class="homepageVerDiv"></div>
     <div class="homepageImageBlock">
-      <div><%= link_to user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count, user_blogs_path(user), :class => 'homepageImageNumber',:target => "_blank" %></div>
-      <div class="homepageImageText"><%= link_to '博客', user_blogs_path(user),:target => "_blank" %></div>
+      <div><%= link_to user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count, user_blogs_url_in_org(user.id), :class => 'homepageImageNumber',:target => "_blank" %></div>
+      <div class="homepageImageText"><%= link_to '博客', user_blogs_url_in_org(user.id),:target => "_blank" %></div>
     </div>
     <div class="cl"></div>
     <% if User.current != user %>
@@ -40,8 +40,8 @@
           <%= render :partial => 'users/watch_btn_for_picture', :locals => {:user => user} %>
         </div>
         <!--<a href="javascript:void(0);" class="userFollow mr27 fl">添加关注</a> <a href="javascript:void(0);" class="userCancel mr27 fl" style="display:none;">取消关注</a>-->
-        <%= link_to "留言", feedback_path(user), :class => 'greyBtn fr', :target => "_blank" %>
-        <%= link_to "私信", feedback_path(user), :class => 'greyBtn fr', :style => 'margin-right:20px;', :target => "_blank" %>
+        <%= link_to "留言", feedback_url_in_org(user.id), :class => 'greyBtn fr', :target => "_blank" %>
+        <%= link_to "私信", feedback_url_in_org(user.id), :class => 'greyBtn fr', :style => 'margin-right:20px;', :target => "_blank" %>
         <!--<a href="javascript:void(0);" class="greyBtn fl">私信</a><a href="javascript:void(0);" class="greyBtn fr">留言</a> -->
     <% end %>
   </div>
diff --git a/app/views/users/_show_user_homeworks.html.erb b/app/views/users/_show_user_homeworks.html.erb
index b9bbf6934..7e9df7f4d 100644
--- a/app/views/users/_show_user_homeworks.html.erb
+++ b/app/views/users/_show_user_homeworks.html.erb
@@ -30,7 +30,7 @@
       <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a>
     </div>
     <div >
-      <ul class="wlist" id="homewrok_ref_pages" style="margin-top: 5px;margin-right: 20px">
+      <ul class="wlist" id="homewrok_ref_pages" style="margin-top: 5px">
         <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
       </ul>
     </div>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 0e55c246c..01711ace3 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -89,7 +89,7 @@
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'Issue' %>
-                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id, :user_id => user_id} %>
                 <% when 'Message' %>
                     <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_course=>0,:is_board=>0} %>
                 <% when 'ProjectCreateInfo'%>
diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index d8649cabe..089171c3d 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -8,15 +8,15 @@
             <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
                 <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
                             :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
-                            :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
-                            :onmouseover =>"message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %>
+                            :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
+                            <!--# :onmouseover =>"message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
             <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
                 <%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
                             :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
-                            :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
-                            :onmouseover =>"message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %>
+                             :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
+                            <!--# :onmouseover =>"message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
             <% else %>
                 <%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
             <% end %>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 8b72ec781..f23d01d3c 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -16,7 +16,6 @@
             $("#GroupPopupBox a.group_save_btn").click();
         <% end %>
       });
-      var homework_description_editor;
       function checked_val() {
           if ($("#anonymous_comment").is(":checked")) {
               $("#anonymous_comment").val(1);
@@ -106,7 +105,7 @@
                   //paramsHeight = params.kindutil.removeUnit(this.height);
                   edit.iframe.height(150);
                   this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150));
-
+                  elocalStorage(homework_description_editor,'homework_<%=User.current.id %>');
               }
           }).loadPlugin('paste');
           return editor;
@@ -150,7 +149,7 @@
   <div class="cl"></div>
 
   <div class=" mt10">
-    <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") unless edit_mode%>
+    <%= link_to("从题库选用", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") unless edit_mode%>
     <% unless edit_mode %>
         <input type="hidden" name="quotes" id="ref_homework_id" value=""/>
     <% end %>
@@ -159,7 +158,7 @@
     <% end %>
     <div class="calendar_div fl mr10">
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
-      <% if homework.homework_detail_manual.comment_status.to_i < 3 %>
+      <% if homework.homework_detail_manual.comment_status.to_i < 2 %>
         <%= calendar_for('homework_end_time')%>
       <% end %>
     </div>
@@ -199,6 +198,8 @@
       <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>
     </div>
     <p id="homework_course_id_span" class="c_red mt5"></p>
+    <p id="e_tip" class="c_grey"></p>
+    <p id="e_tips" class="c_grey"></p>
     <div class="cl"></div>
 
     <div id="homework_attachments">
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 62568d505..3b035179b 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -1,692 +1,707 @@
-<% if ma.class == CourseMessage %>
-    <% if ma.course_message_type == "News" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
-          <li class="homepageNewsContent fl">
-            <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></li>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p><strong>标题：</strong><%= ma.course_message.title %></p>
-            <% unless ma.course_message.description.nil? %>
-                <div class="fl"><strong>内容：</strong></div>
-                <div class="ml36"><%= ma.course_message.description.html_safe %></div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "Comment" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
-          <li class="homepageNewsContent fl">
-            <%= link_to  ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></li>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p><strong>评论对象：</strong><%= ma.course_message.commented.title %></p>
-            <% unless ma.course_message.comments.nil? %>
-                <div class="fl"><strong>评论内容：</strong></div>
-                <div class="ml60"><%= ma.course_message.comments.html_safe %></div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil?%>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
-                <%= link_to "作业标题：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
-                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover =>"message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %>
-            <% else %>
-                <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                            :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover => "message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %>
-            <% end %>
-          </a></li>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
-                <p>
-                  <%= User.current.lastname + User.current.firstname %>老师您好！
-                  <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
-                </p>
-                <ul class="ul_normal_color">
-                  <li>课程名称：<%= ma.course_message.course.name %>
-                    (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-                  <li>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></li>
-                  <li>发布时间：<span style="color:Red;"><%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %></span></li>
-                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;23:59</span></li>
-                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;23:59</span></li>
-                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;23:59</span></li>
-                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
-                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
-                </ul>
-                <p>
-                  您可以修改作业内容、评分规则、匿评过程等，谢谢！
-                </p>
-            <% else %>
-                <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
-                <ul class="ul_normal_color">
-                  <li>课程名称：<%= ma.course_message.course.name %>
-                    (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-                  <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
-                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
-                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
-                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
-                </ul>
-                <p>
-                  请抓紧时间提交您的作品，谢谢！
-                </p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师',
-            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
-          <li class="homepageHomeworkContent fl">
-            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
-                <p>
-                  <%= User.current.lastname + User.current.firstname %>同学您好！
-                  <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
-                </p>
-                <ul class="ul_normal_color">
-                  <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-                  <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
-                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
-                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
-                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
-                  <p>请抓紧时间提交您的作品，谢谢！</p>
-                </ul>
-            <% end %>
-          </div>
-          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到啦</li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <!--作品开启匿评 待整合：时间紧-->
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
-          </li>
-          <li class="homepageNewsContent fl">
-            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
-            </p>
-            <ul class="ul_normal_color">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-              <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
-              <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
-              <li>匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
-            </ul>
-            <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
-              <p>请您尽早完成匿评，如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。</p>
-              <p>例如，您缺评了两份作品，则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分</p>
-            <% end%>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <!--作品关闭匿评-->
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
-          <li class="homepageNewsContent fl">
-            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))"%>
-          </li>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              该作业已经关闭了匿评。作业信息如下：
-            </p>
-            <ul class="ul_grey">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-              <li>作业标题：<%= ma.course_message.name %></li>
-            </ul>
-            <p></p>
-            <p class="c_red">注：缺省情况下，系统将在作业提交截止日期后14天自动关闭匿评。</p>
-            <p></p>
-            <% if User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
-                <p>祝您的教学活动高效、顺利、愉快！</p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动作业匿评失败</span>
-          </li>
-          <li class="homepageNewsContent fl">
-            <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败啦
-
-            </p>
-            <ul class="ul_normal_color">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
-              <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
-              <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;23:59</span></li>
-            </ul>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-
-    <% if ma.course_message_type == "Poll" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
-                        :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a></li>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <%= ma.course_message.polls_name %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "Message" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
-            <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
-          <% if ma.course_message.parent_id.nil? %>
-              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover =>"message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a></li>
-              <div  style="display: none" class="message_title_red system_message_style" >
-                <p><strong>主题：</strong><%= ma.course_message.subject %></p>
-                <% unless ma.course_message.content.nil? %>
-                    <div class="fl"><strong>内容：</strong></div>
-                    <div class="ml36"><%= ma.course_message.content.html_safe %></div>
-                <% end %>
-              </div>
-          <% else %>
-              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
-                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover =>"message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a></li>
-              <div  style="display: none" class="message_title_red system_message_style" >
-                <p><strong>主题：</strong><%= ma.course_message.subject %></p>
-                <% unless ma.course_message.content.nil? %>
-                    <div class="fl"><strong>内容：</strong></div>
-                    <div class="ml36"><%= ma.course_message.content.html_safe %></div>
-                <% end %>
-              </div>
-          <% end %>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "StudentWorksScore" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <% if ma.course_message.reviewer_role == 3 %>
-                <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30") %>
-            <% else %>
-                <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
-            <% end %>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <% if ma.course_message.reviewer_role == 3 %>
-                <span class="newsBlue homepageNewsPublisher">匿名用户</span>
-            <% else %>
-                <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-            <% end %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                          <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %>
-                        </span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <% unless ma.content.nil? %>
-                <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
-                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover =>"message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a></li>
-                <div  style="display: none" class="message_title_red system_message_style" >
-                  <p>
-                    <%= User.current.show_name %>同学您好！
-                    <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%><%= ma.status == 0? "评阅了您的作品":"重新评阅了您的作品"%>。详情如下：
-                  </p>
-                  <ul class="ul_normal_color">
-                    <li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
-                    <li>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></li>
-                    <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
-                    <li>作品评分：<span style="color:Red;"><%= content[0] %>分</span></li>
-                    <% if content.size > 1 %>
-                        <div class="fl" style="width:74px;"><li>作品评语：</li></div>
-                        <div style="margin-left:74px"><span style="color:Red;"><%= content[1] %></span></div>
-                    <% end %>
-                  </ul>
-                  <p>
-                    本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。  期待您取得更大的进步！
-                  </p>
-                </div>
-            <% end %>
-            <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-            </ul>
-    <% end %>
-    <% if ma.course_message_type == "JournalsForMessage" %>
-        <% if ma.course_message.jour_type == 'Course' %>
-            <% if params[:type] != 'homework' %>
-                <ul class="homepageNewsList fl">
-                  <li class="homepageNewsPortrait fl">
-                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-                  </li>
-                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">在课程中留言了：</span>
-                  </li>
-                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                    <%= link_to ma.course_message.notes.html_safe, course_feedback_path(:id => ma.course_id),
-                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                :onmouseover => "message_titile_show($(this),event)",
-                                :onmouseout => "message_titile_hide($(this))" %></a>
-                  </li>
-                  <div style="display: none" class="message_title_red system_message_style">
-                    <%= ma.course_message.notes.html_safe %>
-                  </div>
-                  <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                </ul>
-            <% end %>
-        <% else %>
-            <ul class="homepageNewsList fl">
-              <li class="homepageNewsPortrait fl">
-                <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
-              </li>
-              <li class="homepageNewsPubType fl">
-                <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname +
-                                    "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}",
-                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
-              </li>
-              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover => "message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a>
-              </li>
-              <div style="display: none" class="message_title_red system_message_style">
-                <p>
-                  <%= User.current.show_name %>老师您好！
-                  <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"%>回复了您的作品评论。详情如下：
-                </p>
-                <ul class="ul_normal_color">
-                  <li>回复内容：<span style="color:red;"><%= ma.course_message.notes  %></span></li>
-                  <li>您的评论：<span style="color:red;"><%= ma.course_message.jour.comment  %></span></li>
-                  <li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
-                  <li>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></li>
-                </ul>
-              </div>
-              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-            </ul>
-        <% end %>
-    <% end %>
-    <!-- 作业迟交，不能参与匿评提醒消息 -->
-    <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %></a></li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span>
-          </li>
-          <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %>
-              <%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
-            </p>
-            <ul class="ul_grey">
-              <li>课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</li>
-              <li>作业标题：<%= ma.course_message.homework_common.name %></li>
-              <li>提交截止：<%= ma.course_message.homework_common.end_time %>&nbsp;23:59</li>
-              <li>提交时间：<%= format_time(ma.course_message.created_at) %></li>
-              <li>迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分</li>
-            </ul>
-            <p>如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!</p>
-          </div>
-          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp;您成功提交了作品（但被标记为迟交啦）</li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <!-- 创建课程消息 -->
-    <% if ma.course_message_type == "Course" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <span class="newsBlue homepageNewsPublisher">系统提示</span>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您成功创建了课程：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to "课程名称：" + ma.course_message.name, course_path(ma.course_message),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a></li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个课程，详情如下：
-            </p>
-            <p>课程名称：<%= ma.course_message.name %></p>
-            <p>开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %></p>
-            <p>课程ID：<span style="color:red;"><%= ma.course_message.id %></span></p>
-            <p>课程密码：<span style="color:red;"><%= ma.course_message.password %></span></p>
-            <p>学时总数：<%= ma.course_message.class_period %></p>
-            <p>创建时间：<%= format_time(ma.course_message.created_at) %></p>
-            <p>您可以点击左上角的“配置”按钮，修改课程基本信息，添加及删除课程成员。您也可以把课程ID及密码告诉学生和其他成员，让他们输入ID及密码加入课程。</p>
-            <% if ma.course_message.is_public %>
-              <p>您的课程是公开的，所有人都能访问您的课程。若不想设置为公开，您可以在配置中设置。</p>
-            <% else %>
-              <p>您的课程是私有的，非课程成员不能访问您的课程。如果想设置为公开，您可以在配置中设置。</p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "JoinCourseRequest" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
-          <li class="homepageNewsPubType fl">
-            <span class="newsBlue homepageNewsPublisher">系统提示</span>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span>
-          </li>
-          <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
-            </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的课程成员申请，信息如下：
-            </p>
-            <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
-            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
-            <div class="fl">课程描述：</div>
-            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
-            <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
-          </div>
-          <li class="homepageHomeworkContentWarn fl">
-            <span id="deal_info_<%=ma.id%>">
-              <% if ma.status == 0 || ma.status.nil?%>
-                <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
-                  |
-                  <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
-             <% elsif ma.status == 1%> <!-- 同意 -->
-                 您已经同意了该申请
-             <% elsif ma.status == 2%> <!-- 拒绝 -->
-                 您已经拒绝了该申请
-             <%end %>
-             </span>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "CourseRequestDealResult" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
-          <li class="homepageNewsPubType fl">
-            <span class="newsBlue homepageNewsPublisher">系统提示</span>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
-              课程申请进度反馈：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to  ma.status == 1 ?
-                    '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过'
-                     :
-                    '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝', course_path(Course.find(ma.course_id)),
-                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
-             </span>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %>老师您好！您已成功加入课程<%= Course.find(ma.course_id).name%>。
-            </p>
-            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
-            <div class="fl">课程描述：</div>
-            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
-            <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-
-    <!--被老师拉入课程-->
-    <% if ma.course_message_type == "JoinCourse" and ma.status == 0 %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了课程：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
-                <% teacher = User.find(ma.course_message_id) %>
-                <p><%= teacher.show_name %>(<%= teacher %>)老师把您加入了课程，详情如下：</p>
-                <p>课程名称：<%= ma.course.name %></p>
-                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
-                <p>课程ID：<%= ma.course.id %></p>
-                <p>课时总数：<%= ma.course.class_period %></p>
-            <% else %>
-                <p>
-                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
-                </p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-
-    <!--被老师拉入课程-->
-    <% if ma.course_message_type == "JoinCourse" and ma.status == 1 %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <span class="newsBlue homepageNewsPublisher">系统提示</span>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您增加了新的课程成员：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
-                <p>您增加了新的课程成员，详情如下：</p>
-                <p>成员：<%= User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")" %></p>
-                <p>课程名称：<%= ma.course.name %></p>
-                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
-                <p>课程ID：<%= ma.course.id %></p>
-                <p>课时总数：<%= ma.course.class_period %></p>
-            <% else %>
-                <p>
-                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
-                </p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    
-    <!--被老师移出课程-->
-    <% if ma.course_message_type == "RemoveFromCourse" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了课程：</span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <% if ma.course.is_public? || User.current.member_of?(ma.course) || User.current.admin? %>
-                <p>您已被<%= User.find(ma.course_message_id).show_name %>老师移出了课程，详情如下：</p>
-                <p>课程名称：<%= ma.course.name %></p>
-                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
-                <% if !ma.content.nil? %>
-                    <p>担任角色：<%= ma.content %></p>
-                <% end %>
-                <p>学时总数：<%= ma.course.class_period %></p>
-            <% else %>
-                <p>
-                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
-                </p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-
-    <!--老师发布测验 发给学生看-->
-    <% if ma.course_message_type == "Exercise" && ma.status == 2 %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl">
-            <span><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程测验 ：</span></li>
-          <li class="homepageNewsContent fl">
-            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))"%>
-          </li>
-
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布了课程测验 ，测验详情如下：
-            </p>
-            <ul class="ul_normal_color">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-              <li>测验标题：<%= ma.course_message.exercise_name %></li>
-              <!--<li>测验描述：<%#= ma.course_message.exercise_description %></li>-->
-              <!--<li>测验状态：<%#= ma.course_message.exercise_status == 1 ? '未发布':'已发布'%></li>-->
-              <!--<%# if ma.course_message.publish_time %>-->
-              <!--<li>发布时间：<%#= ma.course_message.publish_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>-->
-               <!--<%# end %>-->
-              <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
-              <li>答题时长：<%= ma.course_message.time == -1 ? '不限时' : ma.course_message.time.to_s + '分钟' %></li>
-              <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
-                <p>请记得在截止时间前完成测验噢，辛苦啦！</p>
-              <% end %>
-            </ul>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-
-
-    <% if ma.course_message_type == "Exercise" && ma.status == 3 %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-          <li class="homepageNewsPubType fl">
-           <span>  <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的测验：</span></li>
-          <li class="homepageHomeworkContent fl">
-            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))"%>
-
-          </li>
-
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布的课程测验截止时间快到了，测验详情如下：
-            </p>
-
-            <ul class="ul_normal_color">
-              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-              <li>测验标题：<%= ma.course_message.exercise_name %></li>
-              <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
-              <li>答题时长：<%= ma.course_message.time == -1 ? '无限制' : ma.course_message.time.to_s + '分钟' %></li>
-              <p>请及时完成课程测验，辛苦啦！</p>
-            </ul>
-          </div>
-          <li class="homepageHomeworkContentWarn fl">截止时间快到啦 </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
+<% if ma.class == CourseMessage %>
+    <% if ma.course_message_type == "News" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+          </li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p><strong>标题：</strong><%= ma.course_message.title %></p>
+            <% unless ma.course_message.description.nil? %>
+                <div class="fl"><strong>内容：</strong></div>
+                <div class="ml36"><%= ma.course_message.description.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "Comment" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to  ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+          </li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p><strong>评论对象：</strong><%= ma.course_message.commented.title %></p>
+            <% unless ma.course_message.comments.nil? %>
+                <div class="fl"><strong>评论内容：</strong></div>
+                <div class="ml60"><%= ma.course_message.comments.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil?%>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
+                <%= link_to "作业标题：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
+                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            <% else %>
+                <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                            :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover => "message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            <% end %>
+          </a></li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
+                <p>
+                  <%= User.current.lastname + User.current.firstname %>老师您好！
+                  <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
+                </p>
+                <ul class="ul_normal_color">
+                  <li>课程名称：<%= ma.course_message.course.name %>
+                    (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></li>
+                  <li>发布时间：<span style="color:Red;"><%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %></span></li>
+                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;23:59</span></li>
+                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;23:59</span></li>
+                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;23:59</span></li>
+                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
+                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+                </ul>
+                <p>
+                  您可以修改作业内容、评分规则、匿评过程等，谢谢！
+                </p>
+            <% else %>
+                <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
+                <ul class="ul_normal_color">
+                  <li>课程名称：<%= ma.course_message.course.name %>
+                    (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
+                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
+                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
+                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+                </ul>
+                <p>
+                  请抓紧时间提交您的作品，谢谢！
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师',
+            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
+          <li class="homepageHomeworkContent fl">
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
+                <p>
+                  <%= User.current.lastname + User.current.firstname %>同学您好！
+                  <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
+                </p>
+                <ul class="ul_normal_color">
+                  <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
+                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
+                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
+                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+                  <p>请抓紧时间提交您的作品，谢谢！</p>
+                </ul>
+            <% end %>
+          </div>
+          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到啦</li>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <!--作品开启匿评 待整合：时间紧-->
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
+          </li>
+          <li class="homepageNewsContent fl">
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                        :onmouseover => "message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
+            </p>
+            <ul class="ul_normal_color">
+              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+              <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+              <li>匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+            </ul>
+            <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
+              <p>请您尽早完成匿评，如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。</p>
+              <p>例如，您缺评了两份作品，则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分</p>
+            <% end%>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <!--作品关闭匿评-->
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))"%>-->
+          </li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
+              该作业已经关闭了匿评。作业信息如下：
+            </p>
+            <ul class="ul_grey">
+              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>作业标题：<%= ma.course_message.name %></li>
+            </ul>
+            <p></p>
+            <p class="c_red">注：缺省情况下，系统将在作业提交截止日期后14天自动关闭匿评。</p>
+            <p></p>
+            <% if User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
+                <p>祝您的教学活动高效、顺利、愉快！</p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+
+    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动作业匿评失败</span>
+          </li>
+          <li class="homepageNewsContent fl">
+            <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
+              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败啦
+
+            </p>
+            <ul class="ul_normal_color">
+              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
+              <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+              <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;23:59</span></li>
+            </ul>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+
+    <% if ma.course_message_type == "Poll" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷：</span></li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
+                        :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}" %>
+                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+          </a></li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <%= ma.course_message.polls_name %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "Message" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+            <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
+          <% if ma.course_message.parent_id.nil? %>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+              </a></li>
+              <div  style="display: none" class="message_title_red system_message_style" >
+                <p><strong>主题：</strong><%= ma.course_message.subject %></p>
+                <% unless ma.course_message.content.nil? %>
+                    <div class="fl"><strong>内容：</strong></div>
+                    <div class="ml36"><%= ma.course_message.content.html_safe %></div>
+                <% end %>
+              </div>
+          <% else %>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                            :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+              </a></li>
+              <div  style="display: none" class="message_title_red system_message_style" >
+                <p><strong>主题：</strong><%= ma.course_message.subject %></p>
+                <% unless ma.course_message.content.nil? %>
+                    <div class="fl"><strong>内容：</strong></div>
+                    <div class="ml36"><%= ma.course_message.content.html_safe %></div>
+                <% end %>
+              </div>
+          <% end %>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "StudentWorksScore" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <% if ma.course_message.reviewer_role == 3 %>
+                <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30") %>
+            <% else %>
+                <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
+            <% end %>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <% if ma.course_message.reviewer_role == 3 %>
+                <span class="newsBlue homepageNewsPublisher">匿名用户</span>
+            <% else %>
+                <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <% end %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                          <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %>
+                        </span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <% unless ma.content.nil? %>
+                <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
+                            :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a></li>
+                <div  style="display: none" class="message_title_red system_message_style" >
+                  <p>
+                    <%= User.current.show_name %>同学您好！
+                    <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%><%= ma.status == 0? "评阅了您的作品":"重新评阅了您的作品"%>。详情如下：
+                  </p>
+                  <ul class="ul_normal_color">
+                    <li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
+                    <li>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></li>
+                    <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
+                    <li>作品评分：<span style="color:Red;"><%= content[0] %>分</span></li>
+                    <% if content.size > 1 %>
+                        <div class="fl" style="width:74px;"><li>作品评语：</li></div>
+                        <div style="margin-left:74px"><span style="color:Red;"><%= content[1] %></span></div>
+                    <% end %>
+                  </ul>
+                  <p>
+                    本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。  期待您取得更大的进步！
+                  </p>
+                </div>
+            <% end %>
+            <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+    <% end %>
+    <% if ma.course_message_type == "JournalsForMessage" %>
+        <% if ma.course_message.jour_type == 'Course' %>
+            <% if params[:type] != 'homework' %>
+                <ul class="homepageNewsList fl">
+                  <li class="homepageNewsPortrait fl">
+                    <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                  </li>
+                  <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">在课程中留言了：</span>
+                  </li>
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                    <%= link_to ma.course_message.notes.html_safe, course_feedback_path(:id => ma.course_id),
+                                :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                                <!--:onmouseover => "message_titile_show($(this),event)",-->
+                                <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                    </a>
+                  </li>
+                  <div style="display: none" class="message_title_red system_message_style">
+                    <%= ma.course_message.notes.html_safe %>
+                  </div>
+                  <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                </ul>
+            <% end %>
+        <% else %>
+            <ul class="homepageNewsList fl">
+              <li class="homepageNewsPortrait fl">
+                <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+              </li>
+              <li class="homepageNewsPubType fl">
+                <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname +
+                                    "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}",
+                            user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
+              </li>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover => "message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p>
+                  <%= User.current.show_name %>老师您好！
+                  <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"%>回复了您的作品评论。详情如下：
+                </p>
+                <ul class="ul_normal_color">
+                  <li>回复内容：<span style="color:red;"><%= ma.course_message.notes  %></span></li>
+                  <li>您的评论：<span style="color:red;"><%= ma.course_message.jour.comment  %></span></li>
+                  <li>课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></li>
+                </ul>
+              </div>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% end %>
+    <% end %>
+    <!-- 作业迟交，不能参与匿评提醒消息 -->
+    <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %></a></li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span>
+          </li>
+          <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>
+              <%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
+            </p>
+            <ul class="ul_grey">
+              <li>课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</li>
+              <li>作业标题：<%= ma.course_message.homework_common.name %></li>
+              <li>提交截止：<%= ma.course_message.homework_common.end_time %>&nbsp;23:59</li>
+              <li>提交时间：<%= format_time(ma.course_message.created_at) %></li>
+              <li>迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分</li>
+            </ul>
+            <p>如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!</p>
+          </div>
+          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp;您成功提交了作品（但被标记为迟交啦）</li>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <!-- 创建课程消息 -->
+    <% if ma.course_message_type == "Course" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher">系统提示</span>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您成功创建了课程：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to "课程名称：" + ma.course_message.name, course_path(ma.course_message),
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a></li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个课程，详情如下：
+            </p>
+            <p>课程名称：<%= ma.course_message.name %></p>
+            <p>开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %></p>
+            <p>课程ID：<span style="color:red;"><%= ma.course_message.id %></span></p>
+            <p>课程密码：<span style="color:red;"><%= ma.course_message.password %></span></p>
+            <p>学时总数：<%= ma.course_message.class_period %></p>
+            <p>创建时间：<%= format_time(ma.course_message.created_at) %></p>
+            <p>您可以点击左上角的“配置”按钮，修改课程基本信息，添加及删除课程成员。您也可以把课程ID及密码告诉学生和其他成员，让他们输入ID及密码加入课程。</p>
+            <% if ma.course_message.is_public %>
+              <p>您的课程是公开的，所有人都能访问您的课程。若不想设置为公开，您可以在配置中设置。</p>
+            <% else %>
+              <p>您的课程是私有的，非课程成员不能访问您的课程。如果想设置为公开，您可以在配置中设置。</p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "JoinCourseRequest" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher">系统提示</span>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span>
+          </li>
+          <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9'  ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+              </a>
+            </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的课程成员申请，信息如下：
+            </p>
+            <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
+            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
+            <div class="fl">课程描述：</div>
+            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+            <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
+          </div>
+          <li class="homepageHomeworkContentWarn fl">
+            <span id="deal_info_<%=ma.id%>">
+              <% if ma.status == 0 || ma.status.nil?%>
+                <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
+                  |
+                  <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
+             <% elsif ma.status == 1%> <!-- 同意 -->
+                 您已经同意了该申请
+             <% elsif ma.status == 2%> <!-- 拒绝 -->
+                 您已经拒绝了该申请
+             <%end %>
+             </span>
+          </li>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    <% if ma.course_message_type == "CourseRequestDealResult" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher">系统提示</span>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+              课程申请进度反馈：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to  ma.status == 1 ?
+                    '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过'
+                     :
+                    '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝', course_path(Course.find(ma.course_id)),
+                        :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a>
+             </span>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %>老师您好！您已成功加入课程<%= Course.find(ma.course_id).name%>。
+            </p>
+            <p>申请课程：<%= Course.find(ma.course_id).name%></p>
+            <div class="fl">课程描述：</div>
+            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+            <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+
+    <!--被老师拉入课程-->
+    <% if ma.course_message_type == "JoinCourse" and ma.status == 0 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了课程：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
+                <% teacher = User.find(ma.course_message_id) %>
+                <p><%= teacher.show_name %>(<%= teacher %>)老师把您加入了课程，详情如下：</p>
+                <p>课程名称：<%= ma.course.name %></p>
+                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+                <p>课程ID：<%= ma.course.id %></p>
+                <p>课时总数：<%= ma.course.class_period %></p>
+            <% else %>
+                <p>
+                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+
+    <!--被老师拉入课程-->
+    <% if ma.course_message_type == "JoinCourse" and ma.status == 1 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher">系统提示</span>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您增加了新的课程成员：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
+                <p>您增加了新的课程成员，详情如下：</p>
+                <p>成员：<%= User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")" %></p>
+                <p>课程名称：<%= ma.course.name %></p>
+                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+                <p>课程ID：<%= ma.course.id %></p>
+                <p>课时总数：<%= ma.course.class_period %></p>
+            <% else %>
+                <p>
+                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+    
+    <!--被老师移出课程-->
+    <% if ma.course_message_type == "RemoveFromCourse" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了课程：</span>
+          </li>
+          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+            <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
+          </li>
+          <div style="display: none" class="message_title_red system_message_style">
+            <% if ma.course.is_public? || User.current.member_of?(ma.course) || User.current.admin? %>
+                <p>您已被<%= User.find(ma.course_message_id).show_name %>老师移出了课程，详情如下：</p>
+                <p>课程名称：<%= ma.course.name %></p>
+                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+                <% if !ma.content.nil? %>
+                    <p>担任角色：<%= ma.content %></p>
+                <% end %>
+                <p>学时总数：<%= ma.course.class_period %></p>
+            <% else %>
+                <p>
+                  您已经被移出该私有课程，非课程成员没有权限访问私有课程
+                </p>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+
+    <!--老师发布测验 发给学生看-->
+    <% if ma.course_message_type == "Exercise" && ma.status == 2 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl">
+            <span><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程测验 ：</span></li>
+          <li class="homepageNewsContent fl">
+            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))"%>-->
+          </li>
+
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布了课程测验 ，测验详情如下：
+            </p>
+            <ul class="ul_normal_color">
+              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>测验标题：<%= ma.course_message.exercise_name %></li>
+              <!--<li>测验描述：<%#= ma.course_message.exercise_description %></li>-->
+              <!--<li>测验状态：<%#= ma.course_message.exercise_status == 1 ? '未发布':'已发布'%></li>-->
+              <!--<%# if ma.course_message.publish_time %>-->
+              <!--<li>发布时间：<%#= ma.course_message.publish_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>-->
+               <!--<%# end %>-->
+              <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
+              <li>答题时长：<%= ma.course_message.time == -1 ? '不限时' : ma.course_message.time.to_s + '分钟' %></li>
+              <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
+                <p>请记得在截止时间前完成测验噢，辛苦啦！</p>
+              <% end %>
+            </ul>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+
+
+    <% if ma.course_message_type == "Exercise" && ma.status == 3 %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
+          <li class="homepageNewsPubType fl">
+           <span>  <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                       user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %></span><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的测验：</span></li>
+          <li class="homepageHomeworkContent fl">
+            <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))"%>-->
+
+          </li>
+
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p>
+              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布的课程测验截止时间快到了，测验详情如下：
+            </p>
+
+            <ul class="ul_normal_color">
+              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>测验标题：<%= ma.course_message.exercise_name %></li>
+              <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
+              <li>答题时长：<%= ma.course_message.time == -1 ? '无限制' : ma.course_message.time.to_s + '分钟' %></li>
+              <p>请及时完成课程测验，辛苦啦！</p>
+            </ul>
+          </div>
+          <li class="homepageHomeworkContentWarn fl">截止时间快到啦 </li>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 967941a88..574411055 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -10,9 +10,10 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申请加入项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
+            <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <%= ma.project %>
@@ -32,9 +33,10 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
+            <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <% if ma.project.is_public? || User.current.member_of?(ma.project) || User.current.admin? %>
@@ -67,9 +69,10 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了项目：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
+            <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <% if ma.project.is_public? || User.current.member_of?(ma.project) || User.current.admin? %>
@@ -107,9 +110,9 @@
               <li class="homepageHomeworkContent fl">
           <% end %>
           <%= link_to ma.project, project_path(ma.project),
-                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                      :onmouseover => "message_titile_show($(this),event)",
-                      :onmouseout => "message_titile_hide($(this))" %>
+                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                      <!--:onmouseover => "message_titile_show($(this),event)",-->
+                      <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <%= ma.project %>
@@ -136,9 +139,10 @@
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%></span>
               </li>
               <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover => "message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a>
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover => "message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a>
               </li>
               <div style="display: none" class="message_title_red system_message_style">
                 <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
@@ -160,9 +164,10 @@
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
               </li>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover => "message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a>
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover => "message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a>
               </li>
               <div style="display: none" class="message_title_red system_message_style">
                 <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
@@ -187,9 +192,10 @@
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to ma.forge_message.journalized.subject,
-                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
+                        issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
           </li>
           <div  style="display: none" class="message_title_red system_message_style" >
             <p><strong>问题标题：</strong><%= ma.forge_message.journalized.subject %></p>
@@ -208,9 +214,10 @@
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                 <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
                                                                           :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
-                                                                          :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover => "message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a></li>
+                                                                          :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover => "message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a></li>
               <div style="display: none" class="message_title_red system_message_style">
                 <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
                 <% unless ma.forge_message.content.nil? %>
@@ -222,9 +229,10 @@
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                 <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
                                                                           :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
-                                                                          :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover => "message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a></li>
+                                                                          :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover => "message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a></li>
               <div style="display: none" class="message_title_red system_message_style">
                 <p><strong>帖子主题：</strong><%= ma.forge_message.subject %></p>
                 <% unless ma.forge_message.content.nil? %>
@@ -247,9 +255,10 @@
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id},
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}"  %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </a>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <p><strong>标题：</strong><%= ma.forge_message.title %></p>
@@ -268,9 +277,9 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span></li>
           <li class="homepageNewsContent fl">
             <%= link_to "#{ma.forge_message.commented.title}",
-                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %>
+                        {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                        <!--:onmouseover => "message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
           <div style="display: none" class="message_title_red system_message_style">
             <p><strong>新闻标题：</strong><%= ma.forge_message.commented.title %></p>
diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb
index 102b4a155..d18292068 100644
--- a/app/views/users/_user_message_forum.html.erb
+++ b/app/views/users/_user_message_forum.html.erb
@@ -10,9 +10,10 @@
           </li>
           <% if ma.memo.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover =>"message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a>
+                <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a>
               </li>
               <div style="display: none" class="message_title_red system_message_style">
                 <p><strong>标题：</strong><%= ma.memo.subject %></p>
@@ -23,9 +24,10 @@
               </div>
           <% else %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                            :onmouseover =>"message_titile_show($(this),event)",
-                            :onmouseout => "message_titile_hide($(this))" %></a>
+                <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                            <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+                </a>
               </li>
               <div  style="display: none" class="message_title_red system_message_style">
                 <p><strong>标题：</strong><%= ma.memo.subject %></p>
diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb
index e3037f227..a80d35bd4 100644
--- a/app/views/users/_user_message_system.html.erb
+++ b/app/views/users/_user_message_system.html.erb
@@ -11,10 +11,9 @@
           <li class="homepageSystenMessageContent fl">
 
             <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current),
-                        :id => "content_link_#{ma.id}",
-                        :onmouseover =>"message_titile_show($(this),event);",
-                        :onmouseout => "message_titile_hide($(this));"
-            %>
+                        :id => "content_link_#{ma.id}" %>
+                        <!--:onmouseover =>"message_titile_show($(this),event);",-->
+                        <!--:onmouseout => "message_titile_hide($(this));"-->
           </li>
           <div style="display:none;" class="message_title_red system_message_style">
             <% unless ma.subject.blank? %>
diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index ce821bd4f..894eedbfc 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -9,9 +9,9 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %>
+            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}"%>
+                        <!--:onmouseover =>"message_titile_show($(this),event)",-->
+                        <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </li>
           <div  style="display: none" class="message_title_red system_message_style" >
             <% if ma.journals_for_message.reply_id == 0 %>
diff --git a/app/views/users/_watch_btn_for_picture.html.erb b/app/views/users/_watch_btn_for_picture.html.erb
index e604be318..be8673468 100644
--- a/app/views/users/_watch_btn_for_picture.html.erb
+++ b/app/views/users/_watch_btn_for_picture.html.erb
@@ -2,8 +2,8 @@
     <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") %>
 <% else %>
     <%if(user.watched_by?(User.current))%>
-        <%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id),:class => "userFollow mr27 fl", :method => "delete",:remote => "true", :title => "取消关注"%>
+        <%= link_to "取消关注",Setting.host_name + "/watch?object_type=user&object_id="+user.id.to_s + "&target_id="+user.id.to_s,:class => "userFollow mr27 fl", :method => "delete",:remote => "true", :title => "取消关注"%>
     <% else %>
-        <%= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id),:class => "userFollow mr27 fl", :method => "post",:remote => "true", :title => "添加关注"%>
+        <%= link_to "添加关注",Setting.host_name + "/watch?object_type=user&object_id="+user.id.to_s + "&target_id="+user.id.to_s,:class => "userFollow mr27 fl", :method => "post",:remote => "true", :title => "添加关注"%>
     <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 3c0c4969b..f8ce5cee4 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -85,7 +85,7 @@
             <span data-language=<%=@homework.language%> style="display-hidden" id="data-language"></span>
             </div>
             <div class="mt10">
-              <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>
+              <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能", value:"#{@homework.name}的作品提交" %>
             </div>
             <div class="mt10">
             <%= f.text_area :description, id: 'program-src', class:"InputBox W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index a56ca7b48..fa4eaacbe 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -45,5 +45,4 @@
     <% homepage = BlogComment.find(@user.blog.homepage_id) %>
     <%= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
 <% end %>
-
-<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %>
+<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} %>
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 279f36b5c..683cb7019 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -33,7 +33,7 @@
 
 <div class="homepageContentContainer">
   <div class="homepageContent">
-    <div class="resource-wrapper mt10">
+    <div class="resource-wrapper">
         <ul class="resource-banner">
           <li class="fl resource-switch">
             <a href="<%= user_homework_type_user_path(@user,:is_import => 0) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">公共题库</a>
@@ -46,7 +46,7 @@
             <ul class="resourcesSelect">
               <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
                 <ul class="resourcesType">
-                  <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 0) %>" id="homework_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部</a> </li>
+                  <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0) %>" id="homework_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部</a> </li>
                   <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>" id="homework_type_nor" class="homepagePostTypeAssignment postTypeGrey" data-method="get" data-remote="true">普通作业</a> </li>
                   <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 2) %>" id="homework_type_pro" class="program-btn postTypeGrey" data-method="get" data-remote="true" style="white-space:nowrap;">编程作业</a> </li>
                   <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 3) %>" id="homework_type_gro" class="group-btn resourcesGrey" data-method="get" data-remote="true">分组作业</a> </li>
@@ -61,7 +61,7 @@
             <%=render :partial=>'homework_repository_search', :locals=>{:type => @type,:is_import => 0,:property => @property} %>
         </div>
         <div class="cl"></div>
-        <div class="w583 fl mr10 mt10" id="homework_repository_list">
+        <div class="w683 fl mr10 mt10" id="homework_repository_list">
           <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>@type,:is_import => 0,:property => @property,:search=>''} %>
         </div>
         <div id="homework_repository_detail">
@@ -69,7 +69,7 @@
         </div>
         <div class="cl"></div>
         <div>
-          <ul class="wlist mt10" id="homework_pository_ref_pages" style="margin-top: 5px;margin-right: 395px">
+          <ul class="wlist mt10" id="homework_pository_ref_pages" style="margin-top: 5px;margin-right: 295px">
             <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
           </ul>
         </div>
diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb
index 4ed9fba33..a714f53d2 100644
--- a/app/views/welcome/_search_all_results.html.erb
+++ b/app/views/welcome/_search_all_results.html.erb
@@ -1,31 +1,31 @@
 <% unless all_results.nil? || all_results.empty?%>
-<% all_results.each do |item|%>
-    <% case item.type %>
-     <% when 'user'%>
-        <ul class="searchContent">
-          <li class="fl"></li>
-          <li class="fl searchContentDes">
-            <ul class="fl">
-              <li class="f16 mb5"><a href="<%= user_path(item.id)%>" class="fontGrey3 fl">
-                <%= item.try(:highlight).try(:login) ? item.highlight.login[0].html_safe : item.login  %>
-                <%if item.firstname.present? || item.lastname.present?%>
-                (<%= item.try(:highlight).try(:lastname) ? item.highlight.lastname[0].html_safe : item.lastname%>
-                <%= item.try(:highlight).try(:firstname) ? item.highlight.firstname[0].html_safe : item.firstname  %>)
+    <% all_results.each do |item|%>
+        <% case item.type %>
+<% when 'user'%>
+            <ul class="searchContent">
+              <li class="fl"></li>
+              <li class="fl searchContentDes">
+                <ul class="fl">
+                  <li class="f16 mb5"><a href="<%= user_path(item.id)%>" class="fontGrey3 fl">
+                    <%= item.try(:highlight).try(:login) ? item.highlight.login[0].html_safe : item.login  %>
+                    <%if item.firstname.present? || item.lastname.present?%>
+                        (<%= item.try(:highlight).try(:lastname) ? item.highlight.lastname[0].html_safe : item.lastname%>
+                        <%= item.try(:highlight).try(:firstname) ? item.highlight.firstname[0].html_safe : item.firstname  %>)
                     <%end %>
-              </a>
-                <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag"><%= get_user_identity(User.find(item.id).user_extensions.identity) %></span></div>
-                <div class="cl"></div>
-              </li>
-              <li class="fontGrey3 mb5"><%= User.find(item.id).user_extensions && User.find(item.id).user_extensions.brief_introduction.present? ? User.find(item.id).user_extensions.brief_introduction : '这位童鞋很懒，什么也没有留下～'%></li>
-              <li class="f12 fontGrey2">
-                <span class="mr30">加入时间：<%= format_date( User.find(item.id).created_on)%></span><span class="mr30">
+                  </a>
+                    <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag"><%= get_user_identity(User.find(item.id).user_extensions.identity) %></span></div>
+                    <div class="cl"></div>
+                  </li>
+                  <li class="fontGrey3 mb5"><%= User.find(item.id).user_extensions && User.find(item.id).user_extensions.brief_introduction.present? ? User.find(item.id).user_extensions.brief_introduction : '这位童鞋很懒，什么也没有留下～'%></li>
+                  <li class="f12 fontGrey2">
+                    <span class="mr30">加入时间：<%= format_date( User.find(item.id).created_on)%></span><span class="mr30">
                  最后登陆时间：<%= format_date( User.find(item.id).last_login_on)%></span><span class="mr30">
                 <%= User.find(item.id).user_extensions.occupation.present? ? '单位：'+User.find(item.id).user_extensions.occupation : ''%></span></li>
+                </ul>
+              </li>
+              <div class="cl"></div>
             </ul>
-          </li>
-          <div class="cl"></div>
-        </ul>
-     <% when 'course'%>
+        <% when 'course'%>
             <ul class="searchContent">
               <li class="fl">
               </li>
@@ -46,7 +46,7 @@
               </li>
               <div class="cl"></div>
             </ul>
-      <% when 'attachment'%>
+        <% when 'attachment'%>
             <ul class="searchContent">
               <li class="fl">
               </li>
@@ -65,7 +65,7 @@
               </li>
               <div class="cl"></div>
             </ul>
-      <% when 'project'%>
+        <% when 'project'%>
             <ul class="searchContent">
               <li class="fl">
               </li>
@@ -97,8 +97,8 @@
               </li>
               <div class="cl"></div>
             </ul>
-    <%end %>
-<% end %>
+        <%end %>
+    <% end %>
     <div class="pageRoll">
       <%= paginate all_results,:params => {:controller => 'welcome', :action => 'search',:search_type=>'all'}%>
     </div>
diff --git a/config/routes.rb b/config/routes.rb
index 114fb6f96..1c7844d34 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,6 +111,7 @@ RedmineApp::Application.routes.draw do
     end
     member do
       match 'update_sub_dir', :via => [:put]
+      match 'update_priority', :via => [:put]
     end
     resource :boards
   end
diff --git a/db/migrate/20160309022930_set_priority_for_org_subfields.rb b/db/migrate/20160309022930_set_priority_for_org_subfields.rb
new file mode 100644
index 000000000..56bafd071
--- /dev/null
+++ b/db/migrate/20160309022930_set_priority_for_org_subfields.rb
@@ -0,0 +1,24 @@
+class SetPriorityForOrgSubfields < ActiveRecord::Migration
+  def up
+    Organization.all.each do |org|
+      org.transaction do
+        org.org_subfields.where("field_type='default'").each do|field|
+          case field.name
+            when 'activity'
+              field.update_attribute(:priority, 1)
+            when 'course'
+              field.update_attribute(:priority, 2)
+            when 'project'
+              field.update_attribute(:priority, 3)
+          end
+        end
+        org.org_subfields.where("field_type!='default'").each_with_index do  |field, index|
+          field.update_attribute(:priority, index + 4)
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160317070611_update_course_lead.rb b/db/migrate/20160317070611_update_course_lead.rb
new file mode 100644
index 000000000..0c68fa40f
--- /dev/null
+++ b/db/migrate/20160317070611_update_course_lead.rb
@@ -0,0 +1,8 @@
+class UpdateCourseLead < ActiveRecord::Migration
+  def up
+    Message.where("status =? ", 1).update_all(:author_id => 1)
+  end
+
+  def down
+  end
+end
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 55d3eefad..2eaac8c39 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,1177 +1,1222 @@
-//= require_directory ./rateable
-//= require jquery.min
-//= require jquery.infinitescroll
-
-/* Redmine - project management software
-   Copyright (C) 2006-2013  Jean-Philippe Lang */
-
-//动态高度控制
-function description_show_hide(id){
-    showNormalImage('activity_description_'+id);
-    if($("#intro_content_"+id).height() > 810) {
-        $("#intro_content_show_"+id).show();
-    }
-    $("#intro_content_show_"+id).click(function(){
-        $("#activity_description_"+id).toggleClass("maxh360");
-        $("#intro_content_show_"+id).hide();
-        $("#intro_content_hide_"+id).show();
-    });
-    $("#intro_content_hide_"+id).click(function(){
-        $("#activity_description_"+id).toggleClass("maxh360");
-        $("#intro_content_hide_"+id).hide();
-        $("#intro_content_show_"+id).show();
-    });
-}
-
-function cleanArray (actual){
-  var newArray = new Array();
-    for (var i = 0; i< actual.length; i++){
-      if (actual[i]){
-        newArray.push(actual[i]);
-      }
-    }
-  return newArray;
-}
-
-function checkAll(id, checked) {
-  if (checked) {
-    $('#'+id).find('input[type=checkbox]').attr('checked', true);
-  } else {
-    $('#'+id).find('input[type=checkbox]').removeAttr('checked');
-  }
-}
-
-function toggleCheckboxesBySelector(selector) {
-  var all_checked = true;
-  $(selector).each(function(index) {
-    if (!$(this).is(':checked')) { all_checked = false; }
-  });
-  $(selector).attr('checked', !all_checked);
-}
-
-function showAndScrollTo(id, focus) {
-  $('#'+id).show();
-  if (focus !== null) {
-    $('#'+focus).focus();
-  }
-  $('html, body').animate({scrollTop: $('#'+id).offset().top}, 400);
-}
-
-function toggleRowGroup(el) {
-  var tr = $(el).parents('tr').first();
-  var n = tr.next();
-  tr.toggleClass('open');
-  while (n.length && !n.hasClass('group')) {
-    n.toggle();
-    n = n.next('tr');
-  }
-}
-
-function collapseAllRowGroups(el) {
-  var tbody = $(el).parents('tbody').first();
-  tbody.children('tr').each(function(index) {
-    if ($(this).hasClass('group')) {
-      $(this).removeClass('open');
-    } else {
-      $(this).hide();
-    }
-  });
-}
-
-function expandAllRowGroups(el) {
-  var tbody = $(el).parents('tbody').first();
-  tbody.children('tr').each(function(index) {
-    if ($(this).hasClass('group')) {
-      $(this).addClass('open');
-    } else {
-      $(this).show();
-    }
-  });
-}
-
-function toggleAllRowGroups(el) {
-  var tr = $(el).parents('tr').first();
-  if (tr.hasClass('open')) {
-    collapseAllRowGroups(el);
-  } else {
-    expandAllRowGroups(el);
-  }
-}
-
-function toggleFieldset(el) {
-  var fieldset = $(el).parents('fieldset').first();
-  fieldset.toggleClass('collapsed');
-  fieldset.children('div').toggle();
-}
-
-function hideFieldset(el) {
-  var fieldset = $(el).parents('fieldset').first();
-  fieldset.toggleClass('collapsed');
-  fieldset.children('div').hide();
-}
-
-function initFilters(){
-  $('#add_filter_select').change(function(){
-    addFilter($(this).val(), '', []);
-  });
-  $('#filters-table td.field input[type=checkbox]').each(function(){
-    toggleFilter($(this).val());
-  });
-  $('#filters-table td.field input[type=checkbox]').on('click',function(){
-    toggleFilter($(this).val());
-  });
-  $('#filters-table .toggle-multiselect').on('click',function(){
-    toggleMultiSelect($(this).siblings('select'));
-  });
-  $('#filters-table input[type=text]').on('keypress', function(e){
-    if (e.keyCode == 13) submit_query_form("query_form");
-  });
-}
-
-function addFilter(field, operator, values) {
-  var fieldId = field.replace('.', '_');
-  var tr = $('#tr_'+fieldId);
-  if (tr.length > 0) {
-    tr.show();
-  } else {
-    buildFilterRow(field, operator, values);
-  }
-  $('#cb_'+fieldId).attr('checked', true);
-  toggleFilter(field);
-  $('#add_filter_select').val('').children('option').each(function(){
-    if ($(this).attr('value') == field) {
-      $(this).attr('disabled', true);
-    }
-  });
-}
-
-function buildFilterRow(field, operator, values) {
-  var fieldId = field.replace('.', '_');
-  var filterTable = $("#filters-table");
-  var filterOptions = availableFilters[field];
-  var operators = operatorByType[filterOptions['type']];
-  var filterValues = filterOptions['values'];
-  var i, select;
-
-  var tr = $('<tr class="filter">').attr('id', 'tr_'+fieldId).html(
-    '<td class="field"><input checked="checked" id="cb_'+fieldId+'" name="f[]" value="'+field+'" type="checkbox"><label for="cb_'+fieldId+'"> '+filterOptions['name']+'</label></td>' +
-    '<td class="operator"><select id="operators_'+fieldId+'" name="op['+field+']"></td>' +
-    '<td class="values"></td>'
-  );
-  filterTable.append(tr);
-
-  select = tr.find('td.operator select');
-  for (i=0;i<operators.length;i++){
-    var option = $('<option>').val(operators[i]).text(operatorLabels[operators[i]]);
-    if (operators[i] == operator) { option.attr('selected', true); }
-    select.append(option);
-  }
-  select.change(function(){ toggleOperator(field); });
-
-  switch (filterOptions['type']){
-  case "list":
-  case "list_optional":
-  case "list_status":
-  case "list_subprojects":
-    tr.find('td.values').append(
-      '<span style="display:none;"><select class="value" id="values_'+fieldId+'_1" name="v['+field+'][]"></select>' +
-      ' <span class="toggle-multiselect"><a>复选/multi-select</a></span></span>'
-    );
-    select = tr.find('td.values select');
-    if (values.length > 1) { select.attr('multiple', true); }
-    for (i=0;i<filterValues.length;i++){
-      var filterValue = filterValues[i];
-      var option = $('<option>');
-      if ($.isArray(filterValue)) {
-        option.val(filterValue[1]).text(filterValue[0]);
-        if ($.inArray(filterValue[1], values) > -1) {option.attr('selected', true);}
-      } else {
-        option.val(filterValue).text(filterValue);
-        if ($.inArray(filterValue, values) > -1) {option.attr('selected', true);}
-      }
-      select.append(option);
-    }
-    break;
-  case "date":
-  case "date_past":
-    tr.find('td.values').append(
-      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="10" class="value date_value" /></span>' +
-      ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="10" class="value date_value" /></span>' +
-      ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="3" class="value" /> '+labelDayPlural+'</span>'
-    );
-    $('#values_'+fieldId+'_1').val(values[0]).datepicker(datepickerOptions);
-    $('#values_'+fieldId+'_2').val(values[1]).datepicker(datepickerOptions);
-    $('#values_'+fieldId).val(values[0]);
-    break;
-  case "string":
-  case "text":
-    tr.find('td.values').append(
-      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="30" class="value" /></span>'
-    );
-    $('#values_'+fieldId).val(values[0]);
-    break;
-  case "relation":
-    tr.find('td.values').append(
-      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="6" class="value" /></span>' +
-      '<span style="display:none;"><select class="value" name="v['+field+'][]" id="values_'+fieldId+'_1"></select></span>'
-    );
-    $('#values_'+fieldId).val(values[0]);
-    select = tr.find('td.values select');
-    for (i=0;i<allProjects.length;i++){
-      var filterValue = allProjects[i];
-      var option = $('<option>');
-      option.val(filterValue[1]).text(filterValue[0]);
-      if (values[0] == filterValue[1]) { option.attr('selected', true); }
-      select.append(option);
-    }
-  case "integer":
-  case "float":
-    tr.find('td.values').append(
-      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="6" class="value" /></span>' +
-      ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="6" class="value" /></span>'
-    );
-    $('#values_'+fieldId+'_1').val(values[0]);
-    $('#values_'+fieldId+'_2').val(values[1]);
-    break;
-  }
-}
-
-function toggleFilter(field) {
-  var fieldId = field.replace('.', '_');
-  if ($('#cb_' + fieldId).is(':checked')) {
-    $("#operators_" + fieldId).show().removeAttr('disabled');
-    toggleOperator(field);
-  } else {
-    $("#operators_" + fieldId).hide().attr('disabled', true);
-    enableValues(field, []);
-  }
-}
-
-function enableValues(field, indexes) {
-  var fieldId = field.replace('.', '_');
-  $('#tr_'+fieldId+' td.values .value').each(function(index) {
-    if ($.inArray(index, indexes) >= 0) {
-      $(this).removeAttr('disabled');
-      $(this).parents('span').first().show();
-    } else {
-      $(this).val('');
-      $(this).attr('disabled', true);
-      $(this).parents('span').first().hide();
-    }
-
-    if ($(this).hasClass('group')) {
-      $(this).addClass('open');
-    } else {
-      $(this).show();
-    }
-  });
-}
-
-function toggleOperator(field) {
-  var fieldId = field.replace('.', '_');
-  var operator = $("#operators_" + fieldId);
-  switch (operator.val()) {
-    case "!*":
-    case "*":
-    case "t":
-    case "ld":
-    case "w":
-    case "lw":
-    case "l2w":
-    case "m":
-    case "lm":
-    case "y":
-    case "o":
-    case "c":
-      enableValues(field, []);
-      break;
-    case "><":
-      enableValues(field, [0,1]);
-      break;
-    case "<t+":
-    case ">t+":
-    case "><t+":
-    case "t+":
-    case ">t-":
-    case "<t-":
-    case "><t-":
-    case "t-":
-      enableValues(field, [2]);
-      break;
-    case "=p":
-    case "=!p":
-    case "!p":
-      enableValues(field, [1]);
-      break;
-    default:
-      enableValues(field, [0]);
-      break;
-  }
-}
-
-function toggleMultiSelect(el) {
-  if (el.attr('multiple')) {
-    el.removeAttr('multiple');
-  } else {
-    el.attr('multiple', true);
-  }
-}
-
-function submit_query_form(id) {
-  selectAllOptions("selected_columns");
-  $('#'+id).submit();
-}
-
-function showTab(name) {
-  $('div#content .tab-content').hide();
-  $('div.tabs a').removeClass('selected');
-  $('#tab-content-' + name).show();
-  $('#tab-' + name).addClass('selected');
-  return false;
-}
-
-function moveTabRight(el) {
-  var lis = $(el).parents('div.tabs').first().find('ul').children();
-  var tabsWidth = 0;
-  var i = 0;
-  lis.each(function(){
-    if ($(this).is(':visible')) {
-      tabsWidth += $(this).width() + 6;
-    }
-  });
-  if (tabsWidth < $(el).parents('div.tabs').first().width() - 60) { return; }
-  while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
-  lis.eq(i).hide();
-}
-
-function moveTabLeft(el) {
-  var lis = $(el).parents('div.tabs').first().find('ul').children();
-  var i = 0;
-  while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
-  if (i>0) {
-    lis.eq(i-1).show();
-  }
-}
-
-function displayTabsButtons() {
-  var lis;
-  var tabsWidth = 0;
-  var el;
-  $('div.tabs').each(function() {
-    el = $(this);
-    lis = el.find('ul').children();
-    lis.each(function(){
-      if ($(this).is(':visible')) {
-        tabsWidth += $(this).width() + 6;
-      }
-    });
-    if ((tabsWidth < el.width() - 60) && (lis.first().is(':visible'))) {
-      el.find('div.tabs-buttons').hide();
-    } else {
-      el.find('div.tabs-buttons').show();
-    }
-  });
-}
-
-function setPredecessorFieldsVisibility() {
-  var relationType = $('#relation_relation_type');
-  if (relationType.val() == "precedes" || relationType.val() == "follows") {
-    $('#predecessor_fields').show();
-  } else {
-    $('#predecessor_fields').hide();
-  }
-}
-
-function showModal(id, width) {
-  var el = $('#'+id).first();
-  if (el.length === 0 || el.is(':visible')) {return;}
-  var title = el.find('h3.title').text();
-  el.dialog({
-    width: width,
-    modal: true,
-    resizable: false,
-    dialogClass: 'modal',
-    title: title
-  });
-  el.find("input[type=text], input[type=submit]").first().focus();
-}
-
-function hideModal(el) {
-  var modal;
-  if (el) {
-    modal = $(el).parents('.ui-dialog-content');
-  } else {
-    modal = $('#ajax-modal');
-  }
-  modal.dialog("close");
-}
-
-function submitPreview(url, form, target) {
-  $.ajax({
-    url: url,
-    type: 'post',
-    data: $('#'+form).serialize(),
-    success: function(data){
-      $('#'+target).html(data);
-    }
-  });
-}
-
-function collapseScmEntry(id) {
-  $('.'+id).each(function() {
-    if ($(this).hasClass('open')) {
-      collapseScmEntry($(this).attr('id'));
-    }
-    $(this).hide();
-  });
-  $('#'+id).removeClass('open');
-}
-
-function expandScmEntry(id) {
-  $('.'+id).each(function() {
-    $(this).show();
-    if ($(this).hasClass('loaded') && !$(this).hasClass('collapsed')) {
-      expandScmEntry($(this).attr('id'));
-    }
-  });
-  $('#'+id).addClass('open');
-}
-
-function scmEntryClick(id, url) {
-    el = $('#'+id);
-    if (el.hasClass('open')) {
-        collapseScmEntry(id);
-        el.addClass('collapsed');
-        return false;
-    } else if (el.hasClass('loaded')) {
-        expandScmEntry(id);
-        el.removeClass('collapsed');
-        return false;
-    }
-    if (el.hasClass('loading')) {
-        return false;
-    }
-    el.addClass('loading');
-    $.ajax({
-      url: url,
-      success: function(data){
-        el.after(data);
-        el.addClass('open').addClass('loaded').removeClass('loading');
-      }
-    });
-    return true;
-}
-
-function randomKey(size) {
-  var chars = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z');
-  var key = '';
-  for (i = 0; i < size; i++) {
-    key += chars[Math.floor(Math.random() * chars.length)];
-  }
-  return key;
-}
-
-// Can't use Rails' remote select because we need the form data
-function updateIssueFrom(url) {
-  $.ajax({
-    url: url,
-    type: 'post',
-    data: $('#issue-form').serialize()
-  });
-}
-
-function updateBulkEditFrom(url) {
-  $.ajax({
-    url: url,
-    type: 'post',
-    data: $('#bulk_edit_form').serialize()
-  });
-}
-
-function clearMessage(id) {
-	$('#'+id).val("");
-}
-
-
-function observeAutocompleteField(fieldId, url, options) {
-  $(document).ready(function() {
-    $('#'+fieldId).autocomplete($.extend({
-      source: url,
-      select: function(e,ui){self.location="/issues/"+ui.item.value;},
-      minLength: 1,
-      search: function(){$('#'+fieldId).addClass('ajax-loading');},
-      response: function(){$('#'+fieldId).removeClass('ajax-loading');
-      }
-    }, options));
-    $('#'+fieldId).addClass('autocomplete');
-  
-  });
-  
-}
-
-function observeSearchfield(fieldId, targetId, url) {
-  $('#'+fieldId).each(function() {
-    var $this = $(this);
-    $this.addClass('autocomplete');
-    $this.attr('data-value-was', $this.val());
-    var check = function() {
-      var val = $this.val();
-      if ($this.attr('data-value-was') != val){
-        $this.attr('data-value-was', val);
-        $.ajax({
-          url: url,
-          type: 'get',
-          data: {q: $this.val()},
-          success: function(data){ if(targetId) $('#'+targetId).html(data); },
-          beforeSend: function(){ $this.addClass('ajax-loading'); },
-          complete: function(){ $this.removeClass('ajax-loading'); }
-        });
-      }
-    };
-    var reset = function() {
-      if (timer) {
-        clearInterval(timer);
-        timer = setInterval(check, 300);
-      }
-    };
-    var timer = setInterval(check, 300);
-    $this.bind('keyup click mousemove', reset);
-  });
-}
-
-function observeProjectModules() {
-  var f = function() {
-    /* Hides trackers and issues custom fields on the new project form when issue_tracking module is disabled */
-    if ($('#project_enabled_module_names_issue_tracking').attr('checked')) {
-      $('#project_trackers').show();
-    }else{
-      $('#project_trackers').hide();
-    }
-  };
-
-  $(window).load(f);
-  $('#project_enabled_module_names_issue_tracking').change(f);
-}
-
-function initMyPageSortable(list, url) {
-  $('#list-'+list).sortable({
-    connectWith: '.block-receiver',
-    tolerance: 'pointer',
-    update: function(){
-      $.ajax({
-        url: url,
-        type: 'post',
-        data: {'blocks': $.map($('#list-'+list).children(), function(el){return $(el).attr('id');})}
-      });
-    }
-  });
-  $("#list-top, #list-left, #list-right").disableSelection();
-}
-
-var warnLeavingUnsavedMessage;
-function warnLeavingUnsaved(message) {
-  warnLeavingUnsavedMessage = message;
-
-  $('form').submit(function(){
-    $('textarea').removeData('changed');
-  });
-  $('textarea').change(function(){
-    $(this).data('changed', 'changed');
-  });
-  window.onbeforeunload = function(){
-    var warn = false;
-    $('textarea').blur().each(function(){
-      if ($(this).data('changed')) {
-        warn = true;
-      }
-    });
-    if (warn) {return warnLeavingUnsavedMessage;}
-  };
-}
-
-function setupHeartBeat(){
-  var time = 60*1000*30; // 30 mins
-  setInterval(function(){$.getJSON('/account/heartbeat');},time);
-}
-
-function setupAjaxIndicator() {
-  $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
-    if(settings && settings.url && settings.url.match(/account\/heartbeat$/)){
-      return;
-    }
-    if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
-      $('#ajax-indicator').show();
-    }
-  });
-  
-  $('#ajax-indicator').bind('ajaxStop', function() {
-    $('#ajax-indicator').hide();
-      if(MathJax && MathJax.Hub)
-          MathJax.Hub.Queue(['Typeset', MathJax.Hub]); //如果是ajax刷新页面的话，手动执行MathJax的公式显示
-      try{
-           prettyPrint(); //如果刷新出来的页面如果存在代码行的话，也需要美化
-      }catch (e){
-
-      }
-  });
-}
-
-function hideOnLoad() {
-  $('.hol').hide();
-}
-
-function addFormObserversForDoubleSubmit() {
-  $('form[method=post]').each(function() {
-    if (!$(this).hasClass('multiple-submit')) {
-      $(this).submit(function(form_submission) {
-        if ($(form_submission.target).attr('data-submitted')) {
-          form_submission.preventDefault();
-        } else {
-          $(form_submission.target).attr('data-submitted', true);
-        }
-      });
-    }
-  });
-}
-
-function blockEventPropagation(event) {
-  event.stopPropagation();
-  event.preventDefault();
-}
-
-function toggleAndSettingWordsVal(parent_widget, text_widget, value){
-  text_widget.val(value)
-  parent_widget.slideToggle(400)
-}
-function transpotUrl (scope) {
-  $(scope).each(function(){
-    var tmpContent = $(this).html();
-    tmpContent = tmpContent.replace(/(^|[^\"\'])(http|ftp|mms|rstp|news|https)(\:\/\/[^<\s\+,，]+)/gi,"$1<a href='$2$3' target='_blank'>$2$3<\/a>");
-    // tmpContent = tmpContent.replace(/(^|[^\/])(www\.[^<\s\+,，]+)/gi,"$1<a href='http:\/\/$2' style='color:blue' target='_blank'>$2</a>");
-    $(this).html(tmpContent);
-  });
-}
-
-$(document).ready(setupAjaxIndicator);
-$(document).ready(setupHeartBeat);
-$(document).ready(hideOnLoad);
-$(document).ready(addFormObserversForDoubleSubmit);
-
-function img_thumbnails() {
-  $('.thumbnails a').colorbox({rel:'nofollow'});
-  $('.attachments').find('a').each(function(index, element) {
-    var href_value = $(element).attr('href');
-    if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) {
-      $(element).colorbox({rel:'nofollow'});
-    }
-  });
-  $('.for_img_thumbnails').find('a').each(function(index, element) {
-    var href_value = $(element).attr('href');
-    if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) {
-      $(element).colorbox({rel:'nofollow'});
-     }
-  });
-}
-$(document).ready(img_thumbnails);
-
-function TimeClose(dateText, inst) {
-    if(inst.id=="issue_start_date"){
-        time=dateText;
-    }
-}
-var time=new Date();
-function TimeBeforeShow(input){
-    if(input.id=="issue_due_date"){
-        //var minDate = $(input).datepicker('option', 'minDate');
-        var tempdata=$("#issue_start_date").attr("value");
-
-        $(input).datepicker('option', 'minDate',new Date(tempdata.replace(/-/g,   "/")));
-        //$('.selector').datepicker('option', 'minDate', '12/25/2012');
-    }
-}
-
-function SetMinValue(){
-    /// var tempdata=$("#issue_start_date").attr("value");
-    //$('.selector').datepicker('option', 'minDate', '12/25/2012');
-    //alert(tempdata);
-    //$("#issue_due_date").datepicker({
-    //    minDate: new Date(2014,08,23)
-    //var datepickerOptions=
-    //{dateFormat: 'yy-mm-dd',minDate: new Date(2014,08,23), showOn: 'button', buttonImageOnly: true, buttonImage: "path_to_image('/images/calendar.png')", showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
-    //alert( $('.issue_due_date').length);
-    //$('.selector')[1].datepicker('option', 'minDate', new Date(2014, 0 - 8, 23));
-    //$("#issue_due_date").datepicker(datepickerOptions);
-    //$("##{issue_due_date}").datepicker(datepickerOptions);
-    //$("#issue_due_date").datepicker(
-    //        {dateFormat: 'yy-mm-dd',minDate: new Date(2014,08,23), showOn: 'button', buttonImageOnly: true, buttonImage: "path_to_image('/images/calendar.png')", showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true}
-    //)
-    //});
-}
-function  PrecentChange(obj){
-    var _v=    obj;
-    if(_v==100)
-    {
-        //var select=$("select[id='issue_status_id']");
-        $("select[id='issue_status_id']").find("option[value='3']").attr("selected","selected");
-    }
-    else if(_v==0)
-    {
-        //alert(1);
-        $("select[id='issue_status_id']").find("option[value='1']").attr("selected","selected");
-    }
-    else if(_v!=100&&_v!=0)
-    {
-        // alert(2);
-        $("select[id='issue_status_id']").find("option[value='2']").attr("selected","selected");
-    }
-}
-
-//added by lizanle 日期選擇js
-function HS_DateAdd(interval,number,date){
-    number = parseInt(number);
-    if (typeof(date)=="string"){var date = new Date(date.split("-")[0],date.split("-")[1],date.split("-")[2])}
-    if (typeof(date)=="object"){var date = date}
-    switch(interval){
-        case "y":return new Date(date.getFullYear()+number,date.getMonth(),date.getDate()); break;
-        case "m":return new Date(date.getFullYear(),date.getMonth()+number,checkDate(date.getFullYear(),date.getMonth()+number,date.getDate())); break;
-        case "d":return new Date(date.getFullYear(),date.getMonth(),date.getDate()+number); break;
-        case "w":return new Date(date.getFullYear(),date.getMonth(),7*number+date.getDate()); break;
-    }
-}
-function checkDate(year,month,date){
-    var enddate = ["31","28","31","30","31","30","31","31","30","31","30","31"];
-    var returnDate = "";
-    if (year%4==0){enddate[1]="29"}
-    if (date>enddate[month]){returnDate = enddate[month]}else{returnDate = date}
-    return returnDate;
-}
-
-function WeekDay(date){
-    var theDate;
-    if (typeof(date)=="string"){theDate = new Date(date.split("-")[0],date.split("-")[1],date.split("-")[2]);}
-    if (typeof(date)=="object"){theDate = date}
-    return theDate.getDay();
-}
-function HS_calender(){
-    var lis = "";
-    var style = "";
-    /*可以把下面的css剪切出去独立一个css文件*/
-    style +="<style type='text/css'>";
-    style +=".calender { width:170px; height:auto; font-size:12px; margin-right:14px; background:url(calenderbg.gif) no-repeat right center #fff; border:1px solid #397EAE; padding:1px}";
-    style +=".calender ul {list-style-type:none; margin:0; padding:0;}";
-    style +=".calender .day { background-color:#EDF5FF; height:20px;}";
-    style +=".calender li { list-style-type: none; float: left; margin: 0 0px; padding: 0 !important;  background: #ffffff; background-image: none !important;}";
-    style +=".calender .day li,.calender .date li{ float:left; width:14%; height:20px; line-height:20px; text-align:center}";
-    style +=".calender li a { text-decoration:none; font-family:Tahoma; font-size:11px; color:#333}";
-    style +=".calender li a:hover { color:#f30; text-decoration:underline}";
-    style +=".calender li a.hasArticle {font-weight:bold; color:#f60 !important}";
-    style +=".lastMonthDate, .nextMonthDate {color:#bbb;font-size:11px}";
-    style +=".selectThisYear a, .selectThisMonth a{text-decoration:none; margin:0 2px; color:#000; font-weight:bold}";
-    style +=".calender .LastMonth, .calender .NextMonth{ text-decoration:none; color:#000; font-size:18px; font-weight:bold; line-height:16px;}";
-    style +=".calender .LastMonth { float:left;}";
-    style +=".calender .NextMonth { float:right;}";
-    style +=".calenderBody {clear:both}";
-    style +=".calenderTitle {text-align:center;height:20px; line-height:20px; clear:both}";
-    style +=".today { background-color:#ffffaa;border:1px solid #f60; padding:2px}";
-    style +=".today a { color:#f30; }";
-    style +=".calenderBottom {clear:both; border-top:1px solid #ddd; padding: 3px 0; text-align:left}";
-    style +=".calenderBottom a {text-decoration:none; margin:2px !important; font-weight:bold; color:#000}";
-    style +=".calenderBottom a.closeCalender{float:right}";
-    style +=".closeCalenderBox {float:right; border:1px solid #000; background:#fff; font-size:9px; width:11px; height:11px; line-height:11px; text-align:center;overflow:hidden; font-weight:normal !important}";
-    style +="</style>";
-
-    var now;
-    if (typeof(arguments[0])=="string"){
-        selectDate = arguments[0].split("-");
-        var year = selectDate[0];
-        var month = parseInt(selectDate[1])-1+"";
-        var date = selectDate[2];
-        now = new Date(year,month,date);
-    }else if (typeof(arguments[0])=="object"){
-        now = arguments[0];
-    }
-    var lastMonthEndDate = HS_DateAdd("d","-1",now.getFullYear()+"-"+now.getMonth()+"-01").getDate();
-    var lastMonthDate = WeekDay(now.getFullYear()+"-"+now.getMonth()+"-01");
-    var thisMonthLastDate = HS_DateAdd("d","-1",now.getFullYear()+"-"+(parseInt(now.getMonth())+1).toString()+"-01");
-    var thisMonthEndDate = thisMonthLastDate.getDate();
-    var thisMonthEndDay = thisMonthLastDate.getDay();
-    var todayObj = new Date();
-    today = todayObj.getFullYear()+"-"+todayObj.getMonth()+"-"+todayObj.getDate();
-
-    for (i=0; i<lastMonthDate; i++){  // Last Month's Date
-        lis = "<li class='lastMonthDate'>"+lastMonthEndDate+"</li>" + lis;
-        lastMonthEndDate--;
-    }
-    for (i=1; i<=thisMonthEndDate; i++){ // Current Month's Date
-
-        if(today == now.getFullYear()+"-"+now.getMonth()+"-"+i){
-            var todayString = now.getFullYear()+"-"+(parseInt(now.getMonth())+1).toString()+"-"+i;
-            lis += "<li><a href=javascript:void(0) class='today' onclick='_selectThisDay(this)' title='"+now.getFullYear()+"-"+(parseInt(now.getMonth())+1)+"-"+i+"'>"+i+"</a></li>";
-        }else{
-            lis += "<li><a href=javascript:void(0) onclick='_selectThisDay(this)' title='"+now.getFullYear()+"-"+(parseInt(now.getMonth())+1)+"-"+i+"'>"+i+"</a></li>";
-        }
-
-    }
-    var j=1;
-    for (i=thisMonthEndDay; i<6; i++){  // Next Month's Date
-        lis += "<li class='nextMonthDate'>"+j+"</li>";
-        j++;
-    }
-    lis += style;
-
-    var CalenderTitle = "<a href='javascript:void(0)' class='NextMonth' onclick=HS_calender(HS_DateAdd('m',1,'"+now.getFullYear()+"-"+now.getMonth()+"-"+now.getDate()+"'),this) title='Next Month'>&raquo;</a>";
-    CalenderTitle += "<a href='javascript:void(0)' class='LastMonth' onclick=HS_calender(HS_DateAdd('m',-1,'"+now.getFullYear()+"-"+now.getMonth()+"-"+now.getDate()+"'),this) title='Previous Month'>&laquo;</a>";
-    CalenderTitle += "<span class='selectThisYear'><a href='javascript:void(0)' onclick='CalenderselectYear(this)' title='Click here to select other year' >"+now.getFullYear()+"</a></span>年<span class='selectThisMonth'><a href='javascript:void(0)' onclick='CalenderselectMonth(this)' title='Click here to select other month'>"+(parseInt(now.getMonth())+1).toString()+"</a></span>月";
-
-    if (arguments.length>1){
-        arguments[1].parentNode.parentNode.getElementsByTagName("ul")[1].innerHTML = lis;
-        arguments[1].parentNode.innerHTML = CalenderTitle;
-
-    }else{
-        var CalenderBox = style+"<div class='calender'><div class='calenderTitle'>"+CalenderTitle+"</div><div class='calenderBody'><ul class='day'><li>日</li><li>一</li><li>二</li><li>三</li><li>四</li><li>五</li><li>六</li></ul><ul class='date' id='thisMonthDate'>"+lis+"</ul></div><div class='calenderBottom'><a href='javascript:void(0)' class='closeCalender' onclick='closeCalender(this)'>&times;</a><span><span><a href=javascript:void(0) onclick='_selectThisDay(this)' title='"+todayString+"'>Today</a></span></span></div></div>";
-        return CalenderBox;
-    }
-}
-function _selectThisDay(d){
-    var boxObj = d.parentNode.parentNode.parentNode.parentNode.parentNode;
-    boxObj.targetObj.value = d.title;
-    boxObj.parentNode.removeChild(boxObj);
-}
-function closeCalender(d){
-    var boxObj = d.parentNode.parentNode.parentNode;
-    boxObj.parentNode.removeChild(boxObj);
-}
-
-function CalenderselectYear(obj){
-    var opt = "";
-    var thisYear = obj.innerHTML;
-    for (i=1970; i<=2020; i++){
-        if (i==thisYear){
-            opt += "<option value="+i+" selected>"+i+"</option>";
-        }else{
-            opt += "<option value="+i+">"+i+"</option>";
-        }
-    }
-    opt = "<select onblur='selectThisYear(this)' onchange='selectThisYear(this)' style='font-size:11px'>"+opt+"</select>";
-    obj.parentNode.innerHTML = opt;
-}
-
-function selectThisYear(obj){
-    HS_calender(obj.value+"-"+obj.parentNode.parentNode.getElementsByTagName("span")[1].getElementsByTagName("a")[0].innerHTML+"-1",obj.parentNode);
-}
-
-function CalenderselectMonth(obj){
-    var opt = "";
-    var thisMonth = obj.innerHTML;
-    for (i=1; i<=12; i++){
-        if (i==thisMonth){
-            opt += "<option value="+i+" selected>"+i+"</option>";
-        }else{
-            opt += "<option value="+i+">"+i+"</option>";
-        }
-    }
-    opt = "<select onblur='selectThisMonth(this)' onchange='selectThisMonth(this)' style='font-size:11px'>"+opt+"</select>";
-    obj.parentNode.innerHTML = opt;
-}
-function selectThisMonth(obj){
-    HS_calender(obj.parentNode.parentNode.getElementsByTagName("span")[0].getElementsByTagName("a")[0].innerHTML+"-"+obj.value+"-1",obj.parentNode);
-}
-function HS_setDate(inputObj){
-    var calenderObj = document.createElement("span");
-    calenderObj.innerHTML = HS_calender(new Date());
-    calenderObj.style.position = "absolute";
-    calenderObj.targetObj = inputObj;
-    inputObj.parentNode.insertBefore(calenderObj,inputObj.nextSibling);
-}
-//lizanle 刷新函数
-function redo() {
-    window.location.reload()
-}
-
-function encodeHomeworkUrl(url, is_base64){
-  if(typeof is_base64 === 'boolean' && is_base64){
-    return '/zipdown/download?base64file='+url;
-  }
-  var file = encodeURI(url).replace(/\+/g, '%2B');
-  return '/zipdown/download?file='+file;
-}
-
-//// 作业附件删除
-$(function(){
-    $('.attachments a.delete-homework-icon').bind('ajax:complete', //this will work
-        function(event, data, status, xhr) { //note parametes
-            $(this).parent('p').remove();
-            console.log("delete complete.");
-        });
-
-    $('a.tb_all').bind('ajax:complete', function (event, data, status, xhr) {
-        if(status == 'success'){
-            var res = JSON.parse(data.responseText);
-            if(res.length<1){
-                return;
-            }
-
-            if(res.length==1){
-              if(res[0].base64file){
-                location.href = encodeHomeworkUrl(res[0].base64file, true);return;
-              }
-              location.href = encodeHomeworkUrl(res[0].file);return;
-            }
-
-            document.getElementById('light').style.display='block';
-            $container = $('#light .upload_box_ul');
-            $container.empty();
-            for(var i = 0; i <res.length; ++i){
-                var des = '';
-                if(res.count > 1){
-                    des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载';
-                } else {
-                    des = '第'+res[i].index+'个学生的作品下载';
-                }
-
-              if(res[i].base64file){
-                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].base64file, true) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
-              } else {
-                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].file) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
-              }
-            }
-        }
-    });
-    $('#download_homework_attachments').bind('ajax:complete', function (event, data, status, xhr) {
-        if(status == 'success'){
-            var res = JSON.parse(data.responseText);
-            if(res.length == null){
-                alert("该作业没有任何附件可下载");
-            }
-            else if(res.length<1){
-                return;
-            }
-            else
-            {
-                if(res.length==1){
-                  if(res[0].base64file){
-                    location.href = encodeHomeworkUrl(res[0].base64file, true);return;
-                  }
-                  location.href = encodeHomeworkUrl(res[0].file);return;
-                }
-                document.getElementById('light').style.display='block';
-                $container = $('#light .upload_box_ul');
-                $container.empty();
-                for(var i = 0; i <res.length; ++i){
-                    var des = '';
-                    if(res.count > 1){
-                        des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载';
-                    } else {
-                        des = '第'+res[i].index+'个学生的作品下载';
-                    }
-
-                  if(res[i].base64file){
-                    $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].base64file, true) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
-                  } else {
-                    $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].file) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
-                  }
-
-                }
-            }
-        }
-    });
-});
-
-
-//firefox的pre标签换行
-$(document).ready(function () {
-    var userAgent = navigator.userAgent.toLowerCase();
-    var browser = {
-        version: (userAgent.match(/.+(?:rv|it|ra|ie)[/: ]([d.]+)/) || [])[1],
-        safari: /webkit/.test(userAgent),
-        opera: /opera/.test(userAgent),
-        msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
-        mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
-    };
-    if (browser.mozilla || browser.opera){
-        $("pre").addClass("break_word_firefox");
-    }
-    else{
-        $("pre").addClass("break_word");
-    }
-});
-
-//点击发送资源弹出框中的组织，要更改选择栏目中的内容
-//@dom 选中的radio，值为org_id
-function change_org_subfield(url){
-    $.ajax({
-        type:'get',
-        url:url
-    })
-}
-
-//点击图片即显示大图
-function showNormalImage(id) {
-    var description_images=$('div#'+id).find("img");
-    if (description_images.length>0) {
-        for (var i=0; i<description_images.length; i++){
-            var image=$(description_images[i]);
-            var _path = getRootPath();
-            //如果图片是视频图片，不处理。
-            if($(image).hasClass("mediaIco")){
-                var _src = _path+"/"+$(image).attr('src');
-                $(image).attr('src',_src);
-                return;
-            }
-            var element=$("<a></a>").attr("href",image.attr('src'));
-            image.wrap(element);
-            $(image).parent().colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
-        }
-        //$('#'+id+' a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); //有图片才将链接变为弹出框
-    }
-
-}
-
-
-//文件、帖子、通知分享
-function org_id_click(){
-  var sendText = $("input[name='org_id']:checked").next().text();
-  var orgDirection = "目标地址：";
-  $(".orgDirection").text(orgDirection + sendText);
-}
-function subfield_click(){
-  var sendText = $("input[name='org_id']:checked").next().text();
-  var orgDirection = "目标地址：";
-  var sendColumn = $("input[name='subfield']:checked").next().text();
-  $(".orgDirection").text(orgDirection + sendText + " / " + sendColumn);
-}
-
-//send_type:发送的类型，file对应文件，message对应帖子，news对应通知或新闻
-function observeSearchfieldOnInput(fieldId, url,send_id,send_ids, send_type) {
-  $('#'+fieldId).each(function() {
-    var $this = $(this);
-    $this.addClass('autocomplete');
-    $this.attr('data-value-was', $this.val());
-    var check = function() {
-      var val = $this.val();
-      if ($this.attr('data-value-was') != val){
-        $this.attr('data-value-was', val);
-        $.ajax({
-          url: url,
-          type: 'get',
-          data: {search: $this.val(),send_id:send_id,send_ids:send_ids, send_type:send_type},
-          success: function(data){  },
-          beforeSend: function(){ $this.addClass('ajax-loading'); },
-          complete: function(){ $this.removeClass('ajax-loading'); }
-        });
-      }
-    };
-    var reset = function() {
-      if (timer) {
-        clearInterval(timer);
-        timer = setInterval(check, 300);
-      }
-    };
-    var timer = setInterval(check, 300);
-    $this.bind('keyup click mousemove', reset);
-  });
-}
-function check_des(event){
-  if($(".sectionContent").find('input[type="radio"]:checked').length <= 0){
-    event.preventDefault();
-    $(".orgDirection").text('目标地址组织不能为空');
-    return false;
-  }else if($(".columnContent").find('input[type="radio"]:checked').length <= 0){
-    event.preventDefault();
-    $(".orgDirection").text('目标地址栏目不能为空');
-    return false;
-  }else{
-    return true;
-  }
-}
-
-var sendType = '1';
-var lastSendType ;//初始为发送到我的课程
-function show_send(id, user_id, send_type){
-  if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-    $.ajax({
-      type: 'get',
-      url: '/users/' + user_id + '/search_user_project',
-      data:{send_id:id, send_type:send_type}
-    });
-  }else if(lastSendType == '1'){
-    $.ajax({
-      type: 'get',
-      url: '/users/' + user_id + '/search_user_course',
-      data:{send_id:id, send_type:send_type}
-    });
-  }else if( lastSendType == '3'){//组织
-    $.ajax({
-      type: 'get',
-      url: '/users/' + user_id + '/search_user_org',
-      data:{send_id:id, send_type:send_type}
-    });
-  }else{
-    $.ajax({
-      type: 'get',
-      url: '/users/' + user_id + '/search_user_course',
-      data:{send_id:id, send_type:send_type}
-    });
-  }
-}
-
-//id 发送的id
-//发送的id数组
-//send_type:发送的类型，file对应文件，message对应帖子，news对应通知或新闻
-function chooseSendType(res_id,res_ids, user_id, send_type){
-
-  sendType = $(".resourcesSendType").val();
-  if (sendType === lastSendType) {
-    return;
-  } else if(lastSendType != null) { //不是第一次点击的时候
-    if (sendType == '1') {
-      $.ajax({
-        type: 'get',
-        url: '/users/' + user_id + '/search_user_course',
-        data:{send_id:res_id, send_type:send_type}
-      });
-    } else if(sendType == '2') {
-      $.ajax({
-        type: 'get',
-        url: '/users/' + user_id + '/search_user_project',
-        data:{send_id:res_id, send_type:send_type}
-      });
-    }else if(sendType == '3'){
-      $.ajax({
-        type: 'get',
-        url: '/users/' + user_id + '/search_user_org',
-        data:{send_id:res_id, send_type:send_type}
-      });
-    }
-  }
-  lastSendType = sendType;
-}
-
-//组织新建和配置中，选择组织为私有后，disbled掉允许游客下载选项
-function disable_down(source, des, hint){
-  if (source.attr("checked")){
-    des.attr("disabled", false);
-    hint.html("");
-  }
-  else{
-    des.attr("checked", false);
-    des.attr("disabled", true);
-    hint.html("（私有组织不允许游客下载资源）");
-
-  }
-}
-
-function getRootPath(){
-    //获取当前网址，如： http://localhost:8083/uimcardprj/share/meun.jsp
-    var curWwwPath=window.document.location.href;
-    //获取主机地址之后的目录，如： uimcardprj/share/meun.jsp
-    var pathName=window.document.location.pathname;
-    var pos=curWwwPath.indexOf(pathName);
-    //获取主机地址，如： http://localhost:8083
-    var localhostPaht=curWwwPath.substring(0,pos);
-    //获取带"/"的项目名，如：/uimcardprj
-//    var projectName=pathName.substring(0,pathName.substr(1).indexOf('/')+1);
-    var projectName="";
-    return(localhostPaht+projectName);
-}
-
+//= require_directory ./rateable
+//= require jquery.min
+//= require jquery.infinitescroll
+
+/* Redmine - project management software
+   Copyright (C) 2006-2013  Jean-Philippe Lang */
+
+//动态高度控制
+function description_show_hide(id){
+    showNormalImage('activity_description_'+id);
+    if($("#intro_content_"+id).height() > 810) {
+        $("#intro_content_show_"+id).show();
+    }
+    $("#intro_content_show_"+id).click(function(){
+        $("#activity_description_"+id).toggleClass("maxh360");
+        $("#intro_content_show_"+id).hide();
+        $("#intro_content_hide_"+id).show();
+    });
+    $("#intro_content_hide_"+id).click(function(){
+        $("#activity_description_"+id).toggleClass("maxh360");
+        $("#intro_content_hide_"+id).hide();
+        $("#intro_content_show_"+id).show();
+    });
+}
+
+function cleanArray (actual){
+  var newArray = new Array();
+    for (var i = 0; i< actual.length; i++){
+      if (actual[i]){
+        newArray.push(actual[i]);
+      }
+    }
+  return newArray;
+}
+
+function checkAll(id, checked) {
+  if (checked) {
+    $('#'+id).find('input[type=checkbox]').attr('checked', true);
+  } else {
+    $('#'+id).find('input[type=checkbox]').removeAttr('checked');
+  }
+}
+
+function toggleCheckboxesBySelector(selector) {
+  var all_checked = true;
+  $(selector).each(function(index) {
+    if (!$(this).is(':checked')) { all_checked = false; }
+  });
+  $(selector).attr('checked', !all_checked);
+}
+
+function showAndScrollTo(id, focus) {
+  $('#'+id).show();
+  if (focus !== null) {
+    $('#'+focus).focus();
+  }
+  $('html, body').animate({scrollTop: $('#'+id).offset().top}, 400);
+}
+
+function toggleRowGroup(el) {
+  var tr = $(el).parents('tr').first();
+  var n = tr.next();
+  tr.toggleClass('open');
+  while (n.length && !n.hasClass('group')) {
+    n.toggle();
+    n = n.next('tr');
+  }
+}
+
+function collapseAllRowGroups(el) {
+  var tbody = $(el).parents('tbody').first();
+  tbody.children('tr').each(function(index) {
+    if ($(this).hasClass('group')) {
+      $(this).removeClass('open');
+    } else {
+      $(this).hide();
+    }
+  });
+}
+
+function expandAllRowGroups(el) {
+  var tbody = $(el).parents('tbody').first();
+  tbody.children('tr').each(function(index) {
+    if ($(this).hasClass('group')) {
+      $(this).addClass('open');
+    } else {
+      $(this).show();
+    }
+  });
+}
+
+function toggleAllRowGroups(el) {
+  var tr = $(el).parents('tr').first();
+  if (tr.hasClass('open')) {
+    collapseAllRowGroups(el);
+  } else {
+    expandAllRowGroups(el);
+  }
+}
+
+function toggleFieldset(el) {
+  var fieldset = $(el).parents('fieldset').first();
+  fieldset.toggleClass('collapsed');
+  fieldset.children('div').toggle();
+}
+
+function hideFieldset(el) {
+  var fieldset = $(el).parents('fieldset').first();
+  fieldset.toggleClass('collapsed');
+  fieldset.children('div').hide();
+}
+
+function initFilters(){
+  $('#add_filter_select').change(function(){
+    addFilter($(this).val(), '', []);
+  });
+  $('#filters-table td.field input[type=checkbox]').each(function(){
+    toggleFilter($(this).val());
+  });
+  $('#filters-table td.field input[type=checkbox]').on('click',function(){
+    toggleFilter($(this).val());
+  });
+  $('#filters-table .toggle-multiselect').on('click',function(){
+    toggleMultiSelect($(this).siblings('select'));
+  });
+  $('#filters-table input[type=text]').on('keypress', function(e){
+    if (e.keyCode == 13) submit_query_form("query_form");
+  });
+}
+
+function addFilter(field, operator, values) {
+  var fieldId = field.replace('.', '_');
+  var tr = $('#tr_'+fieldId);
+  if (tr.length > 0) {
+    tr.show();
+  } else {
+    buildFilterRow(field, operator, values);
+  }
+  $('#cb_'+fieldId).attr('checked', true);
+  toggleFilter(field);
+  $('#add_filter_select').val('').children('option').each(function(){
+    if ($(this).attr('value') == field) {
+      $(this).attr('disabled', true);
+    }
+  });
+}
+
+function buildFilterRow(field, operator, values) {
+  var fieldId = field.replace('.', '_');
+  var filterTable = $("#filters-table");
+  var filterOptions = availableFilters[field];
+  var operators = operatorByType[filterOptions['type']];
+  var filterValues = filterOptions['values'];
+  var i, select;
+
+  var tr = $('<tr class="filter">').attr('id', 'tr_'+fieldId).html(
+    '<td class="field"><input checked="checked" id="cb_'+fieldId+'" name="f[]" value="'+field+'" type="checkbox"><label for="cb_'+fieldId+'"> '+filterOptions['name']+'</label></td>' +
+    '<td class="operator"><select id="operators_'+fieldId+'" name="op['+field+']"></td>' +
+    '<td class="values"></td>'
+  );
+  filterTable.append(tr);
+
+  select = tr.find('td.operator select');
+  for (i=0;i<operators.length;i++){
+    var option = $('<option>').val(operators[i]).text(operatorLabels[operators[i]]);
+    if (operators[i] == operator) { option.attr('selected', true); }
+    select.append(option);
+  }
+  select.change(function(){ toggleOperator(field); });
+
+  switch (filterOptions['type']){
+  case "list":
+  case "list_optional":
+  case "list_status":
+  case "list_subprojects":
+    tr.find('td.values').append(
+      '<span style="display:none;"><select class="value" id="values_'+fieldId+'_1" name="v['+field+'][]"></select>' +
+      ' <span class="toggle-multiselect"><a>复选/multi-select</a></span></span>'
+    );
+    select = tr.find('td.values select');
+    if (values.length > 1) { select.attr('multiple', true); }
+    for (i=0;i<filterValues.length;i++){
+      var filterValue = filterValues[i];
+      var option = $('<option>');
+      if ($.isArray(filterValue)) {
+        option.val(filterValue[1]).text(filterValue[0]);
+        if ($.inArray(filterValue[1], values) > -1) {option.attr('selected', true);}
+      } else {
+        option.val(filterValue).text(filterValue);
+        if ($.inArray(filterValue, values) > -1) {option.attr('selected', true);}
+      }
+      select.append(option);
+    }
+    break;
+  case "date":
+  case "date_past":
+    tr.find('td.values').append(
+      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="10" class="value date_value" /></span>' +
+      ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="10" class="value date_value" /></span>' +
+      ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="3" class="value" /> '+labelDayPlural+'</span>'
+    );
+    $('#values_'+fieldId+'_1').val(values[0]).datepicker(datepickerOptions);
+    $('#values_'+fieldId+'_2').val(values[1]).datepicker(datepickerOptions);
+    $('#values_'+fieldId).val(values[0]);
+    break;
+  case "string":
+  case "text":
+    tr.find('td.values').append(
+      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="30" class="value" /></span>'
+    );
+    $('#values_'+fieldId).val(values[0]);
+    break;
+  case "relation":
+    tr.find('td.values').append(
+      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="6" class="value" /></span>' +
+      '<span style="display:none;"><select class="value" name="v['+field+'][]" id="values_'+fieldId+'_1"></select></span>'
+    );
+    $('#values_'+fieldId).val(values[0]);
+    select = tr.find('td.values select');
+    for (i=0;i<allProjects.length;i++){
+      var filterValue = allProjects[i];
+      var option = $('<option>');
+      option.val(filterValue[1]).text(filterValue[0]);
+      if (values[0] == filterValue[1]) { option.attr('selected', true); }
+      select.append(option);
+    }
+  case "integer":
+  case "float":
+    tr.find('td.values').append(
+      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="6" class="value" /></span>' +
+      ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="6" class="value" /></span>'
+    );
+    $('#values_'+fieldId+'_1').val(values[0]);
+    $('#values_'+fieldId+'_2').val(values[1]);
+    break;
+  }
+}
+
+function toggleFilter(field) {
+  var fieldId = field.replace('.', '_');
+  if ($('#cb_' + fieldId).is(':checked')) {
+    $("#operators_" + fieldId).show().removeAttr('disabled');
+    toggleOperator(field);
+  } else {
+    $("#operators_" + fieldId).hide().attr('disabled', true);
+    enableValues(field, []);
+  }
+}
+
+function enableValues(field, indexes) {
+  var fieldId = field.replace('.', '_');
+  $('#tr_'+fieldId+' td.values .value').each(function(index) {
+    if ($.inArray(index, indexes) >= 0) {
+      $(this).removeAttr('disabled');
+      $(this).parents('span').first().show();
+    } else {
+      $(this).val('');
+      $(this).attr('disabled', true);
+      $(this).parents('span').first().hide();
+    }
+
+    if ($(this).hasClass('group')) {
+      $(this).addClass('open');
+    } else {
+      $(this).show();
+    }
+  });
+}
+
+function toggleOperator(field) {
+  var fieldId = field.replace('.', '_');
+  var operator = $("#operators_" + fieldId);
+  switch (operator.val()) {
+    case "!*":
+    case "*":
+    case "t":
+    case "ld":
+    case "w":
+    case "lw":
+    case "l2w":
+    case "m":
+    case "lm":
+    case "y":
+    case "o":
+    case "c":
+      enableValues(field, []);
+      break;
+    case "><":
+      enableValues(field, [0,1]);
+      break;
+    case "<t+":
+    case ">t+":
+    case "><t+":
+    case "t+":
+    case ">t-":
+    case "<t-":
+    case "><t-":
+    case "t-":
+      enableValues(field, [2]);
+      break;
+    case "=p":
+    case "=!p":
+    case "!p":
+      enableValues(field, [1]);
+      break;
+    default:
+      enableValues(field, [0]);
+      break;
+  }
+}
+
+function toggleMultiSelect(el) {
+  if (el.attr('multiple')) {
+    el.removeAttr('multiple');
+  } else {
+    el.attr('multiple', true);
+  }
+}
+
+function submit_query_form(id) {
+  selectAllOptions("selected_columns");
+  $('#'+id).submit();
+}
+
+function showTab(name) {
+  $('div#content .tab-content').hide();
+  $('div.tabs a').removeClass('selected');
+  $('#tab-content-' + name).show();
+  $('#tab-' + name).addClass('selected');
+  return false;
+}
+
+function moveTabRight(el) {
+  var lis = $(el).parents('div.tabs').first().find('ul').children();
+  var tabsWidth = 0;
+  var i = 0;
+  lis.each(function(){
+    if ($(this).is(':visible')) {
+      tabsWidth += $(this).width() + 6;
+    }
+  });
+  if (tabsWidth < $(el).parents('div.tabs').first().width() - 60) { return; }
+  while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
+  lis.eq(i).hide();
+}
+
+function moveTabLeft(el) {
+  var lis = $(el).parents('div.tabs').first().find('ul').children();
+  var i = 0;
+  while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
+  if (i>0) {
+    lis.eq(i-1).show();
+  }
+}
+
+function displayTabsButtons() {
+  var lis;
+  var tabsWidth = 0;
+  var el;
+  $('div.tabs').each(function() {
+    el = $(this);
+    lis = el.find('ul').children();
+    lis.each(function(){
+      if ($(this).is(':visible')) {
+        tabsWidth += $(this).width() + 6;
+      }
+    });
+    if ((tabsWidth < el.width() - 60) && (lis.first().is(':visible'))) {
+      el.find('div.tabs-buttons').hide();
+    } else {
+      el.find('div.tabs-buttons').show();
+    }
+  });
+}
+
+function setPredecessorFieldsVisibility() {
+  var relationType = $('#relation_relation_type');
+  if (relationType.val() == "precedes" || relationType.val() == "follows") {
+    $('#predecessor_fields').show();
+  } else {
+    $('#predecessor_fields').hide();
+  }
+}
+
+function showModal(id, width) {
+  var el = $('#'+id).first();
+  if (el.length === 0 || el.is(':visible')) {return;}
+  var title = el.find('h3.title').text();
+  el.dialog({
+    width: width,
+    modal: true,
+    resizable: false,
+    dialogClass: 'modal',
+    title: title
+  });
+  el.find("input[type=text], input[type=submit]").first().focus();
+}
+
+function hideModal(el) {
+  var modal;
+  if (el) {
+    modal = $(el).parents('.ui-dialog-content');
+  } else {
+    modal = $('#ajax-modal');
+  }
+  modal.dialog("close");
+}
+
+function submitPreview(url, form, target) {
+  $.ajax({
+    url: url,
+    type: 'post',
+    data: $('#'+form).serialize(),
+    success: function(data){
+      $('#'+target).html(data);
+    }
+  });
+}
+
+function collapseScmEntry(id) {
+  $('.'+id).each(function() {
+    if ($(this).hasClass('open')) {
+      collapseScmEntry($(this).attr('id'));
+    }
+    $(this).hide();
+  });
+  $('#'+id).removeClass('open');
+}
+
+function expandScmEntry(id) {
+  $('.'+id).each(function() {
+    $(this).show();
+    if ($(this).hasClass('loaded') && !$(this).hasClass('collapsed')) {
+      expandScmEntry($(this).attr('id'));
+    }
+  });
+  $('#'+id).addClass('open');
+}
+
+function scmEntryClick(id, url) {
+    el = $('#'+id);
+    if (el.hasClass('open')) {
+        collapseScmEntry(id);
+        el.addClass('collapsed');
+        return false;
+    } else if (el.hasClass('loaded')) {
+        expandScmEntry(id);
+        el.removeClass('collapsed');
+        return false;
+    }
+    if (el.hasClass('loading')) {
+        return false;
+    }
+    el.addClass('loading');
+    $.ajax({
+      url: url,
+      success: function(data){
+        el.after(data);
+        el.addClass('open').addClass('loaded').removeClass('loading');
+      }
+    });
+    return true;
+}
+
+function randomKey(size) {
+  var chars = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z');
+  var key = '';
+  for (i = 0; i < size; i++) {
+    key += chars[Math.floor(Math.random() * chars.length)];
+  }
+  return key;
+}
+
+// Can't use Rails' remote select because we need the form data
+function updateIssueFrom(url) {
+  $.ajax({
+    url: url,
+    type: 'post',
+    data: $('#issue-form').serialize()
+  });
+}
+
+function updateBulkEditFrom(url) {
+  $.ajax({
+    url: url,
+    type: 'post',
+    data: $('#bulk_edit_form').serialize()
+  });
+}
+
+function clearMessage(id) {
+	$('#'+id).val("");
+}
+
+
+function observeAutocompleteField(fieldId, url, options) {
+  $(document).ready(function() {
+    $('#'+fieldId).autocomplete($.extend({
+      source: url,
+      select: function(e,ui){self.location="/issues/"+ui.item.value;},
+      minLength: 1,
+      search: function(){$('#'+fieldId).addClass('ajax-loading');},
+      response: function(){$('#'+fieldId).removeClass('ajax-loading');
+      }
+    }, options));
+    $('#'+fieldId).addClass('autocomplete');
+  
+  });
+  
+}
+
+function observeSearchfield(fieldId, targetId, url) {
+  $('#'+fieldId).each(function() {
+    var $this = $(this);
+    $this.addClass('autocomplete');
+    $this.attr('data-value-was', $this.val());
+    var check = function() {
+      var val = $this.val();
+      if ($this.attr('data-value-was') != val){
+        $this.attr('data-value-was', val);
+        $.ajax({
+          url: url,
+          type: 'get',
+          data: {q: $this.val()},
+          success: function(data){ if(targetId) $('#'+targetId).html(data); },
+          beforeSend: function(){ $this.addClass('ajax-loading'); },
+          complete: function(){ $this.removeClass('ajax-loading'); }
+        });
+      }
+    };
+    var reset = function() {
+      if (timer) {
+        clearInterval(timer);
+        timer = setInterval(check, 300);
+      }
+    };
+    var timer = setInterval(check, 300);
+    $this.bind('keyup click mousemove', reset);
+  });
+}
+
+function observeProjectModules() {
+  var f = function() {
+    /* Hides trackers and issues custom fields on the new project form when issue_tracking module is disabled */
+    if ($('#project_enabled_module_names_issue_tracking').attr('checked')) {
+      $('#project_trackers').show();
+    }else{
+      $('#project_trackers').hide();
+    }
+  };
+
+  $(window).load(f);
+  $('#project_enabled_module_names_issue_tracking').change(f);
+}
+
+function initMyPageSortable(list, url) {
+  $('#list-'+list).sortable({
+    connectWith: '.block-receiver',
+    tolerance: 'pointer',
+    update: function(){
+      $.ajax({
+        url: url,
+        type: 'post',
+        data: {'blocks': $.map($('#list-'+list).children(), function(el){return $(el).attr('id');})}
+      });
+    }
+  });
+  $("#list-top, #list-left, #list-right").disableSelection();
+}
+
+var warnLeavingUnsavedMessage;
+function warnLeavingUnsaved(message) {
+  warnLeavingUnsavedMessage = message;
+
+  $('form').submit(function(){
+    $('textarea').removeData('changed');
+  });
+  $('textarea').change(function(){
+    $(this).data('changed', 'changed');
+  });
+  window.onbeforeunload = function(){
+    var warn = false;
+    $('textarea').blur().each(function(){
+      if ($(this).data('changed')) {
+        warn = true;
+      }
+    });
+    if (warn) {return warnLeavingUnsavedMessage;}
+  };
+}
+
+function setupHeartBeat(){
+  var time = 60*1000*30; // 30 mins
+  setInterval(function(){$.getJSON('/account/heartbeat');},time);
+}
+
+function setupAjaxIndicator() {
+  $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
+    if(settings && settings.url && settings.url.match(/account\/heartbeat$/)){
+      return;
+    }
+    if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
+      $('#ajax-indicator').show();
+    }
+  });
+  
+  $('#ajax-indicator').bind('ajaxStop', function() {
+    $('#ajax-indicator').hide();
+      if(MathJax && MathJax.Hub)
+          MathJax.Hub.Queue(['Typeset', MathJax.Hub]); //如果是ajax刷新页面的话，手动执行MathJax的公式显示
+      try{
+           prettyPrint(); //如果刷新出来的页面如果存在代码行的话，也需要美化
+      }catch (e){
+
+      }
+  });
+}
+
+function hideOnLoad() {
+  $('.hol').hide();
+}
+
+function addFormObserversForDoubleSubmit() {
+  $('form[method=post]').each(function() {
+    if (!$(this).hasClass('multiple-submit')) {
+      $(this).submit(function(form_submission) {
+        if ($(form_submission.target).attr('data-submitted')) {
+          form_submission.preventDefault();
+        } else {
+          $(form_submission.target).attr('data-submitted', true);
+        }
+      });
+    }
+  });
+}
+
+function blockEventPropagation(event) {
+  event.stopPropagation();
+  event.preventDefault();
+}
+
+function toggleAndSettingWordsVal(parent_widget, text_widget, value){
+  text_widget.val(value)
+  parent_widget.slideToggle(400)
+}
+function transpotUrl (scope) {
+  $(scope).each(function(){
+    var tmpContent = $(this).html();
+    tmpContent = tmpContent.replace(/(^|[^\"\'])(http|ftp|mms|rstp|news|https)(\:\/\/[^<\s\+,，]+)/gi,"$1<a href='$2$3' target='_blank'>$2$3<\/a>");
+    // tmpContent = tmpContent.replace(/(^|[^\/])(www\.[^<\s\+,，]+)/gi,"$1<a href='http:\/\/$2' style='color:blue' target='_blank'>$2</a>");
+    $(this).html(tmpContent);
+  });
+}
+
+$(document).ready(setupAjaxIndicator);
+$(document).ready(setupHeartBeat);
+$(document).ready(hideOnLoad);
+$(document).ready(addFormObserversForDoubleSubmit);
+
+function img_thumbnails() {
+  $('.thumbnails a').colorbox({rel:'nofollow'});
+  $('.attachments').find('a').each(function(index, element) {
+    var href_value = $(element).attr('href');
+    if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) {
+      $(element).colorbox({rel:'nofollow'});
+    }
+  });
+  $('.for_img_thumbnails').find('a').each(function(index, element) {
+    var href_value = $(element).attr('href');
+    if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) {
+      $(element).colorbox({rel:'nofollow'});
+     }
+  });
+}
+$(document).ready(img_thumbnails);
+
+function TimeClose(dateText, inst) {
+    if(inst.id=="issue_start_date"){
+        time=dateText;
+    }
+}
+var time=new Date();
+function TimeBeforeShow(input){
+    if(input.id=="issue_due_date"){
+        //var minDate = $(input).datepicker('option', 'minDate');
+        var tempdata=$("#issue_start_date").attr("value");
+
+        $(input).datepicker('option', 'minDate',new Date(tempdata.replace(/-/g,   "/")));
+        //$('.selector').datepicker('option', 'minDate', '12/25/2012');
+    }
+}
+
+function SetMinValue(){
+    /// var tempdata=$("#issue_start_date").attr("value");
+    //$('.selector').datepicker('option', 'minDate', '12/25/2012');
+    //alert(tempdata);
+    //$("#issue_due_date").datepicker({
+    //    minDate: new Date(2014,08,23)
+    //var datepickerOptions=
+    //{dateFormat: 'yy-mm-dd',minDate: new Date(2014,08,23), showOn: 'button', buttonImageOnly: true, buttonImage: "path_to_image('/images/calendar.png')", showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
+    //alert( $('.issue_due_date').length);
+    //$('.selector')[1].datepicker('option', 'minDate', new Date(2014, 0 - 8, 23));
+    //$("#issue_due_date").datepicker(datepickerOptions);
+    //$("##{issue_due_date}").datepicker(datepickerOptions);
+    //$("#issue_due_date").datepicker(
+    //        {dateFormat: 'yy-mm-dd',minDate: new Date(2014,08,23), showOn: 'button', buttonImageOnly: true, buttonImage: "path_to_image('/images/calendar.png')", showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true}
+    //)
+    //});
+}
+function  PrecentChange(obj){
+    var _v=    obj;
+    if(_v==100)
+    {
+        //var select=$("select[id='issue_status_id']");
+        $("select[id='issue_status_id']").find("option[value='3']").attr("selected","selected");
+    }
+    else if(_v==0)
+    {
+        //alert(1);
+        $("select[id='issue_status_id']").find("option[value='1']").attr("selected","selected");
+    }
+    else if(_v!=100&&_v!=0)
+    {
+        // alert(2);
+        $("select[id='issue_status_id']").find("option[value='2']").attr("selected","selected");
+    }
+}
+
+//added by lizanle 日期選擇js
+function HS_DateAdd(interval,number,date){
+    number = parseInt(number);
+    if (typeof(date)=="string"){var date = new Date(date.split("-")[0],date.split("-")[1],date.split("-")[2])}
+    if (typeof(date)=="object"){var date = date}
+    switch(interval){
+        case "y":return new Date(date.getFullYear()+number,date.getMonth(),date.getDate()); break;
+        case "m":return new Date(date.getFullYear(),date.getMonth()+number,checkDate(date.getFullYear(),date.getMonth()+number,date.getDate())); break;
+        case "d":return new Date(date.getFullYear(),date.getMonth(),date.getDate()+number); break;
+        case "w":return new Date(date.getFullYear(),date.getMonth(),7*number+date.getDate()); break;
+    }
+}
+function checkDate(year,month,date){
+    var enddate = ["31","28","31","30","31","30","31","31","30","31","30","31"];
+    var returnDate = "";
+    if (year%4==0){enddate[1]="29"}
+    if (date>enddate[month]){returnDate = enddate[month]}else{returnDate = date}
+    return returnDate;
+}
+
+function WeekDay(date){
+    var theDate;
+    if (typeof(date)=="string"){theDate = new Date(date.split("-")[0],date.split("-")[1],date.split("-")[2]);}
+    if (typeof(date)=="object"){theDate = date}
+    return theDate.getDay();
+}
+function HS_calender(){
+    var lis = "";
+    var style = "";
+    /*可以把下面的css剪切出去独立一个css文件*/
+    style +="<style type='text/css'>";
+    style +=".calender { width:170px; height:auto; font-size:12px; margin-right:14px; background:url(calenderbg.gif) no-repeat right center #fff; border:1px solid #397EAE; padding:1px}";
+    style +=".calender ul {list-style-type:none; margin:0; padding:0;}";
+    style +=".calender .day { background-color:#EDF5FF; height:20px;}";
+    style +=".calender li { list-style-type: none; float: left; margin: 0 0px; padding: 0 !important;  background: #ffffff; background-image: none !important;}";
+    style +=".calender .day li,.calender .date li{ float:left; width:14%; height:20px; line-height:20px; text-align:center}";
+    style +=".calender li a { text-decoration:none; font-family:Tahoma; font-size:11px; color:#333}";
+    style +=".calender li a:hover { color:#f30; text-decoration:underline}";
+    style +=".calender li a.hasArticle {font-weight:bold; color:#f60 !important}";
+    style +=".lastMonthDate, .nextMonthDate {color:#bbb;font-size:11px}";
+    style +=".selectThisYear a, .selectThisMonth a{text-decoration:none; margin:0 2px; color:#000; font-weight:bold}";
+    style +=".calender .LastMonth, .calender .NextMonth{ text-decoration:none; color:#000; font-size:18px; font-weight:bold; line-height:16px;}";
+    style +=".calender .LastMonth { float:left;}";
+    style +=".calender .NextMonth { float:right;}";
+    style +=".calenderBody {clear:both}";
+    style +=".calenderTitle {text-align:center;height:20px; line-height:20px; clear:both}";
+    style +=".today { background-color:#ffffaa;border:1px solid #f60; padding:2px}";
+    style +=".today a { color:#f30; }";
+    style +=".calenderBottom {clear:both; border-top:1px solid #ddd; padding: 3px 0; text-align:left}";
+    style +=".calenderBottom a {text-decoration:none; margin:2px !important; font-weight:bold; color:#000}";
+    style +=".calenderBottom a.closeCalender{float:right}";
+    style +=".closeCalenderBox {float:right; border:1px solid #000; background:#fff; font-size:9px; width:11px; height:11px; line-height:11px; text-align:center;overflow:hidden; font-weight:normal !important}";
+    style +="</style>";
+
+    var now;
+    if (typeof(arguments[0])=="string"){
+        selectDate = arguments[0].split("-");
+        var year = selectDate[0];
+        var month = parseInt(selectDate[1])-1+"";
+        var date = selectDate[2];
+        now = new Date(year,month,date);
+    }else if (typeof(arguments[0])=="object"){
+        now = arguments[0];
+    }
+    var lastMonthEndDate = HS_DateAdd("d","-1",now.getFullYear()+"-"+now.getMonth()+"-01").getDate();
+    var lastMonthDate = WeekDay(now.getFullYear()+"-"+now.getMonth()+"-01");
+    var thisMonthLastDate = HS_DateAdd("d","-1",now.getFullYear()+"-"+(parseInt(now.getMonth())+1).toString()+"-01");
+    var thisMonthEndDate = thisMonthLastDate.getDate();
+    var thisMonthEndDay = thisMonthLastDate.getDay();
+    var todayObj = new Date();
+    today = todayObj.getFullYear()+"-"+todayObj.getMonth()+"-"+todayObj.getDate();
+
+    for (i=0; i<lastMonthDate; i++){  // Last Month's Date
+        lis = "<li class='lastMonthDate'>"+lastMonthEndDate+"</li>" + lis;
+        lastMonthEndDate--;
+    }
+    for (i=1; i<=thisMonthEndDate; i++){ // Current Month's Date
+
+        if(today == now.getFullYear()+"-"+now.getMonth()+"-"+i){
+            var todayString = now.getFullYear()+"-"+(parseInt(now.getMonth())+1).toString()+"-"+i;
+            lis += "<li><a href=javascript:void(0) class='today' onclick='_selectThisDay(this)' title='"+now.getFullYear()+"-"+(parseInt(now.getMonth())+1)+"-"+i+"'>"+i+"</a></li>";
+        }else{
+            lis += "<li><a href=javascript:void(0) onclick='_selectThisDay(this)' title='"+now.getFullYear()+"-"+(parseInt(now.getMonth())+1)+"-"+i+"'>"+i+"</a></li>";
+        }
+
+    }
+    var j=1;
+    for (i=thisMonthEndDay; i<6; i++){  // Next Month's Date
+        lis += "<li class='nextMonthDate'>"+j+"</li>";
+        j++;
+    }
+    lis += style;
+
+    var CalenderTitle = "<a href='javascript:void(0)' class='NextMonth' onclick=HS_calender(HS_DateAdd('m',1,'"+now.getFullYear()+"-"+now.getMonth()+"-"+now.getDate()+"'),this) title='Next Month'>&raquo;</a>";
+    CalenderTitle += "<a href='javascript:void(0)' class='LastMonth' onclick=HS_calender(HS_DateAdd('m',-1,'"+now.getFullYear()+"-"+now.getMonth()+"-"+now.getDate()+"'),this) title='Previous Month'>&laquo;</a>";
+    CalenderTitle += "<span class='selectThisYear'><a href='javascript:void(0)' onclick='CalenderselectYear(this)' title='Click here to select other year' >"+now.getFullYear()+"</a></span>年<span class='selectThisMonth'><a href='javascript:void(0)' onclick='CalenderselectMonth(this)' title='Click here to select other month'>"+(parseInt(now.getMonth())+1).toString()+"</a></span>月";
+
+    if (arguments.length>1){
+        arguments[1].parentNode.parentNode.getElementsByTagName("ul")[1].innerHTML = lis;
+        arguments[1].parentNode.innerHTML = CalenderTitle;
+
+    }else{
+        var CalenderBox = style+"<div class='calender'><div class='calenderTitle'>"+CalenderTitle+"</div><div class='calenderBody'><ul class='day'><li>日</li><li>一</li><li>二</li><li>三</li><li>四</li><li>五</li><li>六</li></ul><ul class='date' id='thisMonthDate'>"+lis+"</ul></div><div class='calenderBottom'><a href='javascript:void(0)' class='closeCalender' onclick='closeCalender(this)'>&times;</a><span><span><a href=javascript:void(0) onclick='_selectThisDay(this)' title='"+todayString+"'>Today</a></span></span></div></div>";
+        return CalenderBox;
+    }
+}
+function _selectThisDay(d){
+    var boxObj = d.parentNode.parentNode.parentNode.parentNode.parentNode;
+    boxObj.targetObj.value = d.title;
+    boxObj.parentNode.removeChild(boxObj);
+}
+function closeCalender(d){
+    var boxObj = d.parentNode.parentNode.parentNode;
+    boxObj.parentNode.removeChild(boxObj);
+}
+
+function CalenderselectYear(obj){
+    var opt = "";
+    var thisYear = obj.innerHTML;
+    for (i=1970; i<=2020; i++){
+        if (i==thisYear){
+            opt += "<option value="+i+" selected>"+i+"</option>";
+        }else{
+            opt += "<option value="+i+">"+i+"</option>";
+        }
+    }
+    opt = "<select onblur='selectThisYear(this)' onchange='selectThisYear(this)' style='font-size:11px'>"+opt+"</select>";
+    obj.parentNode.innerHTML = opt;
+}
+
+function selectThisYear(obj){
+    HS_calender(obj.value+"-"+obj.parentNode.parentNode.getElementsByTagName("span")[1].getElementsByTagName("a")[0].innerHTML+"-1",obj.parentNode);
+}
+
+function CalenderselectMonth(obj){
+    var opt = "";
+    var thisMonth = obj.innerHTML;
+    for (i=1; i<=12; i++){
+        if (i==thisMonth){
+            opt += "<option value="+i+" selected>"+i+"</option>";
+        }else{
+            opt += "<option value="+i+">"+i+"</option>";
+        }
+    }
+    opt = "<select onblur='selectThisMonth(this)' onchange='selectThisMonth(this)' style='font-size:11px'>"+opt+"</select>";
+    obj.parentNode.innerHTML = opt;
+}
+function selectThisMonth(obj){
+    HS_calender(obj.parentNode.parentNode.getElementsByTagName("span")[0].getElementsByTagName("a")[0].innerHTML+"-"+obj.value+"-1",obj.parentNode);
+}
+function HS_setDate(inputObj){
+    var calenderObj = document.createElement("span");
+    calenderObj.innerHTML = HS_calender(new Date());
+    calenderObj.style.position = "absolute";
+    calenderObj.targetObj = inputObj;
+    inputObj.parentNode.insertBefore(calenderObj,inputObj.nextSibling);
+}
+//lizanle 刷新函数
+function redo() {
+    window.location.reload()
+}
+
+function encodeHomeworkUrl(url, is_base64){
+  if(typeof is_base64 === 'boolean' && is_base64){
+    return '/zipdown/download?base64file='+url;
+  }
+  var file = encodeURI(url).replace(/\+/g, '%2B');
+  return '/zipdown/download?file='+file;
+}
+
+//// 作业附件删除
+$(function(){
+    $('.attachments a.delete-homework-icon').bind('ajax:complete', //this will work
+        function(event, data, status, xhr) { //note parametes
+            $(this).parent('p').remove();
+            console.log("delete complete.");
+        });
+
+    $('a.tb_all').bind('ajax:complete', function (event, data, status, xhr) {
+        if(status == 'success'){
+            var res = JSON.parse(data.responseText);
+            if(res.length<1){
+                return;
+            }
+
+            if(res.length==1){
+              if(res[0].base64file){
+                location.href = encodeHomeworkUrl(res[0].base64file, true);return;
+              }
+              location.href = encodeHomeworkUrl(res[0].file);return;
+            }
+
+            document.getElementById('light').style.display='block';
+            $container = $('#light .upload_box_ul');
+            $container.empty();
+            for(var i = 0; i <res.length; ++i){
+                var des = '';
+                if(res.count > 1){
+                    des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载';
+                } else {
+                    des = '第'+res[i].index+'个学生的作品下载';
+                }
+
+              if(res[i].base64file){
+                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].base64file, true) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+              } else {
+                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].file) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+              }
+            }
+        }
+    });
+    $('#download_homework_attachments').bind('ajax:complete', function (event, data, status, xhr) {
+        if(status == 'success'){
+            var res = JSON.parse(data.responseText);
+            if(res.length == null){
+                alert("该作业没有任何附件可下载");
+            }
+            else if(res.length<1){
+                return;
+            }
+            else
+            {
+                if(res.length==1){
+                  if(res[0].base64file){
+                    location.href = encodeHomeworkUrl(res[0].base64file, true);return;
+                  }
+                  location.href = encodeHomeworkUrl(res[0].file);return;
+                }
+                document.getElementById('light').style.display='block';
+                $container = $('#light .upload_box_ul');
+                $container.empty();
+                for(var i = 0; i <res.length; ++i){
+                    var des = '';
+                    if(res.count > 1){
+                        des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载';
+                    } else {
+                        des = '第'+res[i].index+'个学生的作品下载';
+                    }
+
+                  if(res[i].base64file){
+                    $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].base64file, true) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+                  } else {
+                    $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="'+ encodeHomeworkUrl(res[i].file) +'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+                  }
+
+                }
+            }
+        }
+    });
+});
+
+
+//firefox的pre标签换行
+$(document).ready(function () {
+    var userAgent = navigator.userAgent.toLowerCase();
+    var browser = {
+        version: (userAgent.match(/.+(?:rv|it|ra|ie)[/: ]([d.]+)/) || [])[1],
+        safari: /webkit/.test(userAgent),
+        opera: /opera/.test(userAgent),
+        msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
+        mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
+    };
+    if (browser.mozilla || browser.opera){
+        $("pre").addClass("break_word_firefox");
+    }
+    else{
+        $("pre").addClass("break_word");
+    }
+});
+
+//点击发送资源弹出框中的组织，要更改选择栏目中的内容
+//@dom 选中的radio，值为org_id
+function change_org_subfield(url){
+    $.ajax({
+        type:'get',
+        url:url
+    })
+}
+
+//点击图片即显示大图
+function showNormalImage(id) {
+    var description_images=$('div#'+id).find("img");
+    if (description_images.length>0) {
+        for (var i=0; i<description_images.length; i++){
+            var image=$(description_images[i]);
+            var _path = getRootPath();
+            //如果图片是视频图片，不处理。
+            if($(image).hasClass("mediaIco")){
+                var _src = _path+"/"+$(image).attr('src');
+                $(image).attr('src',_src);
+                return;
+            }
+            var element=$("<a></a>").attr("href",image.attr('src'));
+            image.wrap(element);
+            $(image).parent().colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
+        }
+        //$('#'+id+' a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); //有图片才将链接变为弹出框
+    }
+
+}
+
+
+//文件、帖子、通知分享
+function org_id_click(){
+  var sendText = $("input[name='org_id']:checked").next().text();
+  var orgDirection = "目标地址：";
+  $(".orgDirection").text(orgDirection + sendText);
+}
+function subfield_click(){
+  var sendText = $("input[name='org_id']:checked").next().text();
+  var orgDirection = "目标地址：";
+  var sendColumn = $("input[name='subfield']:checked").next().text();
+  $(".orgDirection").text(orgDirection + sendText + " / " + sendColumn);
+}
+
+//send_type:发送的类型，file对应文件，message对应帖子，news对应通知或新闻
+function observeSearchfieldOnInput(fieldId, url,send_id,send_ids, send_type) {
+  $('#'+fieldId).each(function() {
+    var $this = $(this);
+    $this.addClass('autocomplete');
+    $this.attr('data-value-was', $this.val());
+    var check = function() {
+      var val = $this.val();
+      if ($this.attr('data-value-was') != val){
+        $this.attr('data-value-was', val);
+        $.ajax({
+          url: url,
+          type: 'get',
+          data: {search: $this.val(),send_id:send_id,send_ids:send_ids, send_type:send_type},
+          success: function(data){  },
+          beforeSend: function(){ $this.addClass('ajax-loading'); },
+          complete: function(){ $this.removeClass('ajax-loading'); }
+        });
+      }
+    };
+    var reset = function() {
+      if (timer) {
+        clearInterval(timer);
+        timer = setInterval(check, 300);
+      }
+    };
+    var timer = setInterval(check, 300);
+    $this.bind('keyup click mousemove', reset);
+  });
+}
+function check_des(event){
+  if($(".sectionContent").find('input[type="radio"]:checked').length <= 0){
+    event.preventDefault();
+    $(".orgDirection").text('目标地址组织不能为空');
+    return false;
+  }else if($(".columnContent").find('input[type="radio"]:checked').length <= 0){
+    event.preventDefault();
+    $(".orgDirection").text('目标地址栏目不能为空');
+    return false;
+  }else{
+    return true;
+  }
+}
+
+var sendType = '1';
+var lastSendType ;//初始为发送到我的课程
+function show_send(id, user_id, send_type){
+  if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+    $.ajax({
+      type: 'get',
+      url: '/users/' + user_id + '/search_user_project',
+      data:{send_id:id, send_type:send_type}
+    });
+  }else if(lastSendType == '1'){
+    $.ajax({
+      type: 'get',
+      url: '/users/' + user_id + '/search_user_course',
+      data:{send_id:id, send_type:send_type}
+    });
+  }else if( lastSendType == '3'){//组织
+    $.ajax({
+      type: 'get',
+      url: '/users/' + user_id + '/search_user_org',
+      data:{send_id:id, send_type:send_type}
+    });
+  }else{
+    $.ajax({
+      type: 'get',
+      url: '/users/' + user_id + '/search_user_course',
+      data:{send_id:id, send_type:send_type}
+    });
+  }
+}
+
+//id 发送的id
+//发送的id数组
+//send_type:发送的类型，file对应文件，message对应帖子，news对应通知或新闻
+function chooseSendType(res_id,res_ids, user_id, send_type){
+
+  sendType = $(".resourcesSendType").val();
+  if (sendType === lastSendType) {
+    return;
+  } else if(lastSendType != null) { //不是第一次点击的时候
+    if (sendType == '1') {
+      $.ajax({
+        type: 'get',
+        url: '/users/' + user_id + '/search_user_course',
+        data:{send_id:res_id, send_type:send_type}
+      });
+    } else if(sendType == '2') {
+      $.ajax({
+        type: 'get',
+        url: '/users/' + user_id + '/search_user_project',
+        data:{send_id:res_id, send_type:send_type}
+      });
+    }else if(sendType == '3'){
+      $.ajax({
+        type: 'get',
+        url: '/users/' + user_id + '/search_user_org',
+        data:{send_id:res_id, send_type:send_type}
+      });
+    }
+  }
+  lastSendType = sendType;
+}
+
+//组织新建和配置中，选择组织为私有后，disbled掉允许游客下载选项
+function disable_down(source, des, hint){
+  if (source.attr("checked")){
+    des.attr("disabled", false);
+    hint.html("");
+  }
+  else{
+    des.attr("checked", false);
+    des.attr("disabled", true);
+    hint.html("（私有组织不允许游客下载资源）");
+
+  }
+}
+
+function getRootPath(){
+    //获取当前网址，如： http://localhost:8083/uimcardprj/share/meun.jsp
+    var curWwwPath=window.document.location.href;
+    //获取主机地址之后的目录，如： uimcardprj/share/meun.jsp
+    var pathName=window.document.location.pathname;
+    var pos=curWwwPath.indexOf(pathName);
+    //获取主机地址，如： http://localhost:8083
+    var localhostPaht=curWwwPath.substring(0,pos);
+    //获取带"/"的项目名，如：/uimcardprj
+//    var projectName=pathName.substring(0,pathName.substr(1).indexOf('/')+1);
+    var projectName="";
+    return(localhostPaht+projectName);
+}
+//自动保存草稿
+var editor2;
+function elocalStorage(editor,mdu){
+    if (window.sessionStorage){
+        editor2 = editor;
+        var oc = window.sessionStorage.getItem('content'+mdu);
+        if(oc !== null ){
+            var h = '您上次有已保存的数据，是否<a onclick="rec_data(\'content\',\''+ mdu + '\')">恢复</a> ? / <a onclick="clear_data(\'content\',\''+ mdu + '\')">不恢复</a>';
+            $('#e_tips').html(h);
+        }
+        setInterval(function() {
+            d = new Date();
+            var h = d.getHours();
+            var m = d.getMinutes();
+            var s = d.getSeconds();
+            h = h < 10 ? '0' + h : h;
+            m = m < 10 ? '0' + m : m;
+            s = s < 10 ? '0' + s : s;
+            if(!editor.isEmpty()){
+                add_data("content",mdu,editor.html());
+                $('#e_tip').html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
+                $('#e_tips').html("");
+            }
+        },10000);
+
+    }else{
+        $('.ke-edit').after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
+    }
+}
+function add_data(k,mdu,d){
+    window.sessionStorage.setItem(k+mdu,d);
+}
+function rec_data(k,mdu){
+    if(window.sessionStorage.getItem(k+mdu) !== null){
+        editor2.html(window.sessionStorage.getItem(k+mdu));
+        clear_data(k,mdu);
+    }
+}
+function clear_data(k,mdu){
+    window.sessionStorage.removeItem(k+mdu);
+    if(k == 'content'){
+        $("#e_tips").html("");
+    }else{
+        $("#e_tip").html("");
+    }
+}
diff --git a/public/javascripts/des_kindEditor.js b/public/javascripts/des_kindEditor.js
index f8aff0be7..3a05c909d 100644
--- a/public/javascripts/des_kindEditor.js
+++ b/public/javascripts/des_kindEditor.js
@@ -1,3 +1,4 @@
+var editor2;
 function init_des_editor(params){
     // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
@@ -32,7 +33,7 @@ function init_des_editor(params){
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
             this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight), paramsHeight));
-
+            elocalStorage(editor2,'org_document');
         }
     }).loadPlugin('paste');
     return editor;
@@ -123,6 +124,7 @@ function init_des_data(){
             params.width = width;
             if (params.textarea.data('init') == undefined) {
                 params.editor = init_des_editor(params);
+                editor2 = params.editor;
                 init_form(params);
                 params.cancel_btn.click(function () {
                     nh_reset_form(params);
diff --git a/public/javascripts/organization.js b/public/javascripts/organization.js
index e04a8b282..bb7d6c5bb 100644
--- a/public/javascripts/organization.js
+++ b/public/javascripts/organization.js
@@ -37,3 +37,120 @@ function regexTopicSubject() {
 function reset_topic(){
 
 }
+(function(){
+    //提交匿评参数设置
+    function submit_set_evaluation_attr(end_time){
+        if(!regex_evaluation_start(end_time)){
+            $("#evaluation_start_time").focus();
+        }
+        else if(!regex_evaluation_end()){
+            $("#evaluation_end_time").focus();
+        }
+        else if(!regex_evaluation_num()){
+            $("#evaluation_num").focus();
+        }
+        else{
+            $('#popbox02 form').submit();
+            hideModal();
+        }
+    }
+
+    //验证匿评开启时间：大于截止时间,或者为空
+    function regex_evaluation_start(end_time){
+        var evaluation_start = $.trim($("#evaluation_start_time").val());
+        if(evaluation_start == ""){
+            $("#homework_evaluation_start_time").text("开启匿评日期不能为空");
+            return false;
+        }
+        var end_time = new Date(end_time);
+        var evaluation_start_time = new Date(evaluation_start);
+        if(evaluation_start_time > end_time){
+            $("#homework_evaluation_start_time").text("");
+            return true;
+        }else{
+            $("#homework_evaluation_start_time").text("开启匿评日期必须大于截止日期");
+            return false;
+        }
+    }
+
+    //验证匿评结束时间：大于匿评开启时间,或者为空。当匿评开启时间为空时，匿评结束时间必须为空
+    function regex_evaluation_end(){
+        var evaluation_start = $.trim($("#evaluation_start_time").val());
+        var evaluation_end = $.trim($("#evaluation_end_time").val());
+        if(evaluation_end == ""){
+            $("#homework_evaluation_end_time").text("关闭匿评日期不能为空");
+            return true;
+        }
+        var evaluation_start_time = new Date(evaluation_start);
+        var evaluation_end_time = new Date(evaluation_end);
+        if(evaluation_end_time >= evaluation_start_time){
+            $("#homework_evaluation_end_time").text("");
+            return true;
+        }else{
+            $("#homework_evaluation_end_time").text("关闭匿评日期不能小于开启匿评日期");
+            return false;
+        }
+    }
+
+    //验证匿评数量
+    function regex_evaluation_num(){
+        var evaluation_num = $.trim($("#evaluation_num").val());
+        var regex = /^\d+$/;
+        if(evaluation_num==""){
+            $("#evaluation_num_notice").text("匿评人数不能为空");
+            return false;
+        }
+        else if(regex.test(evaluation_num)){
+            if(evaluation_num > 0){
+                $("#evaluation_num_notice").html("");
+                return true;
+            }
+            else{
+                $("#evaluation_num_notice").text("匿评人数必须为大于0");
+                return false;
+            }
+        }
+        else{
+            $("#evaluation_num_notice").text("匿评人数只能为数字");
+            return false;
+        }
+    }
+
+    window.submit_set_evaluation_attr=submit_set_evaluation_attr;
+})();
+
+
+//处理迟交、缺评扣分
+function check_late_penalty(id)
+{
+    var obj = $("#" + id);
+    var regex = /^\d+$/;
+    if(regex.test(obj.val()))
+    {
+        if(obj.val() > 50)
+        {
+            obj.val("50");
+        }
+    }
+    else
+    {
+        obj.val("0");
+    }
+}
+
+//匿评弹框确定按钮
+function clickOK(path)
+{
+    clickCanel();
+    $.ajax({
+        type: "GET",
+        url: path,
+        data: 'text',
+        success: function (data) {
+        }
+    });
+}
+
+//匿评弹框取消按钮
+function clickCanel(){hideModal("#popbox02");}
+
diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index bd303a35f..c36925040 100644
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -1,109 +1,109 @@
-/* CSS Document */
-/* 2015-06-26 */
-.navContainer h1,h2,h3,h4,h5,h6,hr,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
-.navContainer body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5;}
-div,img,tr,td,table{ border:0;}
-table,tr,td{border:0;cellspacing:0; cellpadding:0;}
-ol,ul,li{ list-style-type:none}
-a:link,a:visited{text-decoration:none;}
-/*a:hover,a:active{color:#000;}*/
-/*常用*/
-/*#RSide{ background:#fff;}*/
-/*上传图片处理*/
-.navSearchTypeBox{margin-top: 32px;}
-#navHomepageSearch{margin-top: 11px;background-color: white;}
-.upload_img img{max-width: 100%;}
-blockquote img{max-width: 100%;}
-.hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.none{display: none;}
-.rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}
-.break_word{ word-break:break-all; word-wrap: break-word;}
-select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }
-.sub_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #707070; color:#000;  border-radius:3px; padding:1px 10px;  background:#dbdbdb;}
-.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;}
-/*table{ background:#fff;}*/
-.more{ font-weight:normal; color:#999; font-size:12px;}
-.no_line{ border-bottom:none;}
-.line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
-.no_border{ border:none;background:none;}
-.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
-.db {display:block;}
-/* font & color */
-.f12{font-size:12px; font-weight:normal;}
-.f14{font-size:14px;}
-.f16{font-size:16px;}
-.f18{font-size:18px;}
-.fb{font-weight:bold;}
-
-/* Float & Clear */
-.cl{ clear:both; overflow:hidden; }
-.fl{float:left;display:inline;}
-.fr{float:right;display:inline;}
-.f_l{ float:left;}
-.f_r{ float:right;}
-.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
-.clearfix{clear:both;zoom:1}
-.break_word{ word-break:break-all; word-wrap: break-word;}
-.white_space{white-space:nowrap;}
-a.c_white{ color:#fff !important;}
-input.c_white { color:#fff !important;}
-
-/* Spacing */
-.ml2{ margin-left:2px;}
-.ml3{ margin-left:3px;}
-.ml4{ margin-left:4px;}
-.ml5{ margin-left:5px;}
-.ml8{ margin-left:8px;}
-.ml10{ margin-left:10px;}
-.ml15{ margin-left:15px;}
-.ml20{ margin-left:20px;}
-.ml40{ margin-left:40px;}
-.ml45{ margin-left:45px;}
-.ml55{ margin-left:55px;}
-.ml30{ margin-left:30px;}
-.ml60{ margin-left:60px;}
-.ml80{ margin-left:80px;}
-.ml90{ margin-left:90px;}
-.ml100{ margin-left:100px;}
-.ml110{ margin-left:110px;}
-.ml150 { margin-left:150px;}
-.mr5{ margin-right:5px;}
-.mr45 {margin-right:45px;}
-.mr55{ margin-right:55px;}
-.mr10{ margin-right:10px;}
-.mr15 {margin-right:15px;}
-.mr20{ margin-right:20px;}
-.mr30{ margin-right:30px;}
-.mr40{ margin-right:40px;}
-.mw20{ margin: 0 20px;}
-.mt3{ margin-top:3px;}
-.mt5{ margin-top:5px;}
-.mt8{ margin-top:8px;}
-.mt10{ margin-top:10px !important;}
-.mt15 {margin-top:15px;}
-.mb4{ margin-bottom:4px;}
-.mb5{ margin-bottom:5px;}
-.mb8 {margin-bottom:8px;}
-.mb10{ margin-bottom:10px !important;}
-.mb20{ margin-bottom:20px;}
-.pl15{ padding-left:15px;}
-.w20{ width:20px;}
-.w60{ width:60px;}
-.w70{ width:70px;}
-.w90{ width:90px;}
-.w210{ width:210px;}
-.w150{ width:150px;}
-.w280{ width:280px;}
-.w430{ width:470px;}
-.w520{ width:520px;}
-.w543{ width:543px;}
-.w557{ width:557px;}
-.w583{ width:583px;}
-.w350{ width:350px;}
-.w610{ width:610px;}
-.w600{ width:600px;}
-.h22{ height:22px;}
-.h26{ height:26px;}
-.h50{ height:50px;}
-.h70{ height:70px;}
+/* CSS Document */
+/* 2015-06-26 */
+.navContainer h1,h2,h3,h4,h5,h6,hr,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+.navContainer body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5;}
+div,img,tr,td,table{ border:0;}
+table,tr,td{border:0;cellspacing:0; cellpadding:0;}
+ol,ul,li{ list-style-type:none}
+a:link,a:visited{text-decoration:none;}
+/*a:hover,a:active{color:#000;}*/
+/*常用*/
+/*#RSide{ background:#fff;}*/
+/*上传图片处理*/
+.navSearchTypeBox{margin-top: 32px;}
+#navHomepageSearch{margin-top: 11px;background-color: white;}
+.upload_img img{max-width: 100%;}
+blockquote img{max-width: 100%;}
+.hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.none{display: none;}
+.rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}
+.break_word{ word-break:break-all; word-wrap: break-word;}
+select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }
+.sub_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #707070; color:#000;  border-radius:3px; padding:1px 10px;  background:#dbdbdb;}
+.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;}
+/*table{ background:#fff;}*/
+.more{ font-weight:normal; color:#999; font-size:12px;}
+.no_line{ border-bottom:none;}
+.line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
+.no_border{ border:none;background:none;}
+.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
+.db {display:block;}
+/* font & color */
+.f12{font-size:12px; font-weight:normal;}
+.f14{font-size:14px;}
+.f16{font-size:16px;}
+.f18{font-size:18px;}
+.fb{font-weight:bold;}
+
+/* Float & Clear */
+.cl{ clear:both; overflow:hidden; }
+.fl{float:left;display:inline;}
+.fr{float:right;display:inline;}
+.f_l{ float:left;}
+.f_r{ float:right;}
+.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
+.clearfix{clear:both;zoom:1}
+.break_word{ word-break:break-all; word-wrap: break-word;}
+.white_space{white-space:nowrap;}
+a.c_white{ color:#fff !important;}
+input.c_white { color:#fff !important;}
+
+/* Spacing */
+.ml2{ margin-left:2px;}
+.ml3{ margin-left:3px;}
+.ml4{ margin-left:4px;}
+.ml5{ margin-left:5px;}
+.ml8{ margin-left:8px;}
+.ml10{ margin-left:10px;}
+.ml15{ margin-left:15px;}
+.ml20{ margin-left:20px;}
+.ml40{ margin-left:40px;}
+.ml45{ margin-left:45px;}
+.ml55{ margin-left:55px;}
+.ml30{ margin-left:30px;}
+.ml60{ margin-left:60px;}
+.ml80{ margin-left:80px;}
+.ml90{ margin-left:90px;}
+.ml100{ margin-left:100px;}
+.ml110{ margin-left:110px;}
+.ml150 { margin-left:150px;}
+.mr5{ margin-right:5px;}
+.mr45 {margin-right:45px;}
+.mr55{ margin-right:55px;}
+.mr10{ margin-right:10px;}
+.mr15 {margin-right:15px;}
+.mr20{ margin-right:20px;}
+.mr30{ margin-right:30px;}
+.mr40{ margin-right:40px;}
+.mw20{ margin: 0 20px;}
+.mt3{ margin-top:3px;}
+.mt5{ margin-top:5px;}
+.mt8{ margin-top:8px;}
+.mt10{ margin-top:10px !important;}
+.mt15 {margin-top:15px;}
+.mb4{ margin-bottom:4px;}
+.mb5{ margin-bottom:5px;}
+.mb8 {margin-bottom:8px;}
+.mb10{ margin-bottom:10px !important;}
+.mb20{ margin-bottom:20px;}
+.pl15{ padding-left:15px;}
+.w20{ width:20px;}
+.w60{ width:60px;}
+.w70{ width:70px;}
+.w90{ width:90px;}
+.w210{ width:210px;}
+.w150{ width:150px;}
+.w280{ width:280px;}
+.w430{ width:470px;}
+.w520{ width:520px;}
+.w543{ width:543px;}
+.w557{ width:557px;}
+.w683{ width:683px;}
+.w350{ width:350px;}
+.w610{ width:610px;}
+.w600{ width:600px;}
+.h22{ height:22px;}
+.h26{ height:26px;}
+.h50{ height:50px;}
+.h70{ height:70px;}
 .h150{ height:150px;}
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 108f1cd2e..7dd3fd74f 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1205,7 +1205,6 @@ a:hover.memberBtn{background: url(/images/course/hwork_icon.png) -80px -90px no-
 .addMemberC li:hover {cursor:pointer; background-color:#cccccc;}
 .addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .rightArrow {margin:50px 15px 0px 15px; float:left;}
-.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
 .maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
 .resubAtt {border-top:1px solid #dddddd; position:relative; margin-top:15px;}
 .resubTitle {position:absolute; top:-10px; left:5px; background-color:#ffffff; display:block; font-weight:bold; padding:0px 2px;}
@@ -1267,7 +1266,7 @@ div.disable_link {background-color: #c1c1c1 !important;}
 /*导入题库样式*/
 .popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
 .subjectList {width:585px;}
-.subjectDetail {width:385px;}
+.subjectDetail {width:285px;}
 a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
 a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
@@ -1278,7 +1277,7 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectRow {width:585px; height:40px; color:#7a7a7a; font-size:12px;}
 .subjectRow li {height:40px; line-height:40px; vertical-align:middle;}
 .subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
-.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectInfo {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
 .subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
 .subjectIntro {color:#585858; line-height:18px; font-size:12px;}
 .subjectContent {color:#888888; line-height:18px; font-size:12px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4669d043e..4275c4335 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -135,7 +135,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .w520{ width:520px;}
 .w543{ width:543px;}
 .w557{ width:557px;}
-.w583{ width:583px;}
+.w683{ width:683px;}
 .w350{ width:350px;}
 .w610{ width:610px;}
 .w600{ width:600px;}
@@ -845,7 +845,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 23px !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;display: inline}
@@ -1440,50 +1440,50 @@ span.at a{color:#269ac9;text-decoration: none;}
 
 /*导入题库样式*/
 .popup-wrapper {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
-.subject-list {width:585px;}
-.subject-detail {width:385px;}
+.subject-list {width:685px;}
+.subject-detail {width:285px;}
 a.subject-choose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
 a.choose-active {background-color:#269ac9; color:#ffffff;}
-.subject-pop-banner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subject-pop-banner {width:685px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
 .subject-pop-banner li {height:40px; line-height:40px; vertical-align:middle;}
-.subject-pop-name {width:200px; padding-left:10px; padding-right:10px;}
+.subject-pop-name {width:260px; padding-left:10px; padding-right:10px;}
 .subject-pop-publisher {width:80px; text-align:center;}
 .subject-pop-date {width:75px; text-align:center;}
-.subject-pop-row {width:585px; height:30px; color:#7a7a7a; font-size:12px;}
+.subject-pop-row {width:685px; height:30px; color:#7a7a7a; font-size:12px;}
 .subject-pop-row li {height:30px; line-height:30px; vertical-align:middle;}
 .subject-pop-search {border:1px solid #dddddd; height:32px; width:250px;}
-.subject-pop-info {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
-.subject-pop-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:475px; overflow-y:auto;}
+.subject-pop-info {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subject-pop-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:265px; height:475px; overflow-y:auto;}
 .subject-pop-intro {color:#585858; line-height:18px; font-size:12px;}
 .subject-pop-content {color:#888888; line-height:18px; font-size:12px;}
 .popup-close {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
 .subject-pop-type {width:50px; text-align:center;}
 .subject-pop-count {width:60px; text-align:center;}
-.subject-pop-from {width:100px; text-align:center;}
+.subject-pop-from {width:140px; text-align:center;}
 .subjectContent p,.subjectContent div,.subjectContent em, .subjectContent span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important; color:#888888 !important; font-size:12px !important;}
 
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 
 /*20160301新题库样式*/
-.subject-list-banner {width:585px; height:34px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
-.subject-list-banner li {height:34px; line-height:34px; vertical-align:middle;}
-.subject-list-name {width:200px; padding-left:10px; padding-right:10px;}
+.subject-list-banner {width:685px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subject-list-banner li {height:40px; line-height:40px; vertical-align:middle;}
+.subject-list-name {width:260px; padding-left:10px; padding-right:10px;}
 .subject-list-publisher {width:80px; text-align:center;}
 .subject-list-date {width:70px; text-align:center;}
-.subject-list-row {width:585px; height:30px; color:#7a7a7a; font-size:12px;}
-.subject-list-row li {height:30px; line-height:30px; vertical-align:middle;}
+.subject-list-row {width:685px; height:40px; color:#7a7a7a; font-size:12px;}
+.subject-list-row li {height:40px; line-height:40px; vertical-align:middle;}
 .subject-list-search {border:1px solid #dddddd; height:32px; width:250px;}
 .subject-list-info {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
 .subject-list-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
-.subject-content-wrapper {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:430px; overflow-y:auto;}
+.subject-content-wrapper {border:1px solid #dddddd; border-top:none; padding:10px; width:265px; height:430px; overflow-y:auto;}
 .subject-list-type {width:50px; text-align:center;}
 .subject-list-count {width:60px; text-align:center;}
-.subject-list-from {width:105px; text-align:center;}
+.subject-list-from {width:145px; text-align:center;}
 
 /*视频播放默认图标*/
 .mediaIco{margin: 30px 0 30px 20px;}
 a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;}
 a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;}
 a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding:1px;}
-a:hover.st_img { border:1px solid #1c9ec7; }
\ No newline at end of file
+a:hover.st_img { border:1px solid #1c9ec7; }
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index eaabcafa6..f2a3dd3c9 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -22,6 +22,7 @@ a.saveBtn:hover {background-color:#297fb8;}
 .orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
 .orgListUser {width:85px; float:left;}
 .orgListRole {width:180px; float:left;}
+.orgOrder {width:30px; float:left;margin-right:10px;text-align:center;}
 .orgMemContainer {width:228px;}
 .orgMemberAdd {float:right;}
 .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
@@ -121,7 +122,7 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 /*导入题库样式*/
 .popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
 .subjectList {width:585px;}
-.subjectDetail {width:385px;}
+.subjectDetail {width:285px;}
 a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
 a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
@@ -132,7 +133,7 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectRow {width:585px; height:40px; color:#7a7a7a; font-size:12px;}
 .subjectRow li {height:40px; line-height:40px; vertical-align:middle;}
 .subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
-.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectInfo {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
 .subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
 .subjectIntro {color:#585858; line-height:18px; font-size:12px;}
 .subjectContent {color:#888888; line-height:18px; font-size:12px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index f30838a92..f711c25e2 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1182,7 +1182,7 @@ div.disable_link {background-color: #c1c1c1 !important;}
 /*导入题库样式*/
 .popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
 .subjectList {width:585px;}
-.subjectDetail {width:385px;}
+.subjectDetail {width:285px;}
 a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
 a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
@@ -1193,7 +1193,7 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectRow {width:585px; height:40px; color:#7a7a7a; font-size:12px;}
 .subjectRow li {height:40px; line-height:40px; vertical-align:middle;}
 .subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
-.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectInfo {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
 .subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
 .subjectIntro {color:#585858; line-height:18px; font-size:12px;}
 .subjectContent {color:#888888; line-height:18px; font-size:12px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 6b9b4466b..0a3732ced 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -165,7 +165,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w543{ width:543px;}
 .w557{ width:557px;}
 .w576{ width:576px;}
-.w583{ width:583px;}
+.w683{ width:683px;}
 .w350{ width:350px;}
 .w610{ width:610px;}
 .w600{ width:600px !important;}
@@ -1034,26 +1034,26 @@ a:hover.userCancel{border:1px solid #888888; }
 
 /*导入题库样式*/
 .popup-wrapper {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
-.subject-list {width:585px;}
-.subject-detail {width:385px;}
+.subject-list {width:685px;}
+.subject-detail {width:285px;}
 a.subject-choose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
 a.choose-active {background-color:#269ac9; color:#ffffff;}
-.subject-pop-banner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subject-pop-banner {width:685px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
 .subject-pop-banner li {height:40px; line-height:40px; vertical-align:middle;}
-.subject-pop-name {width:200px; padding-left:10px; padding-right:10px;}
+.subject-pop-name {width:260px; padding-left:10px; padding-right:10px;}
 .subject-pop-publisher {width:80px; text-align:center;}
 .subject-pop-date {width:75px; text-align:center;}
-.subject-pop-row {width:585px; height:30px; color:#7a7a7a; font-size:12px;}
+.subject-pop-row {width:685px; height:30px; color:#7a7a7a; font-size:12px;}
 .subject-pop-row li {height:30px; line-height:30px; vertical-align:middle;}
 .subject-pop-search {border:1px solid #dddddd; height:32px; width:250px;}
-.subject-pop-info {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
-.subject-pop-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:475px; overflow-y:auto;}
+.subject-pop-info {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subject-pop-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:265px; height:475px; overflow-y:auto;}
 .subject-pop-intro {color:#585858; line-height:18px; font-size:12px;}
 .subject-pop-content {color:#888888; line-height:18px; font-size:12px;}
 .popup-close {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
 .subject-pop-type {width:50px; text-align:center;}
 .subject-pop-count {width:60px; text-align:center;}
-.subject-pop-from {width:100px; text-align:center;}
+.subject-pop-from {width:140px; text-align:center;}
 .subjectContent p,.subjectContent div,.subjectContent em, .subjectContent span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important; color:#888888 !important; font-size:12px !important;}
 
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
@@ -1086,7 +1086,7 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 /*导入资源样式*/
 .popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
 .resoure-list {width:705px;}
-.subjectDetail {width:385px;}
+.subjectDetail {width:285px;}
 .resource-pop-banner {width:705px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
 .resource-pop-banner li {height:40px; line-height:40px; vertical-align:middle;}
 .resource-pop-name {width:270px; padding-left:10px; padding-right:10px;}
@@ -1095,7 +1095,7 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 .resource-pop-row {width:705px; height:40px; color:#7a7a7a; font-size:12px;}
 .resource-pop-row li {height:40px; line-height:40px; vertical-align:middle;}
 .subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
-.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectInfo {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
 .subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
 .subjectIntro {color:#585858; line-height:18px; font-size:12px;}
 .subjectContent {color:#888888; line-height:18px; font-size:12px;}
@@ -1136,4 +1136,4 @@ a.program-btn{background: url(../images/homepage_icon.png) -86px -393px no-repea
 .mediaIco{margin: 30px 0 30px 20px;width: 200px;}
 /*排序样式*/
 a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;}
-a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;}
\ No newline at end of file
+a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index 99f28b257..b9f76ffbf 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -1,803 +1,803 @@
-/* CSS Document */
-/* 2015-06-26 */
-body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#eaebec;}
-div,img,tr,td,table{ border:0;}
-table,tr,td{border:0;cellspacing:0; cellpadding:0;}
-ol,ul,li{ list-style-type:none}
-a:link,a:visited{color:#7f7f7f;text-decoration:none;}
-a:hover,a:active{color:#15bccf;}
-/*img{max-width: 100%;}*/
-
-/*常用*/
-select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }
-.sub_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #707070; color:#000;  border-radius:3px; padding:1px 10px;  background:#dbdbdb;}
-.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;}
-table{ background:#fff;}
-.more{ font-weight:normal; color:#999; font-size:12px;}
-.no_line{ border-bottom:none;}
-.line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
-.no_border{ border:none;background:none;}
-.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
-.none{display: none;}
-
-/* font & color */
-h2{ font-size:18px; color:#15bccf;}
-h3{ font-size:14px; color:#e8770d;}
-h4{ font-size:14px; color:#3b3b3b;}
-.f12{font-size:12px; font-weight:normal;}
-.f14{font-size:14px;}
-.f16{font-size:16px;}
-.f18{font-size:18px;}
-.fb{font-weight:bold;}
-.lh20{line-height:20px;}
-.lh22{line-height:22px;}
-.lh24{line-height:24px;}
-.lh26{line-height:26px;}
-.fmYh{font-family:"MicroSoft Yahei";}
-.font999{ color:#999;}
-.fontRed{color:#770000;}
-.text_c{ text-align:center;}
-
-/* Float & Clear */
-.cl{ clear:both; overflow:hidden; }
-.fl{float:left;display:inline;}
-.fr{float:right;display:inline;}
-.f_l{ float:left;}
-.f_r{ float:right;}
-.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
-.clearfix{clear:both;zoom:1}
-.break_word{ word-break:break-all; word-wrap: break-word;}
-.white_space{white-space:nowrap;}
-
-/* Spacing */
-.ml2{ margin-left:2px;}
-.ml3{ margin-left:3px;}
-.ml4{ margin-left:4px;}
-.ml5{ margin-left:5px;}
-.ml8{ margin-left:8px;}
-.ml10{ margin-left:10px;}
-.ml15{ margin-left:15px;}
-.ml20{ margin-left:20px;}
-.ml40{ margin-left:40px;}
-.ml45{ margin-left:45px;}
-.ml55{ margin-left:55px;}
-.ml30{ margin-left:30px;}
-.ml60{ margin-left:60px;}
-.ml80{ margin-left:80px;}
-.ml90{ margin-left:90px;}
-.ml100{ margin-left:100px;}
-.ml110{ margin-left:110px;}
-.mr5{ margin-right:5px;}
-.mr10{ margin-right:10px;}
-.mr20{ margin-right:20px;}
-.mr30{ margin-right:30px;}
-.mr40{ margin-right:40px;}
-.mr45{margin-right: 45px;}
-.mw15{margin:0 15px;}
-.mw20{margin:0 20px;}
-.mt3{ margin-top:3px;}
-.mt5{ margin-top:5px;}
-.mt8{ margin-top:8px;}
-.mt10{ margin-top:10px;}
-.mb5{ margin-bottom:5px;}
-.mb10{ margin-bottom:10px;}
-.mb20{ margin-bottom:20px;}
-.pl15{ padding-left:15px;}
-.w20{ width:20px;}
-.w60{ width:60px;}
-.w70{ width:70px;}
-.w90{ width:90px;}
-.w210{ width:210px;}
-.w150{ width:150px;}
-.w280{ width:280px;}
-.w430{ width:470px;}
-.w520{ width:520px;}
-.w543{ width:543px;}
-.w557{ width:557px;}
-.w583{ width:583px;}
-.w350{ width:350px;}
-.w610{ width:610px;}
-.w600{ width:600px;}
-.h22{ height:22px;}
-.h26{ height:26px;}
-.h50{ height:50px;}
-.h70{ height:70px;}
-.h150{ height:150px;}
-
-/* Font & background Color */
-a.b_grey{ background: #F5F5F5;}
-a.b_dgrey{ background: #CCC;}
-a.c_orange{color:#ff5722;}
-a:hover.c_orange{color: #d33503;}
-a.c_lorange{color:#ff9900;}
-a:hover.c_lorange{color:#fff;}
-a.c_blue{ color:#269ac9;}
-a.c_dblue{ color:#09658c;}
-a:hover.c_dblue{ color:#15bccf;}
-a.c_white{ color:#fff;}
-a.c_dorange{ color:#fd6e2a;}
-a.c_dark{color: #3e4040;}
-a:hover.c_dark{color: #3ca5c6;}
-a.b_blue{background: #64bdd9;}
-a:hover.b_blue{background: #41a8c8;}
-a.b_green{background:#28be6c;}
-a:hover.b_green{background:#14ad5a;}
-a.c_blue02{color: #3ca5c6;}
-a:hover.c_blue02{color: #0781b4;}
-a.c_red{ color:#F00;}
-a:hover.c_red{ color: #C00;}
-a.c_purple{color: #426e9a;}
-a:hover.c_purple{color: #d33503;}
-a.c_green{ color:#28be6c;}
-
-.b_grey{ background: #F5F5F5;}
-.b_dgrey{ background: #CCC;}
-.c_orange{color:#e8770d;}
-.c_dark{ color:#2d2d2d;}
-.c_lorange{ color:#ff9900;}
-.c_purple{color: #6883b6;}
-.c_blue{ color:#15bccf;}
-.c_red{ color:#F00;}
-.c_green{ color:#28be6c;}
-.c_dblue{ color:#09658c;}
-.b_blue{background:#64bdd9;}
-.b_green{background:#28be6c;}
-.b_w{ background:#fff;}
-
-/* commonBtn */
-.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;}
-a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;}
-a:hover.grey_btn{ background:#717171; color:#fff;}
-.grey_n_btn{ background:#d9d9d9; color:#656565; font-weight:normal;padding:2px 10px; text-align:center;}
-a.grey_n_btn{background:#d9d9d9; color:#656565;font-weight:normal; padding:2px 10px; text-align:center;}
-a:hover.grey_n_btn{ background:#717171; color:#fff;}
-.green_btn{ background:#28be6c; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;}
-a.green_btn{background:#28be6c;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;}
-a:hover.green_btn{ background:#14ad5a;}
-.blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;}
-a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;}
-a:hover.blue_btn{ background:#329cbd;}
-a.orange_btn{  background:#ff5722;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center; }
-a:hover.orange_btn{ background:#d63502;}
-
-.green_u_btn{border:1px solid #3cb761; padding:2px 10px; color:#3cb761;}
-a.green_u_btn{border:1px solid #3cb761; padding:2px 10px; color:#3cb761;}
-a:hover.green_u_btn{ background:#3cb761; color:#fff;}
-.orange_u_btn{border:1px solid #ff5d31; padding:2px 10px; color:#ff5d31;}
-a.orange_u_btn{border:1px solid #ff5d31; padding:2px 10px; color:#ff5d31;}
-a:hover.orange_u_btn{background:#ff5d31; color:#fff;}
-.bgreen_u_btn{border:1px solid #1abc9c; padding:2px 10px; color:#1abc9c;}
-a.bgreen_u_btn{border:1px solid #1abc9c1; padding:2px 10px; color:#1abc9c;}
-a:hover.bgreen_u_btn{background:#1abc9c; color:#fff;}
-.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
-a.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
-a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
-.blue_n_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;}
-a.blue_n_btn{background:#64bdd9;color:#fff;font-weight:normal; padding:2px 10px; text-align:center;}
-a:hover.blue_n_btn{ background:#329cbd;}
-.green_n_btn{background:#3cb761; padding:2px 10px; color:#fff;}
-a.green_n_btn{background:#3cb761; padding:2px 10px; color:#fff;}
-a:hover.green_n_btn{ background:#14ad5a;}
-.orange_n_btn{background:#ff5d31; padding:2px 10px; color:#fff;}
-a.orange_n_btn{background:#ff5d31; padding:2px 10px; color:#fff;}
-a:hover.orange_n_btn{background:#d63502;}
-.bgreen_n_btn{background:#1abc9c; padding:2px 10px; color:#fff;}
-a.bgreen_n_btn{background:#1abc9c; padding:2px 10px; color:#fff;}
-a:hover.bgreen_n_btn{background:#08a384;}
-
-.nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
-.more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
-.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}
-.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
-.bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
-/* commonpic */
-.pic_date{ display:block; background:url(../images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; float:left;}
-.pic_add{ display:block; background:url(../images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; float:left;}
-.pic_sch{ display:block; background:url(../images/public_icon.png) -31px -195px no-repeat; width:16px; height:15px; float:left;}
-.pic_mes{ display:block; background:url(../images/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;}
-.pic_img{ display:block; background:url(../images/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; }
-.pic_del{ display:block; background:url(../images/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; }
-.pic_del:hover{  background:url(../images/public_icon.png) -32px -235px no-repeat; }
-.pic_stats{display:block; background:url(../images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
-.pic_files{display:block; background:url(../images/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;}
-.pic_text{display:block; background:url(../images/public_icon.png) 0px -609px no-repeat; width:20px; height:18px;}
-.pic_text02{display:block; background:url(../images/public_icon.png) 0px -642px no-repeat; width:20px; height:19px;}
-.pic_edit{display:block; background:url(../images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px;}
-.pic_edit:hover{display:block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
-
-
-
-
-
-/*框架主类容*/
-#Container{ width:1000px; margin:0 auto; }
-
-/*头部导航*/
-#Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; }
-.logo{ margin:5px 10px; }
-#TopNav{}
-#TopNav ul li{ margin-top:8px;}
-.topnav_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
-.topnav_a a:hover{color: #a1ebff;}
-#TopUser{}
-#TopUser ul li{ margin-top:8px;}
-.topuser_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
-.topuser_a  a:hover{color: #a1ebff;}
-#TopUser02{	}
-#TopUser02 li{	float: left;}
-#TopUser02 li a{ margin-right:10px;color: #FFF;text-align: center;}
-#TopUser02 li a:hover{color: #a1ebff;}
-#TopUser02 div{	position: absolute;visibility: hidden;background:#fff;border: 1px solid #15bccf;}
-#TopUser02 div a{position: relative;display: block;white-space: nowrap;text-align: left; line-height:1.9; margin-left:5px;background: #fff;color:#15bccf; font-weight:normal;}
-#TopUser02 div a:hover{	color:#e8770d; font-weight: bold;}
-/*头部导航下拉*/
-div#menu {height:41px; font-size:14px; font-weight:bold; }
-div#menu ul {float: left;}
-div#menu ul.menu { padding-left: 30px;  }
-div#menu li {position: relative; z-index: 9; margin: 0; display: block; float: left; }
-div#menu li:hover>ul { left: -2px;}
-div#menu a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; }
-div#menu a:hover, div#menu a:hover span { color: #a1ebff; }
-div#menu li.current a {}
-div#menu  {display: block; cursor: pointer; background-repeat: no-repeat;background-position: 95% 0;padding-right: 15px; _padding-right: 20px;}
-div#menu ul  a.parent  {background: url(../images/item.png) -20px -30px no-repeat;  width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-div#menu ul  a.parent:hover  {background: url(../images/item.png) -20px -60px no-repeat;}
-div#menu ul ul a.parent  {background: url(../images/item.png) -20px 6px no-repeat;}
-div#menu ul ul a.parent:hover  {background: url(../images/item.png) -20px -11px no-repeat;}
-/* menu::level1 */
-div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;}
-div#menu li { background: url(images/main-delimiter.png) 98% 4px no-repeat; }
-div#menu li.last { background: none; }
-/* menu::level2 */
-div#menu ul ul li { background: none; }
-div#menu ul ul { position: absolute;top: 38px; left: -999em; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #15bccf; margin-top:1px;}
-div#menu ul ul a {padding: 0 0 0 15px; height: auto; float: none;display: block; line-height: 24px; font-size:12px; font-weight:normal;color:#15bccf;}
-div#menu ul ul a:hover { color:#ff9900;}
-div#menu ul ul li.last { margin-left:15px; }
-div#menu ul ul li {width: 100%;}
-/* menu::level3 */
-div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:140px; }
-div#menu ul ul ul li a{ width:125px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;}
-
-/*主类容*/
-#Main{ background:#fff;  margin-bottom:10px;}
-#content{}
-#content02{ background:#fff; padding:10px; margin-bottom:10px;}
-/*主类容搜索*/
-#TopBar{ height:60px; margin-bottom:10px; background:#fff;}
-.topbar_info02{ margin:5px 10px;width:480px;  }
-.topbar_info02 p{color: #7f7f7f;}
-.search{ margin-top:8px; margin-left:71px;}
-.search_form{margin-top:8px;margin-left:72px;}
-.topbar_info{ width:350px; color:#5c5c5c; font-size:16px; margin-right:50px; line-height:1.3; padding-left:100px;}
-a.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:24px; text-align:center; padding-top:3px;}
-a:hover.search_btn{ background: #0fa9bb;}
-.search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
-/*主类容左右分栏*/
-#LSide{ width:240px;   }
-#RSide{ width:730px;  margin-left:10px;  background:#fff; padding:10px; margin-bottom:10px;}
-
-
-/*底部*/
-#Footer{  padding-top:10px; background:#fff; margin-bottom:10px;}
-.copyright{ width:780px; margin:0 auto;height:30px;  }
-.footlogo{ width:580px; margin:0 auto;height:50px;   }
-/*意见反馈*/
-html{ overflow-x:hidden;}
-.scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
-.side_content{width:154px; height:auto; overflow:hidden; float:left; }
-.side_content .side_list {width:154px;overflow:hidden;}
-.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:190px;cursor:pointer;}
-.show_btn span { display:none;}
-.close_btn{width:24px;height:24px;cursor:pointer;}
-.side_title,.side_bottom,.close_btn,.show_btn {background:url(../images/sidebar_bg.png) no-repeat; }
-.side_title {height:35px;}
-.side_bottom { height:8px;}
-.side_center {font-family:Verdana, Geneva, sans-serif; padding:0px 12px; font-size:12px;}
-.close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;}
-.close_btn span { display:none;}
-.side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
-.msgserver { margin-top:5px;}
-/*.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; }*/
-.msgserver a { height:21px; display:block; }
-.opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
-a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;}
-a:hover.opnionButton{background: #0fa9bb; }
-/* blue skin as the default skin */
-.side_title {background-position:-195px 0;}
-.side_center {background:url(../images/blue_line.png) repeat-y center; }
-.side_bottom {background-position:-195px -50px;}
-a.close_btn {background-position:-44px 0;}
-a:hover.close_btn {background-position:-66px 0;}
-.show_btn {background-position:-119px 0;}
-.msgserver a {color:#15bccf; }
-.msgserver a:hover { text-decoration:underline; }
-
-
-/***** Ajax indicator ******/
-#ajax-indicator {
-    position: absolute; /* fixed not supported by IE */
-    background-color:#eee;
-    border: 1px solid #bbb;
-    top:35%;
-    left:40%;
-    width:20%;
-    font-weight:bold;
-    text-align:center;
-    padding:0.6em;
-    z-index:100000;
-    opacity: 0.5;
-}
-
-html>body #ajax-indicator { position: fixed; }
-
-#ajax-indicator span {
-    background-position: 0% 40%;
-    background-repeat: no-repeat;
-    background-image: url(../images/loading.gif);
-    padding-left: 26px;
-    vertical-align: bottom;
-}
-
-div.modal {
-    border-radius: 5px;
-    background: #fff;
-    z-index: 50;
-    padding: 4px;
-}
-.ui-widget-content {
-    border: 1px solid #ddd;
-    color: #333;
-}
-.ui-widget {
-    font-family: Verdana, sans-serif;
-    font-size: 1.1em;
-}
-.ui-dialog .ui-dialog-content {
-    position: relative;
-    border: 0;
-    padding: .5em 1em;
-    background: none;
-    overflow: auto;
-    zoom: 1;
-}
-.ui-widget-overlay {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-}
-.ui-widget-overlay {
-    background: #666 url(http://forge.trustie.net/stylesheets/jquery/images/xui-bg_diagonals-thick_20_666666_40x40.png.pagespeed.ic.9mfuw_R0z1.png) 50% 50% repeat;
-    opacity: .5;
-    filter: Alpha(Opacity=50);
-}
-/***** end Ajax indicator ******/
-
-/***** Flash & error messages ****/
-#errorExplanation, div.flash, .nodata, .warning, .conflict {
-    padding: 4px 4px 4px 30px;
-    margin-bottom: 12px;
-    font-size: 1.1em;
-    border: 2px solid;
-}
-
-div.flash {margin-top: 8px;}
-
-div.flash.error, #errorExplanation {
-    background: url(../images/exclamation.png) 8px 50% no-repeat;
-    background-color: #ffe3e3;
-    border-color: #dd0000;
-    color: #880000;
-}
-
-div.flash.notice {
-    background: url(../images/true.png) 8px 5px no-repeat;
-    background-color: #dfffdf;
-    border-color: #9fcf9f;
-    color: #005f00;
-}
-
-div.flash.warning, .conflict {
-    background: url(../images/warning.png) 8px 5px no-repeat;
-    background-color: #FFEBC1;
-    border-color: #FDBF3B;
-    color: #A6750C;
-    text-align: left;
-}
-
-.nodata, .warning {
-    text-align: center;
-    background-color: #FFEBC1;
-    border-color: #FDBF3B;
-    color: #A6750C;
-}
-
-#errorExplanation ul { font-size: 0.9em;}
-#errorExplanation h2, #errorExplanation p { display: none; }
-
-.conflict-details {font-size:80%;}
-/***** end Flash & error messages ****/
-
-
-/*弹出框*/
-.black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);}
-.white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
-.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
-.newhwork_content{ display:none;position:fixed;top:15%;left:30%;width:600px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
-.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}
-a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
-a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
-
-div.ke-statusbar{height:1px; border-top:none;}
-
-/*底部*/
-/*#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}*/
-/*.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}*/
-/*.footerAbout{ width:585px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; }*/
-/*.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}*/
-/*.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}*/
-/*.copyright{ width:390px; margin:0 auto;height:20px;line-height:20px;}*/
-/*a.f_grey {color:#666666;}*/
-/*a.f_grey:hover {color:#000000;}*/
-/*资源库*/
-.resources {width:728px; background-color:#ffffff; padding:10px; border:1px solid #dddddd;float: right}
-/*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/
-.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
-.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
-.resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;}
-.resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
-.resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
-.resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
-/*.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}*/
-/*.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/
-/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
-a.resourcesGrey {font-size:12px; color:#888888;}
-a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
-.resourcesBanner ul li:hover ul.resourcesType {display:block;}
-.resourcesSelected:hover ul {display:block;}
-.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
-.resourcesUploadBox:hover {background-color:#0781b4;}
-.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
-a.uploadText {color:#ffffff; font-size:14px;}
-.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
-.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
-.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
-/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
-.resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
-/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
-.resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
-/*.resourcesListName {width:175px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
-.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;}
-.resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
-.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;}
-.resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
-/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
-a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}
-a.resourcesBlack:hover {font-size:12px; color:#000000;}
-.resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
-.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
-.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
-.resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
-.resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
-.resourcesSelectSend {float:right;}
-/*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/
-.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}
-a.sendButtonBlue {color:#15bccf;}
-a.sendButtonBlue:hover {color:#ffffff;}
-.resourcesSelectSendButton:hover {background-color:#15bccf;}
-.db {display:block !important;}
-
-.dropdown-menu {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    z-index: 1000;
-    display: none;
-    float: left;
-    min-width: 80px;
-    padding: 5px 0;
-    margin: 2px 0 0;
-    font-size: 12px;
-    text-align: left;
-    background-color: #fff;
-    -webkit-background-clip: padding-box;
-    background-clip: padding-box;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-    box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-}
-.dropdown-menu > li > a {
-    display: block;
-    padding: 3px 20px;
-    clear: both;
-    font-weight: normal;
-    line-height: 1.5;
-    color:#616060;
-    white-space: nowrap;
-}
-.dropdown-menu > li > a:hover{
-    color: #ffffff;
-    text-decoration: none;
-    background-color: #64bdd9;
-    outline:none;
-}
-.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
-.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
-a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
-.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
-.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
-.resourcesUploadBox:hover {background-color:#0781b4;}
-/* 个人主页右边部分*/
-.homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;}
-a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
-a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}
-a.replyGrey {color:#888888; display:inline-block;}
-a.replyGrey:hover {color:#4b4b4b;}
-
-/*上传资源弹窗*/
-.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
-.uploadDialogText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
-.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative}
-.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}
-a.uploadBoxIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;}
-a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}
-.chooseFile {color:#ffffff; display:block; margin-left:32px;}
-.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}
-.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}
-.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}
-.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}
-.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
-
-/*发送资源弹窗*/
-/*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
-/*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
-.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
-.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:100px; display:inline-block;}
-.resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
-.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}
-.resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
-.searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
-.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}
-.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}
-.courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
-.sendCourseName {font-size:12px; color:#5f6060;display:inline-block}
-.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}
-.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
-a.sendSourceText {font-size:14px; color:#ffffff;}
-input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;}
-.resourcesSendTo {float:left; height:20px; margin-top:15px;}
-.resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
-
-
-
-/*主类容左右分栏*/
-#LSide{ width:240px;   }
-#RSide{ width:730px;  margin-left:10px;  background:#fff; padding:10px; margin-bottom:10px;}
-
-
-/*资源库*/
-/*.resources {width:730px; background-color:#ffffff;}*/
-/*.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}*/
-/*.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}*/
-/*.resourcesSelect {width:40px; height:40px; float:right; position:relative;}*/
-.resourcesSelected2 {width:25px; height:20px;}
-.resourcesIcon2 {margin-top:20px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}
-.resourcesIcon2:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
-/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
-/*a.resourcesGrey {font-size:12px; color:#888888;}*/
-/*a.resourcesGrey:hover {font-size:12px; color:#15bccf;}*/
-/*.resourcesBanner ul li:hover ul.resourcesType {display:block;}*/
-/*ul li:hover ul {display:block;}*/
-/*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
-/*.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}*/
-/*a.uploadText {color:#ffffff; font-size:14px;}*/
-/*.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;}*/
-/*.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}*/
-/*.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}*/
-/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
-/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
-/*.resourcesListCheckbox {width:40px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}*/
-/*.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}*/
-/*.resourcesListName {width:135px; height:40px; line-height:40px; text-align:left;}*/
-/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
-/*a.resourcesBlack {font-size:12px; color:#4c4c4c;}*/
-/*a.resourcesBlack:hover {font-size:12px; color:#000000;}*/
-/*.dropdown-menu {*/
-    /*position: absolute;*/
-    /*top: 100%;*/
-    /*left: 0;*/
-    /*z-index: 1000;*/
-    /*display: none;*/
-    /*float: left;*/
-    /*min-width: 80px;*/
-    /*padding: 5px 0;*/
-    /*margin: 2px 0 0;*/
-    /*font-size: 12px;*/
-    /*text-align: left;*/
-    /*background-color: #fff;*/
-    /*-webkit-background-clip: padding-box;*/
-    /*background-clip: padding-box;*/
-    /*border: 1px solid #ccc;*/
-    /*border-radius: 4px;*/
-    /*-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
-    /*box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
-/*}*/
-/*.dropdown-menu > li > a {*/
-    /*display: block;*/
-    /*padding: 3px 20px;*/
-    /*clear: both;*/
-    /*font-weight: normal;*/
-    /*line-height: 1.5;*/
-    /*color:#616060;*/
-    /*white-space: nowrap;*/
-/*}*/
-/*.dropdown-menu > li > a:hover{*/
-    /*color: #ffffff;*/
-    /*text-decoration: none;*/
-    /*background-color: #64bdd9;*/
-    /*outline:none;*/
-/*}*/
-
-/*发送资源弹窗*/
-/*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
-/*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
-/*.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
-/*.resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}*/
-/*.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}*/
-/*.resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}*/
-/*.searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}*/
-/*.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}*/
-/*.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}*/
-/*.courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}*/
-/*.sendCourseName {font-size:12px; color:#5f6060;}*/
-/*.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}*/
-/*.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}*/
-/*a.sendSourceText {font-size:14px; color:#ffffff;}*/
-
-/*上传资源弹窗*/
-/*.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}*/
-/*.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
-/*.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}*/
-/*.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}*/
-/*a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}*/
-/*.chooseFile {color:#ffffff; display:block; margin-left:32px;}*/
-/*.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}*/
-/*.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}*/
-/*.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}*/
-/*.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}*/
-/*.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}*/
-
-
-/*新个人主页框架css*/
-.navContainer {width:100%; margin:0 auto; background-color:#15bccf;}
-.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
-.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;}
-.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:40px;}
-.navHomepageMenu {margin-right:40px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
-.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}
-.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
-a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
-.navHomepageNews {width:30px; display:block; float:right; margin-top:12px; position:relative;}
-.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:29px; display:block;}
-.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
-.navHomepageProfile {width:65px; display:block; float:right; margin-top:8px; margin-left:33px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) -8px -175px no-repeat; width:20px; height:25px; float:left; margin-top:15px; line-height:0;}
-a.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) -8px -175px no-repeat; width:12px; height:12px; float:left;}
-.homepageLeft {width:240px; float:left; margin-right:10px;}
-.homepageRight {width:750px; float:left;}
-.homepagePortraitContainer {width:238px; height:348px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px;}
-.homepagePortraitImage {width:208px; height:208px; margin:15px 16px 14px 16px;}
-.homepageFollow {}
-.homepageEditProfile {}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px; display:inline-block; margin-right:8px;}
-.homepageImageSex {float:left; top:116px; left:5px; width:14px; height:14px; display:inline-block;}
-.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:5px; margin-bottom:15px;}
-.homepageImageBlock {margin:0 26px; float:left; text-align:center; display:inline-block;}
-.homepageImageNumber {font-size:12px; color:#484848;}
-.homepageImageText {width:26px; font-size:12px; color:#888888;}
-.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
-.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
-.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
-a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
-.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
-.homepageRightBanner {}
-.newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2;}
-.homepageRightBlock {}
-.homepageNewsList {width:710px; height:39px; line-height:39px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin:0 auto;}
-.homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
-.homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
-.homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;}
-.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; overflow: hidden;height:49px; max-height:49px;}
-.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
-a.homepageWhite {color:#ffffff;}
-a.homepageWhite:hover {color:#a1ebff}
-a.newsGrey {color:#4b4b4b;}
-a.newsGrey:hover {color:#000000;}
-a.newsRed {color:red;}
-a.newsRed:hovor {color:#888888;}
-a.replyGrey {color:#888888; display:inline-block;}
-a.replyGrey:hover {color:#4b4b4b;}
-a.replyGrey1 {color:#888888;}
-a.replyGrey1:hover {color:#4b4b4b;}
-a.newsBlue {color:#269ac9;}
-a.newsBlue:hover {color:#297fb8;}
-a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
-a.menuGrey {color:#808080;}
-a.menuGrey:hover {color:#fe7d68;}
-a.resourcesGrey {font-size:12px; color:#888888;}
-a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
-.portraitRadius {border-radius: 3px;}
-
-/***** Flash & error messages ****/
-#errorExplanation, div.flash, .nodata, .warning, .conflict {
-    padding: 4px 4px 4px 30px;
-    margin-bottom: 12px;
-    font-size: 1.1em;
-    border: 2px solid;
-}
-
-div.flash {margin-top: 8px;}
-
-div.flash.error, #errorExplanation {
-    background: url(../images/exclamation.png) 8px 50% no-repeat;
-    background-color: #ffe3e3;
-    border-color: #dd0000;
-    color: #880000;
-}
-
-div.flash.notice {
-    background: url(../images/true.png) 8px 5px no-repeat;
-    background-color: #dfffdf;
-    border-color: #9fcf9f;
-    color: #005f00;
-}
-
-div.flash.warning, .conflict {
-    background: url(../images/warning.png) 8px 5px no-repeat;
-    background-color: #FFEBC1;
-    border-color: #FDBF3B;
-    color: #A6750C;
-    text-align: left;
-}
-
-.nodata, .warning {
-    text-align: center;
-    background-color: #FFEBC1;
-    border-color: #FDBF3B;
-    color: #A6750C;
-}
-
-#errorExplanation ul { font-size: 0.9em;}
-#errorExplanation h2, #errorExplanation p { display: none; }
-
-.conflict-details {font-size:80%;}
-/***** end Flash & error messages ****/
-
-/*消息铃铛样式*/
-.navHomepageNews {width:30px; display:block; float:right; margin-top:4px; position:relative; margin-right: 8px;}
-.newsActive {width:6px; height:6px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:20px; top:8px;z-index:999}
-
-/*20150826协议 LB*/
-.AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
-.Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
-.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
-.AgreementImg{margin: 0px auto;}
+/* CSS Document */
+/* 2015-06-26 */
+body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#eaebec;}
+div,img,tr,td,table{ border:0;}
+table,tr,td{border:0;cellspacing:0; cellpadding:0;}
+ol,ul,li{ list-style-type:none}
+a:link,a:visited{color:#7f7f7f;text-decoration:none;}
+a:hover,a:active{color:#15bccf;}
+/*img{max-width: 100%;}*/
+
+/*常用*/
+select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }
+.sub_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #707070; color:#000;  border-radius:3px; padding:1px 10px;  background:#dbdbdb;}
+.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;}
+table{ background:#fff;}
+.more{ font-weight:normal; color:#999; font-size:12px;}
+.no_line{ border-bottom:none;}
+.line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
+.no_border{ border:none;background:none;}
+.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
+.none{display: none;}
+
+/* font & color */
+h2{ font-size:18px; color:#15bccf;}
+h3{ font-size:14px; color:#e8770d;}
+h4{ font-size:14px; color:#3b3b3b;}
+.f12{font-size:12px; font-weight:normal;}
+.f14{font-size:14px;}
+.f16{font-size:16px;}
+.f18{font-size:18px;}
+.fb{font-weight:bold;}
+.lh20{line-height:20px;}
+.lh22{line-height:22px;}
+.lh24{line-height:24px;}
+.lh26{line-height:26px;}
+.fmYh{font-family:"MicroSoft Yahei";}
+.font999{ color:#999;}
+.fontRed{color:#770000;}
+.text_c{ text-align:center;}
+
+/* Float & Clear */
+.cl{ clear:both; overflow:hidden; }
+.fl{float:left;display:inline;}
+.fr{float:right;display:inline;}
+.f_l{ float:left;}
+.f_r{ float:right;}
+.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
+.clearfix{clear:both;zoom:1}
+.break_word{ word-break:break-all; word-wrap: break-word;}
+.white_space{white-space:nowrap;}
+
+/* Spacing */
+.ml2{ margin-left:2px;}
+.ml3{ margin-left:3px;}
+.ml4{ margin-left:4px;}
+.ml5{ margin-left:5px;}
+.ml8{ margin-left:8px;}
+.ml10{ margin-left:10px;}
+.ml15{ margin-left:15px;}
+.ml20{ margin-left:20px;}
+.ml40{ margin-left:40px;}
+.ml45{ margin-left:45px;}
+.ml55{ margin-left:55px;}
+.ml30{ margin-left:30px;}
+.ml60{ margin-left:60px;}
+.ml80{ margin-left:80px;}
+.ml90{ margin-left:90px;}
+.ml100{ margin-left:100px;}
+.ml110{ margin-left:110px;}
+.mr5{ margin-right:5px;}
+.mr10{ margin-right:10px;}
+.mr20{ margin-right:20px;}
+.mr30{ margin-right:30px;}
+.mr40{ margin-right:40px;}
+.mr45{margin-right: 45px;}
+.mw15{margin:0 15px;}
+.mw20{margin:0 20px;}
+.mt3{ margin-top:3px;}
+.mt5{ margin-top:5px;}
+.mt8{ margin-top:8px;}
+.mt10{ margin-top:10px;}
+.mb5{ margin-bottom:5px;}
+.mb10{ margin-bottom:10px;}
+.mb20{ margin-bottom:20px;}
+.pl15{ padding-left:15px;}
+.w20{ width:20px;}
+.w60{ width:60px;}
+.w70{ width:70px;}
+.w90{ width:90px;}
+.w210{ width:210px;}
+.w150{ width:150px;}
+.w280{ width:280px;}
+.w430{ width:470px;}
+.w520{ width:520px;}
+.w543{ width:543px;}
+.w557{ width:557px;}
+.w683{ width:683px;}
+.w350{ width:350px;}
+.w610{ width:610px;}
+.w600{ width:600px;}
+.h22{ height:22px;}
+.h26{ height:26px;}
+.h50{ height:50px;}
+.h70{ height:70px;}
+.h150{ height:150px;}
+
+/* Font & background Color */
+a.b_grey{ background: #F5F5F5;}
+a.b_dgrey{ background: #CCC;}
+a.c_orange{color:#ff5722;}
+a:hover.c_orange{color: #d33503;}
+a.c_lorange{color:#ff9900;}
+a:hover.c_lorange{color:#fff;}
+a.c_blue{ color:#269ac9;}
+a.c_dblue{ color:#09658c;}
+a:hover.c_dblue{ color:#15bccf;}
+a.c_white{ color:#fff;}
+a.c_dorange{ color:#fd6e2a;}
+a.c_dark{color: #3e4040;}
+a:hover.c_dark{color: #3ca5c6;}
+a.b_blue{background: #64bdd9;}
+a:hover.b_blue{background: #41a8c8;}
+a.b_green{background:#28be6c;}
+a:hover.b_green{background:#14ad5a;}
+a.c_blue02{color: #3ca5c6;}
+a:hover.c_blue02{color: #0781b4;}
+a.c_red{ color:#F00;}
+a:hover.c_red{ color: #C00;}
+a.c_purple{color: #426e9a;}
+a:hover.c_purple{color: #d33503;}
+a.c_green{ color:#28be6c;}
+
+.b_grey{ background: #F5F5F5;}
+.b_dgrey{ background: #CCC;}
+.c_orange{color:#e8770d;}
+.c_dark{ color:#2d2d2d;}
+.c_lorange{ color:#ff9900;}
+.c_purple{color: #6883b6;}
+.c_blue{ color:#15bccf;}
+.c_red{ color:#F00;}
+.c_green{ color:#28be6c;}
+.c_dblue{ color:#09658c;}
+.b_blue{background:#64bdd9;}
+.b_green{background:#28be6c;}
+.b_w{ background:#fff;}
+
+/* commonBtn */
+.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;}
+a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;}
+a:hover.grey_btn{ background:#717171; color:#fff;}
+.grey_n_btn{ background:#d9d9d9; color:#656565; font-weight:normal;padding:2px 10px; text-align:center;}
+a.grey_n_btn{background:#d9d9d9; color:#656565;font-weight:normal; padding:2px 10px; text-align:center;}
+a:hover.grey_n_btn{ background:#717171; color:#fff;}
+.green_btn{ background:#28be6c; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;}
+a.green_btn{background:#28be6c;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;}
+a:hover.green_btn{ background:#14ad5a;}
+.blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;}
+a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;}
+a:hover.blue_btn{ background:#329cbd;}
+a.orange_btn{  background:#ff5722;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center; }
+a:hover.orange_btn{ background:#d63502;}
+
+.green_u_btn{border:1px solid #3cb761; padding:2px 10px; color:#3cb761;}
+a.green_u_btn{border:1px solid #3cb761; padding:2px 10px; color:#3cb761;}
+a:hover.green_u_btn{ background:#3cb761; color:#fff;}
+.orange_u_btn{border:1px solid #ff5d31; padding:2px 10px; color:#ff5d31;}
+a.orange_u_btn{border:1px solid #ff5d31; padding:2px 10px; color:#ff5d31;}
+a:hover.orange_u_btn{background:#ff5d31; color:#fff;}
+.bgreen_u_btn{border:1px solid #1abc9c; padding:2px 10px; color:#1abc9c;}
+a.bgreen_u_btn{border:1px solid #1abc9c1; padding:2px 10px; color:#1abc9c;}
+a:hover.bgreen_u_btn{background:#1abc9c; color:#fff;}
+.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
+a.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
+a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
+.blue_n_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;}
+a.blue_n_btn{background:#64bdd9;color:#fff;font-weight:normal; padding:2px 10px; text-align:center;}
+a:hover.blue_n_btn{ background:#329cbd;}
+.green_n_btn{background:#3cb761; padding:2px 10px; color:#fff;}
+a.green_n_btn{background:#3cb761; padding:2px 10px; color:#fff;}
+a:hover.green_n_btn{ background:#14ad5a;}
+.orange_n_btn{background:#ff5d31; padding:2px 10px; color:#fff;}
+a.orange_n_btn{background:#ff5d31; padding:2px 10px; color:#fff;}
+a:hover.orange_n_btn{background:#d63502;}
+.bgreen_n_btn{background:#1abc9c; padding:2px 10px; color:#fff;}
+a.bgreen_n_btn{background:#1abc9c; padding:2px 10px; color:#fff;}
+a:hover.bgreen_n_btn{background:#08a384;}
+
+.nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
+.more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
+.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}
+.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+/* commonpic */
+.pic_date{ display:block; background:url(../images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; float:left;}
+.pic_add{ display:block; background:url(../images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; float:left;}
+.pic_sch{ display:block; background:url(../images/public_icon.png) -31px -195px no-repeat; width:16px; height:15px; float:left;}
+.pic_mes{ display:block; background:url(../images/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;}
+.pic_img{ display:block; background:url(../images/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; }
+.pic_del{ display:block; background:url(../images/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; }
+.pic_del:hover{  background:url(../images/public_icon.png) -32px -235px no-repeat; }
+.pic_stats{display:block; background:url(../images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
+.pic_files{display:block; background:url(../images/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;}
+.pic_text{display:block; background:url(../images/public_icon.png) 0px -609px no-repeat; width:20px; height:18px;}
+.pic_text02{display:block; background:url(../images/public_icon.png) 0px -642px no-repeat; width:20px; height:19px;}
+.pic_edit{display:block; background:url(../images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px;}
+.pic_edit:hover{display:block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
+
+
+
+
+
+/*框架主类容*/
+#Container{ width:1000px; margin:0 auto; }
+
+/*头部导航*/
+#Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; }
+.logo{ margin:5px 10px; }
+#TopNav{}
+#TopNav ul li{ margin-top:8px;}
+.topnav_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
+.topnav_a a:hover{color: #a1ebff;}
+#TopUser{}
+#TopUser ul li{ margin-top:8px;}
+.topuser_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
+.topuser_a  a:hover{color: #a1ebff;}
+#TopUser02{	}
+#TopUser02 li{	float: left;}
+#TopUser02 li a{ margin-right:10px;color: #FFF;text-align: center;}
+#TopUser02 li a:hover{color: #a1ebff;}
+#TopUser02 div{	position: absolute;visibility: hidden;background:#fff;border: 1px solid #15bccf;}
+#TopUser02 div a{position: relative;display: block;white-space: nowrap;text-align: left; line-height:1.9; margin-left:5px;background: #fff;color:#15bccf; font-weight:normal;}
+#TopUser02 div a:hover{	color:#e8770d; font-weight: bold;}
+/*头部导航下拉*/
+div#menu {height:41px; font-size:14px; font-weight:bold; }
+div#menu ul {float: left;}
+div#menu ul.menu { padding-left: 30px;  }
+div#menu li {position: relative; z-index: 9; margin: 0; display: block; float: left; }
+div#menu li:hover>ul { left: -2px;}
+div#menu a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; }
+div#menu a:hover, div#menu a:hover span { color: #a1ebff; }
+div#menu li.current a {}
+div#menu  {display: block; cursor: pointer; background-repeat: no-repeat;background-position: 95% 0;padding-right: 15px; _padding-right: 20px;}
+div#menu ul  a.parent  {background: url(../images/item.png) -20px -30px no-repeat;  width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+div#menu ul  a.parent:hover  {background: url(../images/item.png) -20px -60px no-repeat;}
+div#menu ul ul a.parent  {background: url(../images/item.png) -20px 6px no-repeat;}
+div#menu ul ul a.parent:hover  {background: url(../images/item.png) -20px -11px no-repeat;}
+/* menu::level1 */
+div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;}
+div#menu li { background: url(images/main-delimiter.png) 98% 4px no-repeat; }
+div#menu li.last { background: none; }
+/* menu::level2 */
+div#menu ul ul li { background: none; }
+div#menu ul ul { position: absolute;top: 38px; left: -999em; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #15bccf; margin-top:1px;}
+div#menu ul ul a {padding: 0 0 0 15px; height: auto; float: none;display: block; line-height: 24px; font-size:12px; font-weight:normal;color:#15bccf;}
+div#menu ul ul a:hover { color:#ff9900;}
+div#menu ul ul li.last { margin-left:15px; }
+div#menu ul ul li {width: 100%;}
+/* menu::level3 */
+div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:140px; }
+div#menu ul ul ul li a{ width:125px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;}
+
+/*主类容*/
+#Main{ background:#fff;  margin-bottom:10px;}
+#content{}
+#content02{ background:#fff; padding:10px; margin-bottom:10px;}
+/*主类容搜索*/
+#TopBar{ height:60px; margin-bottom:10px; background:#fff;}
+.topbar_info02{ margin:5px 10px;width:480px;  }
+.topbar_info02 p{color: #7f7f7f;}
+.search{ margin-top:8px; margin-left:71px;}
+.search_form{margin-top:8px;margin-left:72px;}
+.topbar_info{ width:350px; color:#5c5c5c; font-size:16px; margin-right:50px; line-height:1.3; padding-left:100px;}
+a.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:24px; text-align:center; padding-top:3px;}
+a:hover.search_btn{ background: #0fa9bb;}
+.search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
+/*主类容左右分栏*/
+#LSide{ width:240px;   }
+#RSide{ width:730px;  margin-left:10px;  background:#fff; padding:10px; margin-bottom:10px;}
+
+
+/*底部*/
+#Footer{  padding-top:10px; background:#fff; margin-bottom:10px;}
+.copyright{ width:780px; margin:0 auto;height:30px;  }
+.footlogo{ width:580px; margin:0 auto;height:50px;   }
+/*意见反馈*/
+html{ overflow-x:hidden;}
+.scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
+.side_content{width:154px; height:auto; overflow:hidden; float:left; }
+.side_content .side_list {width:154px;overflow:hidden;}
+.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:190px;cursor:pointer;}
+.show_btn span { display:none;}
+.close_btn{width:24px;height:24px;cursor:pointer;}
+.side_title,.side_bottom,.close_btn,.show_btn {background:url(../images/sidebar_bg.png) no-repeat; }
+.side_title {height:35px;}
+.side_bottom { height:8px;}
+.side_center {font-family:Verdana, Geneva, sans-serif; padding:0px 12px; font-size:12px;}
+.close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;}
+.close_btn span { display:none;}
+.side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
+.msgserver { margin-top:5px;}
+/*.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; }*/
+.msgserver a { height:21px; display:block; }
+.opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
+a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;}
+a:hover.opnionButton{background: #0fa9bb; }
+/* blue skin as the default skin */
+.side_title {background-position:-195px 0;}
+.side_center {background:url(../images/blue_line.png) repeat-y center; }
+.side_bottom {background-position:-195px -50px;}
+a.close_btn {background-position:-44px 0;}
+a:hover.close_btn {background-position:-66px 0;}
+.show_btn {background-position:-119px 0;}
+.msgserver a {color:#15bccf; }
+.msgserver a:hover { text-decoration:underline; }
+
+
+/***** Ajax indicator ******/
+#ajax-indicator {
+    position: absolute; /* fixed not supported by IE */
+    background-color:#eee;
+    border: 1px solid #bbb;
+    top:35%;
+    left:40%;
+    width:20%;
+    font-weight:bold;
+    text-align:center;
+    padding:0.6em;
+    z-index:100000;
+    opacity: 0.5;
+}
+
+html>body #ajax-indicator { position: fixed; }
+
+#ajax-indicator span {
+    background-position: 0% 40%;
+    background-repeat: no-repeat;
+    background-image: url(../images/loading.gif);
+    padding-left: 26px;
+    vertical-align: bottom;
+}
+
+div.modal {
+    border-radius: 5px;
+    background: #fff;
+    z-index: 50;
+    padding: 4px;
+}
+.ui-widget-content {
+    border: 1px solid #ddd;
+    color: #333;
+}
+.ui-widget {
+    font-family: Verdana, sans-serif;
+    font-size: 1.1em;
+}
+.ui-dialog .ui-dialog-content {
+    position: relative;
+    border: 0;
+    padding: .5em 1em;
+    background: none;
+    overflow: auto;
+    zoom: 1;
+}
+.ui-widget-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+.ui-widget-overlay {
+    background: #666 url(http://forge.trustie.net/stylesheets/jquery/images/xui-bg_diagonals-thick_20_666666_40x40.png.pagespeed.ic.9mfuw_R0z1.png) 50% 50% repeat;
+    opacity: .5;
+    filter: Alpha(Opacity=50);
+}
+/***** end Ajax indicator ******/
+
+/***** Flash & error messages ****/
+#errorExplanation, div.flash, .nodata, .warning, .conflict {
+    padding: 4px 4px 4px 30px;
+    margin-bottom: 12px;
+    font-size: 1.1em;
+    border: 2px solid;
+}
+
+div.flash {margin-top: 8px;}
+
+div.flash.error, #errorExplanation {
+    background: url(../images/exclamation.png) 8px 50% no-repeat;
+    background-color: #ffe3e3;
+    border-color: #dd0000;
+    color: #880000;
+}
+
+div.flash.notice {
+    background: url(../images/true.png) 8px 5px no-repeat;
+    background-color: #dfffdf;
+    border-color: #9fcf9f;
+    color: #005f00;
+}
+
+div.flash.warning, .conflict {
+    background: url(../images/warning.png) 8px 5px no-repeat;
+    background-color: #FFEBC1;
+    border-color: #FDBF3B;
+    color: #A6750C;
+    text-align: left;
+}
+
+.nodata, .warning {
+    text-align: center;
+    background-color: #FFEBC1;
+    border-color: #FDBF3B;
+    color: #A6750C;
+}
+
+#errorExplanation ul { font-size: 0.9em;}
+#errorExplanation h2, #errorExplanation p { display: none; }
+
+.conflict-details {font-size:80%;}
+/***** end Flash & error messages ****/
+
+
+/*弹出框*/
+.black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);}
+.white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
+.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
+.newhwork_content{ display:none;position:fixed;top:15%;left:30%;width:600px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
+.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}
+a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
+a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
+
+div.ke-statusbar{height:1px; border-top:none;}
+
+/*底部*/
+/*#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}*/
+/*.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}*/
+/*.footerAbout{ width:585px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; }*/
+/*.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}*/
+/*.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}*/
+/*.copyright{ width:390px; margin:0 auto;height:20px;line-height:20px;}*/
+/*a.f_grey {color:#666666;}*/
+/*a.f_grey:hover {color:#000000;}*/
+/*资源库*/
+.resources {width:728px; background-color:#ffffff; padding:10px; border:1px solid #dddddd;float: right}
+/*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/
+.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
+.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
+.resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;}
+.resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
+.resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
+.resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
+/*.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}*/
+/*.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/
+/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
+a.resourcesGrey {font-size:12px; color:#888888;}
+a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
+.resourcesBanner ul li:hover ul.resourcesType {display:block;}
+.resourcesSelected:hover ul {display:block;}
+.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
+.resourcesUploadBox:hover {background-color:#0781b4;}
+.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
+a.uploadText {color:#ffffff; font-size:14px;}
+.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
+.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
+.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
+/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
+.resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
+/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
+.resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
+/*.resourcesListName {width:175px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
+.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;}
+.resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
+.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
+.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;}
+.resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
+/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
+a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}
+a.resourcesBlack:hover {font-size:12px; color:#000000;}
+.resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
+.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
+.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
+.resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
+.resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
+.resourcesSelectSend {float:right;}
+/*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/
+.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}
+a.sendButtonBlue {color:#15bccf;}
+a.sendButtonBlue:hover {color:#ffffff;}
+.resourcesSelectSendButton:hover {background-color:#15bccf;}
+.db {display:block !important;}
+
+.dropdown-menu {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    z-index: 1000;
+    display: none;
+    float: left;
+    min-width: 80px;
+    padding: 5px 0;
+    margin: 2px 0 0;
+    font-size: 12px;
+    text-align: left;
+    background-color: #fff;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+    box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+}
+.dropdown-menu > li > a {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: normal;
+    line-height: 1.5;
+    color:#616060;
+    white-space: nowrap;
+}
+.dropdown-menu > li > a:hover{
+    color: #ffffff;
+    text-decoration: none;
+    background-color: #64bdd9;
+    outline:none;
+}
+.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
+a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
+.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
+.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
+.resourcesUploadBox:hover {background-color:#0781b4;}
+/* 个人主页右边部分*/
+.homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;}
+a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
+a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}
+a.replyGrey {color:#888888; display:inline-block;}
+a.replyGrey:hover {color:#4b4b4b;}
+
+/*上传资源弹窗*/
+.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+.uploadDialogText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
+.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative}
+.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}
+a.uploadBoxIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;}
+a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}
+.chooseFile {color:#ffffff; display:block; margin-left:32px;}
+.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}
+.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}
+.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}
+.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}
+.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
+
+/*发送资源弹窗*/
+/*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
+/*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
+.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
+.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:100px; display:inline-block;}
+.resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
+.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}
+.resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
+.searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
+.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}
+.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}
+.courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
+.sendCourseName {font-size:12px; color:#5f6060;display:inline-block}
+.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}
+.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
+a.sendSourceText {font-size:14px; color:#ffffff;}
+input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;}
+.resourcesSendTo {float:left; height:20px; margin-top:15px;}
+.resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
+
+
+
+/*主类容左右分栏*/
+#LSide{ width:240px;   }
+#RSide{ width:730px;  margin-left:10px;  background:#fff; padding:10px; margin-bottom:10px;}
+
+
+/*资源库*/
+/*.resources {width:730px; background-color:#ffffff;}*/
+/*.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}*/
+/*.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}*/
+/*.resourcesSelect {width:40px; height:40px; float:right; position:relative;}*/
+.resourcesSelected2 {width:25px; height:20px;}
+.resourcesIcon2 {margin-top:20px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}
+.resourcesIcon2:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
+/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
+/*a.resourcesGrey {font-size:12px; color:#888888;}*/
+/*a.resourcesGrey:hover {font-size:12px; color:#15bccf;}*/
+/*.resourcesBanner ul li:hover ul.resourcesType {display:block;}*/
+/*ul li:hover ul {display:block;}*/
+/*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
+/*.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}*/
+/*a.uploadText {color:#ffffff; font-size:14px;}*/
+/*.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;}*/
+/*.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}*/
+/*.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}*/
+/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
+/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
+/*.resourcesListCheckbox {width:40px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}*/
+/*.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}*/
+/*.resourcesListName {width:135px; height:40px; line-height:40px; text-align:left;}*/
+/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
+/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
+/*a.resourcesBlack {font-size:12px; color:#4c4c4c;}*/
+/*a.resourcesBlack:hover {font-size:12px; color:#000000;}*/
+/*.dropdown-menu {*/
+    /*position: absolute;*/
+    /*top: 100%;*/
+    /*left: 0;*/
+    /*z-index: 1000;*/
+    /*display: none;*/
+    /*float: left;*/
+    /*min-width: 80px;*/
+    /*padding: 5px 0;*/
+    /*margin: 2px 0 0;*/
+    /*font-size: 12px;*/
+    /*text-align: left;*/
+    /*background-color: #fff;*/
+    /*-webkit-background-clip: padding-box;*/
+    /*background-clip: padding-box;*/
+    /*border: 1px solid #ccc;*/
+    /*border-radius: 4px;*/
+    /*-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
+    /*box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
+/*}*/
+/*.dropdown-menu > li > a {*/
+    /*display: block;*/
+    /*padding: 3px 20px;*/
+    /*clear: both;*/
+    /*font-weight: normal;*/
+    /*line-height: 1.5;*/
+    /*color:#616060;*/
+    /*white-space: nowrap;*/
+/*}*/
+/*.dropdown-menu > li > a:hover{*/
+    /*color: #ffffff;*/
+    /*text-decoration: none;*/
+    /*background-color: #64bdd9;*/
+    /*outline:none;*/
+/*}*/
+
+/*发送资源弹窗*/
+/*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
+/*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
+/*.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
+/*.resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}*/
+/*.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}*/
+/*.resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}*/
+/*.searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}*/
+/*.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}*/
+/*.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}*/
+/*.courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}*/
+/*.sendCourseName {font-size:12px; color:#5f6060;}*/
+/*.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}*/
+/*.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}*/
+/*a.sendSourceText {font-size:14px; color:#ffffff;}*/
+
+/*上传资源弹窗*/
+/*.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}*/
+/*.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
+/*.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}*/
+/*.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}*/
+/*a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}*/
+/*.chooseFile {color:#ffffff; display:block; margin-left:32px;}*/
+/*.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}*/
+/*.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}*/
+/*.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}*/
+/*.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}*/
+/*.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}*/
+
+
+/*新个人主页框架css*/
+.navContainer {width:100%; margin:0 auto; background-color:#15bccf;}
+.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
+.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;}
+.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:40px;}
+.navHomepageMenu {margin-right:40px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
+.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
+.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}
+.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
+a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
+.navHomepageNews {width:30px; display:block; float:right; margin-top:12px; position:relative;}
+.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:29px; display:block;}
+.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
+.navHomepageProfile {width:65px; display:block; float:right; margin-top:8px; margin-left:33px;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) -8px -175px no-repeat; width:20px; height:25px; float:left; margin-top:15px; line-height:0;}
+a.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) -8px -175px no-repeat; width:12px; height:12px; float:left;}
+.homepageLeft {width:240px; float:left; margin-right:10px;}
+.homepageRight {width:750px; float:left;}
+.homepagePortraitContainer {width:238px; height:348px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px;}
+.homepagePortraitImage {width:208px; height:208px; margin:15px 16px 14px 16px;}
+.homepageFollow {}
+.homepageEditProfile {}
+.homepageImageName {font-size:16px; color:#484848; margin-left:15px; display:inline-block; margin-right:8px;}
+.homepageImageSex {float:left; top:116px; left:5px; width:14px; height:14px; display:inline-block;}
+.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:5px; margin-bottom:15px;}
+.homepageImageBlock {margin:0 26px; float:left; text-align:center; display:inline-block;}
+.homepageImageNumber {font-size:12px; color:#484848;}
+.homepageImageText {width:26px; font-size:12px; color:#888888;}
+.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
+.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
+.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
+a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
+.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
+.homepageRightBanner {}
+.newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2;}
+.homepageRightBlock {}
+.homepageNewsList {width:710px; height:39px; line-height:39px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin:0 auto;}
+.homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
+.homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
+.homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;}
+.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; overflow: hidden;height:49px; max-height:49px;}
+.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
+a.homepageWhite {color:#ffffff;}
+a.homepageWhite:hover {color:#a1ebff}
+a.newsGrey {color:#4b4b4b;}
+a.newsGrey:hover {color:#000000;}
+a.newsRed {color:red;}
+a.newsRed:hovor {color:#888888;}
+a.replyGrey {color:#888888; display:inline-block;}
+a.replyGrey:hover {color:#4b4b4b;}
+a.replyGrey1 {color:#888888;}
+a.replyGrey1:hover {color:#4b4b4b;}
+a.newsBlue {color:#269ac9;}
+a.newsBlue:hover {color:#297fb8;}
+a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
+a.menuGrey {color:#808080;}
+a.menuGrey:hover {color:#fe7d68;}
+a.resourcesGrey {font-size:12px; color:#888888;}
+a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
+.portraitRadius {border-radius: 3px;}
+
+/***** Flash & error messages ****/
+#errorExplanation, div.flash, .nodata, .warning, .conflict {
+    padding: 4px 4px 4px 30px;
+    margin-bottom: 12px;
+    font-size: 1.1em;
+    border: 2px solid;
+}
+
+div.flash {margin-top: 8px;}
+
+div.flash.error, #errorExplanation {
+    background: url(../images/exclamation.png) 8px 50% no-repeat;
+    background-color: #ffe3e3;
+    border-color: #dd0000;
+    color: #880000;
+}
+
+div.flash.notice {
+    background: url(../images/true.png) 8px 5px no-repeat;
+    background-color: #dfffdf;
+    border-color: #9fcf9f;
+    color: #005f00;
+}
+
+div.flash.warning, .conflict {
+    background: url(../images/warning.png) 8px 5px no-repeat;
+    background-color: #FFEBC1;
+    border-color: #FDBF3B;
+    color: #A6750C;
+    text-align: left;
+}
+
+.nodata, .warning {
+    text-align: center;
+    background-color: #FFEBC1;
+    border-color: #FDBF3B;
+    color: #A6750C;
+}
+
+#errorExplanation ul { font-size: 0.9em;}
+#errorExplanation h2, #errorExplanation p { display: none; }
+
+.conflict-details {font-size:80%;}
+/***** end Flash & error messages ****/
+
+/*消息铃铛样式*/
+.navHomepageNews {width:30px; display:block; float:right; margin-top:4px; position:relative; margin-right: 8px;}
+.newsActive {width:6px; height:6px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:20px; top:8px;z-index:999}
+
+/*20150826协议 LB*/
+.AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
+.Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;}
+.AgreementTxt{text-indent: 2em; margin-bottom: 15px;}
+.AgreementImg{margin: 0px auto;}
diff --git a/public/stylesheets/share.css b/public/stylesheets/share.css
index 02d91304f..74262acc8 100644
--- a/public/stylesheets/share.css
+++ b/public/stylesheets/share.css
@@ -50,4 +50,6 @@ a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-rep
 .codeIcon {background:url(../images/hwork_icon.png) -78px -160px no-repeat; padding-left:23px;}
 .othersIcon {background:url(../images/hwork_icon.png) -3px -210px no-repeat; padding-left:23px;}
 .thesisIcon {background:url(../images/hwork_icon.png) -78px -212px no-repeat; padding-left:23px;}
-.softwareIcon {background:url(../images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;}
\ No newline at end of file
+.softwareIcon {background:url(../images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;}
+
+.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
\ No newline at end of file