diff --git a/Gemfile b/Gemfile
index c739e1085..2b12860f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'daemons'
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
 gem 'seems_rateable', '~> 1.0.13'
-gem "rails", "3.2.13"
+gem "rails", "~> 3.2.13"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem 'coderay', '~> 1.1.0'
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index f8ca1d0e2..c7aa42b9e 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -24,7 +24,7 @@ class AdminController < ApplicationController
   before_filter :require_admin
   helper :sort
   helper :Users
-  helper :Settings
+  helper :Settings,SchoolHelper
   include SortHelper
 
   def index
@@ -65,7 +65,17 @@ class AdminController < ApplicationController
 
  #管理员界面课程资源列表
   def course_resource_list
-    @resource = Attachment.where(:container_type => 'Course')
+
+    if params[:sort] == 'file_size'
+      @resource = Attachment.where(:container_type => 'Course').order("filesize desc")
+    elsif params[:sort] == 'file_upload'
+      @resource = Attachment.where(:container_type => 'Course').order("created_on desc")
+    elsif params[:sort] == 'file_download_times'
+      @resource = Attachment.where(:container_type => 'Course').order("downloads desc")
+    else
+      @resource = Attachment.where(:container_type => 'Course').order("created_on desc")
+    end
+
     @resource = paginateHelper @resource,30
     @page = (params['page'] || 1).to_i - 1
 
@@ -76,7 +86,17 @@ class AdminController < ApplicationController
 
   #管理员界面項目资源列表
   def project_resource_list
-    @pro_resource = Attachment.where(:container_type => 'Project')
+
+    if params[:sort] == 'file_size'
+      @pro_resource = Attachment.where(:container_type => 'Project').order("filesize desc")
+    elsif params[:sort] == 'file_upload'
+      @pro_resource = Attachment.where(:container_type => 'Project').order("created_on desc")
+    elsif params[:sort] == 'file_download_times'
+      @pro_resource = Attachment.where(:container_type => 'Project').order("downloads desc")
+    else
+      @pro_resource = Attachment.where(:container_type => 'Project').order("created_on desc")
+    end
+
     @pro_resource = paginateHelper @pro_resource,30
     @page = (params['page'] || 1).to_i - 1
 
@@ -92,9 +112,9 @@ class AdminController < ApplicationController
 
     case params[:format]
       when 'xml', 'json'
-        @offset, @limit = api_offset_and_limit({:limit => 15})
+        @offset, @limit = api_offset_and_limit({:limit => 50})
       else
-        @limit = 15#per_page_option
+        @limit = 50 #per_page_option
     end
 
     @status = params[:status] || 1
@@ -374,7 +394,13 @@ class AdminController < ApplicationController
 
   #组织
   def organization
-    @organizations = Organization.all
+    @organizations = Organization.find_by_sql("SELECT * FROM organizations ORDER BY created_at DESC")
+    #@organizations = Organization.all.order("created_at desc")
+    @organization_count = @organizations.count
+    @organization_pages = Paginator.new @organization_count, 30, params['page'] || 1
+    @organizations = paginateHelper @organizations,30
+
+    @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
     end
@@ -382,17 +408,14 @@ class AdminController < ApplicationController
 
   #学校列表
   def schools
-    @school_name = params[:school_name]
-    if @school_name && @school_name != ''
-      @schools = School.where("name like '%#{@school_name}%'")
-    elsif @school_name.nil?
-      @schools = []
-    else  @school_name && @school_name == ' '
-    @schools = School.where('1=1')
-    end
+
+    @schools = School.find_by_sql("SELECT * FROM schools ORDER BY created_at DESC")
     @school_count = @schools.count
-    @school_pages = Paginator.new @school_count, 100, params['page'] || 1
-    @schools = paginateHelper @schools,100
+
+    @school_pages = Paginator.new @school_count, 30, params['page'] || 1
+    @schools = paginateHelper @schools,30
+
+    @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
     end
diff --git a/app/controllers/at_controller.rb b/app/controllers/at_controller.rb
index 456306c64..fe16385f4 100644
--- a/app/controllers/at_controller.rb
+++ b/app/controllers/at_controller.rb
@@ -8,6 +8,15 @@ class AtController < ApplicationController
     users = find_at_users(params[:type], params[:id])
     @users = users
     @users = users.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id }.sort{|x,y| to_pinyin(x.show_name) <=> to_pinyin(y.show_name)} if users
+
+    #加上all
+    if @users.size > 0
+      allUser = Struct.new(:id, :name).new
+      allUser.id = @users.map{|u| u.id}.join(",")
+      allUser.name = "all"
+      @users.insert(0, allUser)
+    end
+    @users
   end
 
   private
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index b878a14ac..9853b4dc1 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -103,6 +103,9 @@ class AttachmentsController < ApplicationController
             direct_download_history
           end
         else
+          # 记录用户行为
+          record_user_actions(params[:id])
+          # 直接下载历史版本
           direct_download_history
         end
       end
@@ -113,6 +116,14 @@ class AttachmentsController < ApplicationController
     redirect_to "http://" + (Setting.host_name.to_s) +"/file_not_found.html"
   end
 
+  def record_user_actions id
+    if params[:action] == "download_history"
+      UserActions.create(:action_id => id, :action_type => "AttachmentHistory", :user_id => User.current.id) unless id.nil?
+    elsif params[:action] == "download"
+      UserActions.create(:action_id => id, :action_type => "Attachment", :user_id => User.current.id) unless id.nil?
+    end
+  end
+
   def download
     # modify by nwb
     # 下载添加权限设置
@@ -135,6 +146,8 @@ class AttachmentsController < ApplicationController
             direct_download
           end
         else
+          # 记录用户行为
+          record_user_actions(params[:id])
           direct_download
         end
       end
@@ -572,6 +585,15 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  #找到文件的所有的历史版本及当前版本
+  def attachment_history_download
+    @attachment = Attachment.find(params[:id])
+    @attachment_histories = @attachment.attachment_histories
+    respond_to do |format|
+      format.js
+    end
+  end
+
 private
   def find_project
     @attachment = Attachment.find(params[:id])
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f06a782bc..dfa30915e 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -7,6 +7,7 @@ class CoursesController < ApplicationController
   helper :members
   helper :words
   helper :attachments
+  helper :files
   helper :activity_notifys
 
   before_filter :auth_login1, :only => [:show, :course_activity, :feedback]
@@ -902,10 +903,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/files_controller.rb b/app/controllers/files_controller.rb
index b6ac99f11..7ae1b85f8 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -207,8 +207,7 @@ class FilesController < ApplicationController
       sort =  "created_on DESC"
     end
     if keywords != "%%"
-    resultSet = Attachment.where("attachments.container_type = 'Course' And attachments.container_id = '#{course.id}' AND filename LIKE :like ", like: "%#{keywords}%").
-        reorder(sort)
+    resultSet = Attachment.where("attachments.container_type = 'Course' And attachments.container_id = '#{course.id}' AND filename LIKE :like ", like: "%#{keywords}%").reorder(sort)
     else
       resultSet = Attachment.where("attachments.container_type = 'Course' And attachments.container_id = '#{course.id}' "). reorder(sort)
     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 79ecd6932..9039fd041 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -110,8 +110,7 @@ class UsersController < ApplicationController
     elsif @user != User.current && !User.current.admin?
       return render_403
     end
-    # 初始化/更新 点击按钮时间
-    # 24小时内显示系统消息
+    # 初始化/更新 点击按钮时间, 24小时内显示系统消息
     update_onclick_time
     # 全部设为已读
     if params[:viewed] == "all"
@@ -190,17 +189,19 @@ class UsersController < ApplicationController
 
   # 消息设置为已读
   def update_message_viewed(user)
-    course_querys = CourseMessage.where("user_id =? and viewed =?", user, 0)
-    forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0)
-    user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0)
-    forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0)
-    org_querys = OrgMessage.where("user_id=? and viewed=0", user)
     if User.current.id == @user.id
-      course_querys.update_all(:viewed => true)
-      forge_querys.update_all(:viewed => true)
-      user_querys.update_all(:viewed => true)
-      forum_querys.update_all(:viewed => true)
-      org_querys.update_all(:viewed => true)
+      course_querys = CourseMessage.where("user_id =? and viewed =?", user, 0)
+      forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0)
+      user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0)
+      forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0)
+      org_querys = OrgMessage.where("user_id=? and viewed=0", user)
+      at_querys = AtMessage.where("user_id=? and viewed=0", user)
+      course_querys.update_all(:viewed => true) unless course_querys.nil?
+      forge_querys.update_all(:viewed => true) unless forge_querys.nil?
+      user_querys.update_all(:viewed => true) unless user_querys.nil?
+      forum_querys.update_all(:viewed => true) unless forum_querys.nil?
+      org_querys.update_all(:viewed => true) unless org_querys.nil?
+      at_querys.update_all(:viewed => true) unless at_querys.nil?
     end
   end
 
@@ -572,7 +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]=="" ? "(1, 2, 3)" : "(" + params[:property] + ")"
+    type_ids = params[:property]=="" || params[:property].nil? ? "(1, 2, 3)" : "(" + params[:property] + ")"
         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(",") + ")"
@@ -840,20 +841,33 @@ class UsersController < ApplicationController
     user_course_ids = User.current.courses.map { |c| c.id}
     user_project_ids = User.current.projects.map {|p| p.id}
     # user_org_ids = User.current.organizations.map {|o| o.id}
-    if(params[:type].blank? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids)
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids)
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources params[:id]
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources params[:id]
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources(params[:id], @order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources(params[:id], @order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+      end
     elsif params[:type] == "6" # 公共资源
-      # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources(user_course_ids, user_project_ids)
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public(@order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public(@order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+      end
     end
     @type = params[:type]
     @limit = 7
@@ -963,12 +977,7 @@ class UsersController < ApplicationController
       return
     end
     # 自己访问自己的页面才更新消息状态
-    if User.current == @user
-      journals_messages =  UserFeedbackMessage.where("user_id =? and journals_for_message_type =? and viewed =?", User.current.id, "JournalsForMessage", 0)
-      journals_messages.each do |journals_message|
-        journals_message.update_attributes(:viewed => true)
-      end
-    end
+    UserFeedbackMessage.where("user_id =? and viewed =? and journals_for_message_type =? ", User.current.id, 0, "JournalsForMessage").update_all(:viewed => true)
     # end
     @page = params[:page] ? params[:page].to_i + 1 : 0
     if params[:type].present?
@@ -1570,43 +1579,39 @@ class UsersController < ApplicationController
     user_project_ids = User.current.projects.map {|p| p.id}
     # user_org_ids = User.current.organizations.map {|o| o.id}
     @user = User.find(params[:id])
-    #@user.save_attachments(params[:attachments],User.current)
-    # Container_type为Principal
+    # 保存文件
     attach = Attachment.attach_filesex_public(@user, params[:attachments], params[:attachment_type], is_public = true)
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_course_ids = User.current.courses.map { |c| c.id}
+    user_project_ids = User.current.projects.map {|p| p.id}
+    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      if params[:status] == 2
-        @attachments = get_course_resources(params[:id], user_course_ids)
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources(params[:id], user_project_ids)
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources params[:id]
+        @attachments = get_attch_resources(params[:id], @order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources params[:id]
+        @attachments = get_principal_resources(params[:id], @order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids)
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids)
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources params[:id]
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources params[:id]
     elsif params[:type] == "6" # 公共资源
       if params[:status] == "2"
-        @attachments = get_course_resources_public( user_course_ids)
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources_public(user_project_ids)
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources_public
+        @attachments = get_attch_resources_public(@order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources_public
+        @attachments = get_principal_resources_public(@order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_public_resources(user_course_ids, user_project_ids)
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
     end
     @status = params[:status]
@@ -1626,49 +1631,44 @@ class UsersController < ApplicationController
   # 删除用户资源，分为批量删除 和 单个删除，只能删除自己上传的资源
   def user_resource_delete
     if params[:resource_id].present?
-      Attachment.where("author_id = #{User.current.id}").delete(params[:resource_id])
+      Attachment.where("author_id =? and id =?", User.current.id, params[:resource_id]).first.destroy
     elsif params[:checkbox1].present?
       params[:checkbox1].each do |id|
-        Attachment.where("author_id = #{User.current.id}").delete(id)
+        Attachment.where("author_id =? and id =?", User.current.id, id).first.destroy
       end
     end
+    @user = User.current
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
     user_course_ids = User.current.courses.map { |c| c.id}
     user_project_ids = User.current.projects.map {|p| p.id}
     # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      if params[:status] == 2
-        @attachments = get_course_resources(params[:id], user_course_ids)
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources(params[:id], user_project_ids)
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources params[:id]
+        @attachments = get_attch_resources(params[:id], @order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources params[:id]
+        @attachments = get_principal_resources(params[:id], @order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids)
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids)
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources params[:id]
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources params[:id]
     elsif params[:type] == "6" # 公共资源
       if params[:status] == "2"
-        @attachments = get_course_resources_public( user_course_ids)
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources_public(user_project_ids)
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources_public
+        @attachments = get_attch_resources_public(@order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources_public
+        @attachments = get_principal_resources_public(@order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_public_resources(user_course_ids, user_project_ids)
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
     end
     @status = params[:status]
@@ -1691,10 +1691,10 @@ class UsersController < ApplicationController
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
       @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search)
-      .select { |course|  @user.allowed_to?(:as_teacher,course)}
+      .select { |course|  @user.allowed_to?(:as_teacher,course) and course.is_delete == 0 }
     else
       @course = @user.courses
-      .select { |course|  @user.allowed_to?(:as_teacher,course)}
+      .select { |course|  @user.allowed_to?(:as_teacher,course)  and course.is_delete == 0 }
     end
     @search = params[:search]
     #这里仅仅是传递需要发送的资源id
@@ -1712,7 +1712,7 @@ class UsersController < ApplicationController
       search = "%#{params[:search].to_s.strip.downcase}%"
       @projects = @user.projects.where(" #{Project.table_name}.id = #{params[:search].to_i } or #{Project.table_name}.name like :p",:p=>search)
     else
-      @projects = @user.projects
+      @projects = @user.projects.visible
     end
     @search = params[:search]
     #这里仅仅是传递需要发送的资源id
@@ -2356,59 +2356,125 @@ class UsersController < ApplicationController
   end
 
   # 获取公共资源
-  def get_public_resources user_course_ids, user_project_ids
-    attachments = Attachment.where("(is_publish = 1 and is_public =1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("created_on desc")
+  def get_public_resources user_course_ids, user_project_ids, order, score
+    attachments = Attachment.where("(is_publish = 1 and is_public =1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源搜索
+  def get_public_resources_search user_course_ids, user_project_ids, order, score, search
+    attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的资源
-  def get_my_resources author_id, user_course_ids, user_project_ids
+  def get_my_resources author_id, user_course_ids, user_project_ids, order, score
     attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                       "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("created_on desc")
+                                       "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的资源查询结果
+  def get_my_resources_search (author_id, user_course_ids, user_project_ids, order, score, search)
+    @attachments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
+                                        "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的课程资源
-  def get_course_resources author_id, user_course_ids
-    attchments = Attachment.where("(author_id = #{author_id} and container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+  def get_course_resources author_id, user_course_ids, order, score
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
+                                   "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
+                               and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # 获取公共资源课程
-  def get_course_resources_public user_course_ids
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("created_on desc")
+  # 获取我的课程资源中搜索结果
+  def get_course_resources_search author_id, user_course_ids, order, score, search
+    attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
+                                      "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
+                               and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源中课程资源
+  def get_course_resources_public user_course_ids, order, score
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源中课程资源搜索结果
+  def get_course_resources_public_search user_course_ids, order, score, search
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的项目资源
-  def get_project_resources author_id, user_project_ids
-    attchments = Attachment.where("(author_id = #{author_id} and container_type = 'Project') or (container_type = 'Course'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+  def get_project_resources author_id, user_project_ids, order, score
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
+                                   "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')})
+                              and is_publish = 1 and container_id is not null)").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的项目资源搜索
+  def get_project_resources_search author_id, user_project_ids, order, score, search
+    attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
+                                      "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')})
+                              and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源的项目资源
-  def get_project_resources_public  user_project_ids
-    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("created_on desc")
+  def get_project_resources_public  user_project_ids, order, score
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源的项目资源搜索
+  def get_project_resources_public_search  user_project_ids, order, score, search
+    attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我上传的附件
-  def get_attch_resources author_id
-    attchments = Attachment.where("author_id = #{author_id} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
+  def get_attch_resources author_id, order, score
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue',
+                               'Document','Message','News','StudentWorkScore','HomewCommon'))").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我上传的附件搜索结果
+  def get_attch_resources_search author_id, order, score, search
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue',
+                               'Document','Message','News','StudentWorkScore','HomewCommon')) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中我上传的附件
-  def get_attch_resources_public
-    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal') and container_id is not null and is_public =1").order("created_on desc")
+  def get_attch_resources_public order, score
+    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
+                               and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源中我上传的附件
+  def get_attch_resources_public_search order, score, search
+    attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
+                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
-  def get_principal_resources author_id
-    attchments = Attachment.where("author_id = #{author_id} and container_type = 'Principal'").order("created_on desc")
+  def get_principal_resources author_id, order, score
+    attchments = Attachment.where("author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal'").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的用户类型资源搜索
+  def get_principal_resources_search author_id, order, score, search
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal') and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
-  def get_principal_resources_public
-    attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").order("created_on desc")
+  def get_principal_resources_public order, score
+    attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的用户类型资源
+  def get_principal_resources_public_search order, score, search
+    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
   def user_resource
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
     # 别人的资源库是没有权限去看的
     if User.current.id.to_i != params[:id].to_i
       render_403
@@ -2420,37 +2486,29 @@ class UsersController < ApplicationController
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == "2"
-        @attachments = get_course_resources(params[:id], user_course_ids)
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources(params[:id], user_project_ids)
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources params[:id]
+        @attachments = get_attch_resources(params[:id], @order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources params[:id]
+        @attachments = get_principal_resources(params[:id], @order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids)
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids)
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources params[:id]
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources params[:id]
     elsif params[:type] == "6" # 公共资源
       if params[:status] == "2"
-        @attachments = get_course_resources_public( user_course_ids)
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"
-        @attachments = get_project_resources_public(user_project_ids)
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
       elsif params[:status] == "4"
-        @attachments = get_attch_resources_public
+        @attachments = get_attch_resources_public(@order, @score)
       elsif params[:status] == "5"
-        @attachments = get_principal_resources_public
+        @attachments = get_principal_resources_public(@order, @score)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = get_public_resources(user_course_ids, user_project_ids)
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
     end
     @status = params[:status]
@@ -2475,16 +2533,21 @@ class UsersController < ApplicationController
       render_403
       return
     end
+    @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id]
+    @resource_type = params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"
+    @user = User.find(params[:id])
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
     user_course_ids = User.current.courses.map { |c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
-    # user_org_ids = User.current.organizations.map {|o| o.id}
+    user_project_ids = User.current.projects.map {|p| p.id}    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
+      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
     elsif params[:type] == "6" # 公共资源
       # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources(user_course_ids, user_project_ids)
+      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
     end
+    @status = params[:status]
     @type = params[:type]
     @limit = 10
     @is_remote = true
@@ -2500,26 +2563,28 @@ class UsersController < ApplicationController
   end
 
   def import_resources_search
-    search = "%#{params[:search].strip.downcase}%"
+    @resource_id = params[:mul_id]
+    @resource_type = params[:mul_type]
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    @user = User.current
+    @switch_search = params[:name].nil? ? " " : params[:name]
+    search = "%#{@switch_search.strip.downcase}%"
     # 别人的资源库是没有权限去看的
     if User.current.id.to_i != params[:id].to_i
       render_403
       return
     end
-    user_course_ids = User.current.courses.map { |c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
-    # user_org_ids = User.current.organizations.map {|o| o.id}
+    @resource_id = params[:mul_id]
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       user_course_ids = User.current.courses.map { |c| c.id}
       user_project_ids = User.current.projects.map {|p| p.id}
       # user_org_ids = User.current.organizations.map {|o| o.id}
-      @attachments = Attachment.where("((author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                          "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                          "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("created_on desc")
+      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
     elsif params[:type] == "6" # 公共资源
       # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources(user_course_ids, user_project_ids)
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
     end
     @type = params[:type]
     @limit = 10
@@ -2528,10 +2593,10 @@ class UsersController < ApplicationController
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,10
+    @attachments = paginateHelper @attachments, 10
     respond_to do |format|
       format.js
-      format.html {render :layout => 'new_base'}
+      # format.html {render :layout => 'new_base'}
     end
   end
 
@@ -2589,55 +2654,41 @@ class UsersController < ApplicationController
 
   # 根据资源关键字进行搜索
   def resource_search
-    search = "%#{params[:search].strip.downcase}%"
-    user_course_ids = User.current.courses.map { |c| c.id}
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "desc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    @user = User.current
+    @switch_search = params[:search].nil? ? " " : params[:search]
+    search = "%#{@switch_search.strip.downcase}%"
+    user_course_ids = User.current.courses.map {|c| c.id}
     user_project_ids = User.current.projects.map {|p| p.id}
-    # user_org_ids = User.current.organizations.map {|o| o.id}
-    if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') #全部
-      if User.current.id.to_i == params[:id].to_i
-
-        @attachments = Attachment.where("((author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                            "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("created_on desc")
+    if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') # 全部
+      if params[:status] == "2"
+        @attachments = get_course_resources_search(params[:id], user_course_ids, @order, @score, search)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_search(params[:id], user_project_ids, @order, @score, search)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_search(params[:id], @order, @score, search)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_search(params[:id], @order, @score, search)
       else
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
-        @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type in" +
-                                            " ('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon'))"+
-                                            " or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )" +
-                                            " and (filename like :p) ",:p=>search).order("created_on desc")
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
       end
-    elsif params[:type] == "2" #课程资源
-      if User.current.id.to_i == params[:id].to_i
-        user_course_ids = User.current.courses.map { |c| c.id}
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like :p) ",:p=>search).order("created_on desc")
+    elsif  params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public_search(user_course_ids, @order, @score, search)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public_search(user_project_ids, @order, @score, search)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public_search(@order, @score, search)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public_search(@order, @score, search)
       else
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
-        @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type = 'Course') "+
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )"+
-                                            " and (filename like :p) ",:p=>search).order("created_on desc")
+        # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
       end
-    elsif params[:type] == "3" #项目资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like :p)",:p=>search).order("created_on desc")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project'  and (filename like :p) ",:p=>search).order("created_on desc")
-      end
-    elsif params[:type] == "4" #附件
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("created_on desc")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("created_on desc")
-      end
-    elsif params[:type] == "5" #用户资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like :p)",:p=>search).order("created_on desc")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'  and (filename like :p)",:p=>search).order("created_on desc")
-      end
-    elsif  params[:type] == "6" #全部资源
-      # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("created_on desc")
     end
+    @status = params[:status]
     @type = params[:type]
     @limit = 25
     @is_remote = true
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cc093ad7a..3a5cdb1a1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -370,7 +370,7 @@ module ApplicationHelper
   def link_to_short_attachment(attachment, options={})
     length = options[:length] ? options[:length]:23
     text = h(truncate(options.delete(:text) || attachment.filename, length: length, omission: '...'))
-    route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
+    route_method = options.delete(:download) ? :download_named_attachment_url_without_domain : :named_attachment_url_without_domain
     html_options = options.slice!(:only_path)
     url = send(route_method, attachment, attachment.filename, options)
     link_to text, url, html_options
@@ -841,7 +841,7 @@ module ApplicationHelper
   def project_member_check_box_tags_ex name, principals
     s = ''
     principals.each do |principal|
-      s << "<li>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id)}</li>\n"
+      s << "<li>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_url_in_org( principal.id)}</li>\n"
     end
     s.html_safe
   end
@@ -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
 
@@ -2582,9 +2582,9 @@ module ApplicationHelper
     elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
-        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
+        link = link_to '启动匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?is_in_course=" + is_in_course.to_s + "&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s, id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
       when 2
-        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
+        link = link_to '关闭匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?is_in_course=" + is_in_course.to_s + "&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s, id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
         # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
@@ -2631,7 +2631,7 @@ module ApplicationHelper
   def user_for_homework_common homework,is_teacher
     if User.current.member_of_course?(homework.course)
       if is_teacher #老师显示作品数量
-        link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+        link_to "作品(#{homework.student_works.count})", student_work_index_url_in_org(homework.id), :class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
         project = cur_user_projects_for_homework homework
@@ -2639,30 +2639,30 @@ module ApplicationHelper
           if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
             link_to "提交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再提交作品'
           else
-            link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+            link_to "提交作品(#{homework.student_works.count})",  new_student_work_url_without_domain(homework.id),:class => 'c_blue'
           end
         elsif work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
           if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
             link_to "补交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再补交作品'
           else
-            link_to "补交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_red'
+            link_to "补交作品(#{homework.student_works.count})",  new_student_work_url_without_domain(homework.id),:class => 'c_red'
           end
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
-            link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
+            link_to "作品匿评", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
-            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
+            link_to "查看作品(#{homework.student_works.count})",student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
-            link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})", new_student_work_url_without_domain(homework.id),:class => 'c_blue'
           elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id
-            link_to "修改作品(#{homework.student_works.count})", edit_student_work_path(work.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})", edit_student_work_url_without_domain(work.id),:class => 'c_blue'
           else
-            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
+            link_to "查看作品(#{homework.student_works.count})", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
           end
         end
       end
     else
-      link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      link_to "作品(#{homework.student_works.count})",student_work_index_url_in_org(homework.id),:class => "c_blue"
     end
 
   end
@@ -2943,37 +2943,104 @@ 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
-  else
-    return "https://" +  Setting.host_name + "/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"
-  else
-    return "https://" + Setting.host_name + "/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 new_student_work_url_without_domain(homework_id)
+  Setting.protocol + "://" + Setting.host_name + "/student_work/new?homework=" + homework_id.to_s
+end
+
+def edit_student_work_url_without_domain(homework_id)
+  Setting.protocol + "://" + Setting.host_name + "/student_work/" + homework_id.to_s + "/edit"
+end
+
+def download_named_attachment_url_without_domain(id, filename, option={})
+  attachment_id = (Attachment === id ? id.id : id)
+  Setting.protocol + "://" + Setting.host_name + "/attachments/download/" + attachment_id.to_s + "/" + filename
+end
+
+def named_attachment_url_without_domain(id, filename, option={})
+  attachment_id = (Attachment === id ? id.id : id)
+  Setting.protocol + "://" + Setting.host_name + "/attachments/" + attachment_id.to_s + "/" + filename
+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/courses_helper.rb b/app/helpers/courses_helper.rb
index d98de27f6..37c7deb4c 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -865,7 +865,7 @@ module CoursesHelper
   # 学生按作业总分排序，取前8个
   def hero_homework_score(course, score_sort_by)
     sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
+          SELECT SUM(IF(student_works.final_score is null,null,IF(student_works.final_score = 0, 0, student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{course.id}
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/helpers/school_helper.rb b/app/helpers/school_helper.rb
index 0528cb7ac..075d2b039 100644
--- a/app/helpers/school_helper.rb
+++ b/app/helpers/school_helper.rb
@@ -1,2 +1,15 @@
 module SchoolHelper
+  def schoolMember_num school
+    count = student_num(school) + teacher_num(school)
+    count.to_s
+  end
+
+  def student_num school
+    UserExtensions.find_by_sql("SELECT * FROM user_extensions WHERE occupation = '#{school.name}' AND identity = '1'").count
+  end
+
+  def teacher_num school
+    UserExtensions.find_by_sql("SELECT * FROM user_extensions AS ue, schools AS s WHERE ue.school_id = s.id AND s.name = '#{school.name}' AND ue.identity = '0'").count
+  end
+
 end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 1cc0d3b7a..714da9920 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -90,8 +90,8 @@ class Attachment < ActiveRecord::Base
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
   before_save :files_to_final_location
-  after_save :act_as_course_activity
-  after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index
+  after_save :act_as_course_activity,:act_as_forge_activity
+  after_create :office_conver, :be_user_score,:create_attachment_ealasticsearch_index
   after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index
   after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count, :down_course_score
 
@@ -606,7 +606,7 @@ class Attachment < ActiveRecord::Base
   # Author lizanle
   # Description 上传该项目的文档资料也要保存一份在公共表中
   def act_as_forge_activity
-    if self.container_type == 'Project'
+    if self.container_type == 'Project'  && self.forge_acts.empty?
      self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                             :project_id => self.container_id)
     end
diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index 94eb097b8..96ec6e355 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,
@@ -64,16 +66,16 @@ 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
       # 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
   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/issue.rb b/app/models/issue.rb
index c82f6f0be..0d72407ba 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -84,7 +84,9 @@ class Issue < ActiveRecord::Base
   attr_reader :current_journal
   
   # fq
-  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message, :add_issues_count
+  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message,
+               act_as_at_message(:description, :author_id), :add_issues_count
+
   after_update :be_user_score,:update_activity
   after_destroy :down_user_score, :decrease_issues_count
   # after_create :be_user_score
@@ -165,12 +167,12 @@ class Issue < ActiveRecord::Base
   end
 
   # at 功能添加消息提醒
-  def act_as_at_message
-    users = self.description.scan /<span class="at" data-user-id="(\d+?)">/m
-    users && users.flatten.uniq.each do |uid|
-      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
-    end
-  end
+  # def act_as_at_message
+  #   users = self.description.scan /<span class="at" data-user-id="(\d+?)">/m
+  #   users && users.flatten.uniq.each do |uid|
+  #     self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+  #   end
+  # end
 
   # 创建issue的时候，issues_count加1
   def add_issues_count
diff --git a/app/models/journal.rb b/app/models/journal.rb
index c37b8d2c5..fd67e8a62 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -51,7 +51,7 @@ class Journal < ActiveRecord::Base
   before_create :split_private_notes, :add_journals_count
   
   # fq
-  after_save :act_as_activity,:be_user_score, :act_as_forge_message, :act_as_at_message
+  after_save :act_as_activity,:be_user_score, :act_as_forge_message, act_as_at_message(:notes, :user_id)
   after_create :update_issue_time
   # end
   #after_destroy :down_user_score
@@ -186,13 +186,6 @@ class Journal < ActiveRecord::Base
     end
   end
 
-  def act_as_at_message
-    users = self.notes.scan /<span class="at" data-user-id="(\d+?)">/m
-    users && users.flatten.uniq.each do |uid|
-      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
-    end
-  end
-
   # 更新用户分数     -by zjc
   def be_user_score
       #新建了缺陷留言且留言不为空，不为空白
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index dae779b65..fa5beb813 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -68,7 +68,9 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :at_messages, as: :at_message, dependent: :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_at_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message,
+               act_as_at_message(:notes, :user_id), :act_as_user_feedback_message,
+               :act_as_principal_activity, :act_as_student_score
   after_create :reset_counters!
   #after_update :update_activity
   after_destroy :reset_counters!
@@ -253,12 +255,7 @@ class JournalsForMessage < ActiveRecord::Base
     end
   end
 
-  def act_as_at_message
-    users = self.notes.scan /<span class="at" data-user-id="(\d+?)">/m
-    users && users.flatten.uniq.each do |uid|
-      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
-    end
-  end
+
   # 用户留言消息通知
   def act_as_user_feedback_message
     # 主留言
diff --git a/app/models/message.rb b/app/models/message.rb
index 0ddc6f8e0..d697db236 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -81,7 +81,8 @@ class Message < ActiveRecord::Base
   after_update :update_messages_board, :update_activity
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count, :down_course_score
   
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity,
+               :act_as_system_message, :send_mail, :act_as_student_score, act_as_at_message(:content, :author_id)
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -287,13 +288,6 @@ class Message < ActiveRecord::Base
     end
   end
 
-  def act_as_at_message
-    users = self.content.scan /<span class="at" data-user-id="(\d+?)">/m
-    users && users.flatten.uniq.each do |uid|
-      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
-    end
-  end
-  
   #更新用户分数     -by zjc
   def be_user_score
     #新建message且无parent的为发帖
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/models/user_actions.rb b/app/models/user_actions.rb
new file mode 100644
index 000000000..de2388911
--- /dev/null
+++ b/app/models/user_actions.rb
@@ -0,0 +1,4 @@
+class UserActions < ActiveRecord::Base
+  attr_accessible :action_id, :action_type, :user_id
+  has_many :users
+end
diff --git a/app/views/admin/course_resource_list.html.erb b/app/views/admin/course_resource_list.html.erb
index 4316555f7..2e83a96aa 100644
--- a/app/views/admin/course_resource_list.html.erb
+++ b/app/views/admin/course_resource_list.html.erb
@@ -10,16 +10,16 @@
         资源名称
       </th>
       <th style="width: 30px;">
-        资源大小
+        <%= link_to "资源大小",admin_course_resource_list_path(:sort => "file_size") %>
       </th>
       <th style="width: 25px;">
         资源类型
       </th>
       <th style="width: 23px;">
-        上传时间
+        <%= link_to "上传时间",admin_course_resource_list_path(:sort => "file_upload") %>
       </th>
       <th style="width: 15px;">
-        下载次数
+        <%= link_to "下载次数",admin_course_resource_list_path(:sort => "file_download_times") %>
       </th>
       <th style="width: 20px;">
         上传者
@@ -61,4 +61,6 @@
 
 <div class="pagination">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-</div>
\ No newline at end of file
+</div>
+
+<% html_title(l(:label_course_resource_list)) -%>
\ No newline at end of file
diff --git a/app/views/admin/excellent_courses.html.erb b/app/views/admin/excellent_courses.html.erb
index e21ba32aa..59426455a 100644
--- a/app/views/admin/excellent_courses.html.erb
+++ b/app/views/admin/excellent_courses.html.erb
@@ -72,4 +72,6 @@
     <% end %>
     </tbody>
   </table>
-</div>
\ No newline at end of file
+</div>
+
+<% html_title(l(:label_excellent_courses_list)) -%>
\ No newline at end of file
diff --git a/app/views/admin/latest_login_teachers.html.erb b/app/views/admin/latest_login_teachers.html.erb
index 05f20ba8d..c1889bce1 100644
--- a/app/views/admin/latest_login_teachers.html.erb
+++ b/app/views/admin/latest_login_teachers.html.erb
@@ -45,6 +45,9 @@
       <th style="width: 50px;">
         用户身份
       </th>
+      <th style="width: 50px;">
+        用户单位
+      </th>
     </tr>
     </thead>
     <tbody>
@@ -59,7 +62,7 @@
             <%=format_time(teacher.last_login_on) %>
           </td>
           <td align="center">
-            <%=teacher.user_id %>
+            <%= teacher.user_id %>
           </td>
           <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if teacher.try(:realname) == ' '%><%= teacher.login%><% else %><%=teacher.try(:realname) %><% end %>'>
             <% if teacher.try(:realname) == ' '%>
@@ -69,11 +72,14 @@
             <% end %>
           </td>
           <td align="center">
-            <%=link_to(teacher.login, user_path(teacher.user_id)) %>
+            <%= link_to(teacher.login, user_path(teacher.user_id)) %>
           </td>
           <td align="center">
             老师
           </td>
+          <td align="center">
+                <%= teacher.school_id.nil? ? "" : (School.find teacher.school_id).try(:name) %>
+          </td>
         </tr>
     <% end %>
     </tbody>
@@ -82,3 +88,5 @@
 <div class="pagination">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
 </div>
+
+<% html_title(l(:label_latest_login_teacher_list)) -%>
\ No newline at end of file
diff --git a/app/views/admin/latest_login_users.html.erb b/app/views/admin/latest_login_users.html.erb
index 17680a8c8..a9e8e2feb 100644
--- a/app/views/admin/latest_login_users.html.erb
+++ b/app/views/admin/latest_login_users.html.erb
@@ -46,6 +46,9 @@
       <th style="width: 50px;">
         用户身份
       </th>
+      <th style="width: 50px;">
+        用户单位
+      </th>
     </tr>
     </thead>
     <tbody>
@@ -88,6 +91,17 @@
                     <% end %>
                 <% end%>
               </td>
+              <td align="center">
+                <% unless user.user_extensions.nil? %>
+                    <% if user.user_extensions.identity.to_i == 0 %>
+                    <!--优先取school中校名，如果校名不存在就取occupation-->
+                        <% occupation = user.user_extensions.school_id.nil? ? "" : (School.where("id =?", user.user_extensions.school_id)).first.try(:name) %>
+                        <%= occupation.blank? ? user.user_extensions.occupation : occupation %>
+                    <% else %>
+                        <%= user.user_extensions.occupation %>
+                    <% end %>
+                <% end %>
+              </td>
             </tr>
         <% end %>
     </tbody>
diff --git a/app/views/admin/organization.html.erb b/app/views/admin/organization.html.erb
index 582b8b44a..02b897f80 100644
--- a/app/views/admin/organization.html.erb
+++ b/app/views/admin/organization.html.erb
@@ -40,4 +40,8 @@
   </table>
 </div>
 
-<% html_title(l(:label_project_plural)) -%>
+<ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+  <%= pagination_links_full @organization_pages, @organization_count ,:per_page_links => true, :remote => false, :flag => true %>
+</ul>
+
+<!% html_title(l(:llabel_organization_list)) -%>
diff --git a/app/views/admin/project_resource_list.html.erb b/app/views/admin/project_resource_list.html.erb
index c245f73b8..8e8bd8c92 100644
--- a/app/views/admin/project_resource_list.html.erb
+++ b/app/views/admin/project_resource_list.html.erb
@@ -10,16 +10,16 @@
         资源名称
       </th>
       <th style="width: 30px;">
-        资源大小
+        <%= link_to "资源大小",admin_project_resource_list_path(:sort => "file_size") %>
       </th>
       <th style="width: 25px;">
         资源类型
       </th>
       <th style="width: 23px;">
-        上传时间
+        <%= link_to "上传时间",admin_project_resource_list_path(:sort => "file_upload") %>
       </th>
       <th style="width: 15px;">
-        下载次数
+        <%= link_to "下载次数",admin_project_resource_list_path(:sort => "file_download_times") %>
       </th>
       <th style="width: 20px;">
         上传者
@@ -61,4 +61,6 @@
 
 <div class="pagination">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-</div>
\ No newline at end of file
+</div>
+
+<% html_title(l(:label_project_resource_list)) -%>
\ No newline at end of file
diff --git a/app/views/admin/schools.html.erb b/app/views/admin/schools.html.erb
index d19e9b3b9..f52d1f060 100644
--- a/app/views/admin/schools.html.erb
+++ b/app/views/admin/schools.html.erb
@@ -1,43 +1,64 @@
 <h3 style="float: left">
   <%=l(:label_school_plural)%>
 </h3>
-<%= form_tag({:controller => 'admin', :action => 'schools' }, :method => :get,:id=>"search_course_form") do %>
-    <%= submit_tag "搜索",:style => "float: right;margin-right: 15px;"%>
-    <input style="float: right;margin-right: 10px;" id="v_subject" placeholder="学校名称" type="text" name="school_name" value="<%= @school_name%>">
-<% end %>
+<!--<!%= form_tag({:controller => 'admin', :action => 'schools' }, :method => :get,:id=>"search_course_form") do %>-->
+   <!-- <!%= submit_tag "搜索",:style => "float: right;margin-right: 15px;"%>-->
+    <!--<input style="float: right;margin-right: 10px;" id="v_subject" placeholder="学校名称" type="text" name="school_name" value="<%= @school_name%>">-->
+<!% end %>
 <div class="cl"></div>
 
 <div class="autoscroll" style="margin-top: 40px;">
   <table class="list" style="width: 100%;table-layout: fixed">
     <thead>
     <tr>
-      <th style="width: 50px;">
+      <th style="width: 35px;">
         序号
       </th>
-      <th style="width: 100px;">
+      <th style="width: 60px;">
         LOGO
       </th>
-      <th>
+      <th style="width: 100px;">
         学校名称
       </th>
-      <th style="width: 100px;"></th>
+      <th style="width: 35px;">
+        用户数
+      </th>
+      <th style="width: 90px;">
+        创建时间
+      </th>
+      <th style="width: 80px;">
+        编辑高校信息
+      </th>
     </tr>
     </thead>
     <tbody>
-    <% @schools.each do |school|%>
+    <% @count=@page * 30 %>
+    <% @schools.each do |school| %>
         <tr class="<%= cycle("odd", "even") %>">
-          <td  style="text-align:center;vertical-align: middle;">
-            <%= school.id %>
+          <!td  style="text-align:center;vertical-align: middle;">
+            <!%= school.id %>
+          <% @count +=1 %>
+          <td align="center">
+             <%=@count %>
           </td>
+
           <td align="center">
             <%= image_tag(school.logo_link,width:40,height:40) %>
+            <!%= school.name %>
           </td>
+
           <td style="text-align:center;vertical-align: middle;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=school.name%>'>
             <span>
-              <%= link_to school.name,"http://#{Setting.host_course}/?school_id=#{school.id}" %>
+              <%= link_to school.name,"http://#{Setting.host_name}/?school_id=#{school.id}" %>
             </span>
           </td>
-          <td class="buttons" style="vertical-align: middle;">
+          <td style="vertical-align: middle;text-align:center">
+            <%= schoolMember_num(school) %>
+          </td>
+          <td style="vertical-align: middle;text-align:center">
+            <%= format_time(school.created_at) %>
+          </td>
+          <td class="buttons" style="vertical-align: middle;text-align:center">
             <%= link_to("修改",  upload_logo_school_path(school.id,:school_name => @school_name), :class => 'icon icon-copy') %>
             <%#= link_to(l(:button_delete),  organization_path(school.id), :method => :delete,:confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
           </td>
@@ -50,4 +71,4 @@
   <%= pagination_links_full @school_pages, @school_count ,:per_page_links => true, :remote => false, :flag => true %>
 </ul>
 
-<% html_title(l(:label_project_plural)) -%>
+<% html_title(l(:label_school_plural)) -%>
diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index 12aa95a16..2a757fdee 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -40,7 +40,10 @@
           <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
           <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
           <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-          <th style="width: 100px;"></th>
+          <%#= sort_header_tag('user_occupation', :caption => l(:field_occupation), :default_order => 'desc') %>
+          <th style="width: 100px;">用户单位</th>
+          <th style="width: 40px;"></th>
+          <th style="width: 40px;"></th>
         </tr>
         </thead>
         <tbody>
@@ -53,8 +56,11 @@
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td  class="buttons"> <%= change_status_link(user) %>
-                <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
+              <% occupation = user.user_extensions.identity == 0 ? School.where("id=?",user.user_extensions.school_id).first.try(:name) : user.user_extensions.occupation  %>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center" title="<%= occupation %>"> <%= truncate( occupation, :length => 12 ) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="buttons" align="center" title='<%=user.id %>'> <%= change_status_link(user) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="buttons" align="center" title='<%=user.id %>'> <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %></td>
+
             </tr>
         <% end -%>
         </tbody>
diff --git a/app/views/at/show.json.erb b/app/views/at/show.json.erb
index 5341f251e..6e2a244e4 100644
--- a/app/views/at/show.json.erb
+++ b/app/views/at/show.json.erb
@@ -1,6 +1,11 @@
 [
   <% @users && @users.each_with_index do |person,index| %>
+  <% if index == 0 %>
+  {"id":<%=index%>, "userid": "<%=person.id%>", "name": "所有人", "login": "<%=person.name%>", "searchKey": "<%=person.name%>"}
+  <%= index != @users.size-1 ? ',' : '' %>
+  <% else %>
   {"id":<%=index%>, "userid": <%=person.id%>, "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
   <%= index != @users.size-1 ? ',' : '' %>
   <% end %>
+  <% end %>
 ]
diff --git a/app/views/attachments/_attachment_history_download.html.erb b/app/views/attachments/_attachment_history_download.html.erb
new file mode 100644
index 000000000..c805960f0
--- /dev/null
+++ b/app/views/attachments/_attachment_history_download.html.erb
@@ -0,0 +1,30 @@
+<script>
+    $(document).ready(function(){
+        $(".popupClose").click(function(){
+            $(".popupWrap").css("display","none");
+        });
+    });
+</script>
+<span class="f16 fontBlue fb">选择版本 </span>
+<p class="c_red">注：该文件有历史版本，请选择您需要的文件，点击文件名下载。</p>
+<p class="fontGrey3 mb4 fb">版本及序号</p>
+
+<div style="max-height:165px; overflow-y:auto; background-color: #e3e3e3; line-height:33px;" class="p10">
+    <span class="attachment">
+      <%= link_to truncate(@attachment.filename,length: 35, omission: '...'),
+                  download_named_attachment_path(@attachment.id, @attachment.filename),
+                  :title => @attachment.filename+"\n"+@attachment.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
+    </span>
+  <span class="fr">版本号：当前</span>
+  <div class="cl"></div>
+  <% @attachment_histories.each do |history| %>
+      <span class="attachment">
+          <%= link_to truncate(history.filename,length: 35, omission: '...'),
+                    download_history_attachment_path(history.id, history.filename),
+                    :title => history.filename+"\n"+history.description.to_s,
+                    :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f14 fb link_file_a2 fl"  %>
+      </span>
+      <span class="fr">版本号：<%= history.version %></span>
+      <div class="cl"></div>
+  <% end %>
+</div>
diff --git a/app/views/attachments/attachment_history_download.js.erb b/app/views/attachments/attachment_history_download.js.erb
new file mode 100644
index 000000000..352a2ef93
--- /dev/null
+++ b/app/views/attachments/attachment_history_download.js.erb
@@ -0,0 +1,7 @@
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/attachment_history_download' )%>');
+showModal('ajax-modal', '452px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","40%").css("left","50%");
+$('#ajax-modal').parent().addClass("resourceUploadPopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file
diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index d65c0b3ab..bdbcabff0 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -2,6 +2,8 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>
 <script>
+    var onUserCard = false;
+    var onImage = false;
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
@@ -10,15 +12,24 @@
             $(".relatePInfo").css("display","none");
         })
         $(".homepagePostPortrait").mouseover(function(){
+            onImage = true;
             $(this).children(".userCard").css("display","block");
         })
         $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
+            var cur = $(this);
+            onImage = false;
+            setTimeout(function(){
+                if (onUserCard == false && onImage == false){
+                    $(cur).children(".userCard").css("display", "none");
+                }
+            }, 500);
         })
         $(".userCard").mouseover(function(){
+            onUserCard = true;
             $(this).css("display","block");
         })
         $(".userCard").mouseout(function(){
+            onUserCard = false;
             $(this).css("display","none");
         })
         $(".coursesLineGrey").mouseover(function(){
diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb
index f697383ca..a0c659493 100644
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@@ -8,11 +8,11 @@
             <div class="fl">
               <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %><div class="cl"></div> </p>
               <p class="f12">
-                <% if e_course.attachments.count > 0 %>
-                    <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
+                <% if visable_attachemnts_incourse(e_course).count > 0 %>
+                    <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to visable_attachemnts_incourse(e_course).count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
                 <% end %>
-                <% if e_course.homework_commons.count > 0 %>
-                    <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>
+                <% if e_course.homework_commons.where("publish_time <= '#{Date.today}'").count > 0 %>
+                    <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.where("publish_time <= '#{Date.today}'").count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>
                 <% end %>
                 <div class="cl"></div>
               </p>
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/_course_file.html.erb b/app/views/files/_course_file.html.erb
index b548092cf..2cf43f896 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -108,23 +108,15 @@
       <div class="cl"></div>
       <div class="re_con_top">
           <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count%></span>&nbsp;个资源</p>
-          <p class="f_r" style="color: #808080">
-            <% if @order == "asc" %>
-                按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
-                <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp;/&nbsp;
-                <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
-            <% else %>
-                按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
-                <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp; /&nbsp;
-                <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
-            <% end %>
+          <p class="f_r" style="color: #808080" id="course_filter_order">
+            <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %>
           </p>
       </div>
     </div>
     <div class="cl"></div>
   </div>
   <div  id="course_list">
-   <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}  %>
+   <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
   </div>
 </div>
 <%# html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file
diff --git a/app/views/files/_course_file_filter_order.html.erb b/app/views/files/_course_file_filter_order.html.erb
new file mode 100644
index 000000000..a740d9481
--- /dev/null
+++ b/app/views/files/_course_file_filter_order.html.erb
@@ -0,0 +1,15 @@
+<% if @order == "asc" %>
+    按&nbsp;<%= link_to "时间", search_tag_attachment_course_files_path(@course, :sort => "created_on:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey", :remote => true %>
+    <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
+    <%= link_to "下载次数", search_tag_attachment_course_files_path(@course, :sort => "downloads:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey",:remote => true %>
+    <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp;/&nbsp;
+    <%= link_to "引用次数", search_tag_attachment_course_files_path(@course, :sort => "quotes:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey", :remote => true %>
+    <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
+<% else %>
+    按&nbsp;<%= link_to "时间", search_tag_attachment_course_files_path(@course, :sort => "created_on:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q), :class => "f_b c_grey" , :remote => true %>
+    <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
+    <%= link_to "下载次数", search_tag_attachment_course_files_path(@course, :sort => "downloads:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q), :class => "f_b c_grey", :remote => true %>
+    <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp;/&nbsp;
+    <%= link_to "引用次数", search_tag_attachment_course_files_path(@course, :sort =>"quotes:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q),:class => "f_b c_grey", :remote => true %>
+    <%= render partial:'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
+<% 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 70214b721..722024a85 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -9,9 +9,17 @@
           </div>
           <div class="homepagePostDes">
             <div class="homepagePostTitle break_word mt-4">
-              <%= 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 f_l"  %>
+              <%# 如果有历史版本则提供历史版本下载 %>
+              <% if file.attachment_histories.count == 0 %>
+                  <%= 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 %>
+                  <%= link_to truncate(file.filename,length: 35, omission: '...'), attachment_history_download_path(file.id),
+                              :title => file.filename+"\n"+file.description.to_s,
+                              :class => "linkGrey3 f_14",
+                              :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %>
+              <% end %>
               <%= file_preview_eye(file, class: 'preview') %>
               <span id="image_private_<%= file.id%>">
                 <% if file.is_public? == false%>
@@ -41,11 +49,13 @@
                         <ul class="homepagePostSettiongText">
                           <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                             <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
+                          <% if file.container.try(:organization).try(:is_public?) %>
                             <li>
                               <span id="is_public_<%= file.id %>">
                                 <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
                               </span>
                             </li>
+                          <% end %>
                             <li>
                               <%= link_to( '删除资源', attachment_path(file),
                                                :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" && file.destroyable %>
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index a2a1670d1..2ee726d77 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -8,9 +8,17 @@
             </div>
             <div class="homepagePostDes">
               <div class="homepagePostTitle break_word mt-4">
-                <%= link_to 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"  %>
+                <%# 如果有历史版本则提供历史版本下载 %>
+                <% if file.attachment_histories.count == 0 %>
+                    <%= link_to 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 %>
+                    <%= link_to truncate(file.filename,length: 35, omission: '...'), attachment_history_download_path(file.id),
+                                :title => file.filename+"\n"+file.description.to_s,
+                                :class => "linkGrey3 f_14",
+                                :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %>
+                <% end %>
                 <%= file_preview_eye(file, class: 'preview') %>
                 <span id="image_private_<%= file.id%>">
                         <% if file.is_public? == false%>
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 317bb7dd8..20ffb1e50 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -6,9 +6,17 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTitle break_word mt-4">
-        <%= link_to 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"  %>
+        <%# 如果有历史版本则提供历史版本下载 %>
+        <% if file.attachment_histories.count == 0 %>
+            <%= link_to 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 %>
+            <%= link_to truncate(file.filename,length: 35, omission: '...'), attachment_history_download_path(file.id),
+                      :title => file.filename+"\n"+file.description.to_s,
+                      :class => "linkGrey3 f_14",
+                      :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %>
+        <% end %>
         <%= file_preview_eye(file, class: 'preview') %>
         <span id="image_private_<%= file.id%>">
                         <% if file.is_public? == false%>
@@ -38,31 +46,28 @@
         <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
       </div>
       <div class="homepagePostSetting">
-
         <ul>
           <li class="homepagePostSettingIcon">
             <% if User.current.logged? %>
-
                 <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
                     <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"  %>
                         <ul class="homepagePostSettiongText">
-
                           <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                           <li><%= link_to '延期发布',file_hidden_course_file_path(@course,file),:class => "postOptionLink",:remote=>true %></li>
                           <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
                           <% if @course.is_public? %>
                               <li>
-                                                    <span id="is_public_<%= file.id %>">
-                                                        <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
-                                                    </span>
+                                <span id="is_public_<%= file.id %>">
+                                  <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
+                                </span>
                               </li>
                           <%end%>
                           <li>
                             <%= link_to( '删除资源', attachment_path(file),
-                                         :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" && file.destroyable %>
+                                     :data => {:confirm => l(:text_are_you_sure)},
+                                     :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" && file.destroyable %>
                           </li>
                         </ul>
-
                     <% end %>
                 <%else%>
                     <ul class="resourceSendO">
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/files/search_tag_attachment.js.erb b/app/views/files/search_tag_attachment.js.erb
index 31df68b6a..3003d8b98 100644
--- a/app/views/files/search_tag_attachment.js.erb
+++ b/app/views/files/search_tag_attachment.js.erb
@@ -1,5 +1,6 @@
 <% if @course %>
     $("#course_list").html("<%= escape_javascript(render :partial => 'course_list',:locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach})%>");
+    $("#course_filter_order").html("<%= escape_javascript(render :partial => 'course_file_filter_order', :locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach, tag_name: @tag_name, q: @q})%>");
     $("#attachment_count").html("<%= @result.count%>")
 <% else %>
     $("#course_list").html("<%= escape_javascript(render :partial => 'project_list',:locals => {project:@project, all_attachments:@result_search_project, sort:@sort, order:@order, project_attachments:@searched_attach}) %>");
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index b9d463855..67bb4d59d 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -9,6 +9,10 @@
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
+        is_edit = <%= @is_edit.present? && @is_edit == true %>
+        if(is_edit) {
+            issueEditShow();
+        }
     });
 </script>
 <div  class="homepageRight mt0 ml10" >
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 8ab1851e4..315b1d300 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -109,7 +109,7 @@
 
   <div class="navHomepageNews">
     <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon", :target =>"_Blank", :title => "您的所有消息" %>
-    <% if User.current.count_new_message >0 %>
+    <% if User.current.count_new_message.to_i >0 %>
         <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %></div>
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
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/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 098cd39fd..1df3caab2 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -321,7 +321,7 @@
         }
 
     })
-
+    //资源库上传附件
     function course_files_upload(){
             $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>');
             showModal('ajax-modal', '513px');
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 dd83ec968..c90c69f75 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -28,6 +28,8 @@
     });
   </script>
   <script>
+      var onUserCard = false;
+      var onImage = false;
       $(document).ready(function(){
           $("#relateProject,.relatePInfo").mouseover(function(){
               $(".relatePInfo").css("display","block");
@@ -36,15 +38,24 @@
               $(".relatePInfo").css("display","none");
           })
           $(".homepagePostPortrait").mouseover(function(){
+              onImage = true;
               $(this).children(".userCard").css("display","block");
           })
           $(".homepagePostPortrait").mouseout(function(){
-              $(this).children(".userCard").css("display","none");
+              var cur = $(this);
+              onImage = false;
+              setTimeout(function(){
+                  if (onUserCard == false && onImage == false) {
+                      $(cur).children(".userCard").css("display","none");
+                  }
+              },500);
           })
           $(".userCard").mouseover(function(){
+              onUserCard = true;
               $(this).css("display","block");
           })
           $(".userCard").mouseout(function(){
+              onUserCard = false;
               $(this).css("display","none");
           })
           $(".coursesLineGrey").mouseover(function(){
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/_show_details.html.erb b/app/views/org_subfields/_show_details.html.erb
index f7f5d0748..1c103855d 100644
--- a/app/views/org_subfields/_show_details.html.erb
+++ b/app/views/org_subfields/_show_details.html.erb
@@ -1,4 +1,5 @@
 <script>
+    var onUserCard = false;
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
@@ -6,18 +7,6 @@
         $("#relateProject,.relatePInfo").mouseout(function(){
             $(".relatePInfo").css("display","none");
         })
-        $(".homepagePostPortrait").mouseover(function(){
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
-        })
-        $(".userCard").mouseover(function(){
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            $(this).css("display","none");
-        })
         $(".coursesLineGrey").mouseover(function(){
             $(this).css("color","#ffffff");
         })
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_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index c5ec9cd4a..a3e62fd16 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -6,18 +6,6 @@
         $("#relateProject,.relatePInfo").mouseout(function(){
             $(".relatePInfo").css("display","none");
         })
-        $(".homepagePostPortrait").mouseover(function(){
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
-        })
-        $(".userCard").mouseover(function(){
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            $(this).css("display","none");
-        })
         $(".coursesLineGrey").mouseover(function(){
             $(this).css("color","#ffffff");
         })
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..025bb48af 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 "模拟答题", Setting.protocol + "://" + Setting.host_name + "/users/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_url_in_org(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.protocol + "://" + 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..10d1919a2 100644
--- a/app/views/organizations/_org_course_poll.html.erb
+++ b/app/views/organizations/_org_course_poll.html.erb
@@ -16,15 +16,15 @@
                 <%= 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" >
             <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %>
             <% if has_commit %>
-                <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%>
+                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :class => "postGrey"%>
             <% else %>
-                <%= link_to poll_name, poll_path(activity.id), :class => "postGrey"%>
+                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s, :class => "postGrey"%>
             <% end %>
           </div>
           <div class="homepagePostDate fl">
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 449d95f4c..53003c85a 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -1,4 +1,6 @@
 <script>
+    var onUserCard = false;
+    var onImage = false;
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
@@ -7,15 +9,24 @@
             $(".relatePInfo").css("display","none");
         })
         $(".homepagePostPortrait").mouseover(function(){
+            onImage = true;
             $(this).children(".userCard").css("display","block");
         })
         $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
+            var cur = $(this);
+            onImage = false;
+            setTimeout(function(){
+                if (onUserCard == false && onImage == false) {
+                    $(cur).children(".userCard").css("display", "none");
+                }
+            }, 500);
         })
         $(".userCard").mouseover(function(){
+            onUserCard = true;
             $(this).css("display","block");
         })
         $(".userCard").mouseout(function(){
+            onUserCard = false;
             $(this).css("display","none");
         })
         $(".coursesLineGrey").mouseover(function(){
@@ -34,71 +45,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_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb
index f5a277634..fb22716ff 100644
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@@ -1,9 +1,9 @@
 <% members.each do |member|%>
     <ul class="orgListRow">
-      <li class="orgListUser"><a href="<%= user_path(User.find(member.user_id))%>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname  %></a></li>
+      <li class="orgListUser"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname  %></a></li>
       <li class="orgListRole">
         <%= get_org_member_role_name member %>
-        <%= form_for(member, {:as => :org_member, :remote => true, :url => org_member_path(member),
+        <%= form_for(member, {:as => :org_member, :remote => true, :url => Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,
                               :method => :put,
                               :html => {:id => "org-member-#{member.id}-roles-form", :style=>'display:none'}}
             ) do |f| %>
@@ -32,7 +32,7 @@
       </li>
         <% if ( (User.current.id == member.organization.creator_id || User.current.admin_of_org?(member.organization) ) && member.user_id != member.organization.creator_id )%>
         <a href="javascript:void(0);" style="color: #0781B4;margin-left: 30px;float: left"  onclick="$(this).parent().height(70);$('#org-member-<%= member.id%>-roles-form').show();">编辑</a>
-            <%= link_to '删除', org_member_path(member.id),:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
+            <%= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
       <div class="cl"></div>
     </ul>
 <% 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/praise_tread/_praise.html.erb b/app/views/praise_tread/_praise.html.erb
index 63b57f8a6..a1a34636f 100644
--- a/app/views/praise_tread/_praise.html.erb
+++ b/app/views/praise_tread/_praise.html.erb
@@ -1,11 +1,11 @@
 <% if PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",activity.id,activity.class.to_s,User.current.id).empty? %>
-    <a href="<%= praise_tread_praise_plus_path({:obj_id=>activity.id,:obj_type=>activity.class,:user_activity_id=>user_activity_id,:type=>type })%>" data-remote="true" class="<%=type == 'reply'? 'fr' : 'ml15' %> likeButton" title="点赞" >
+    <a href='<%= Setting.protocol+"://"+Setting.host_name+"/praise_tread/praise_plus?obj_id="+activity.id.to_s+"&obj_type="+activity.class.name+"&user_activity_id="+user_activity_id.to_s+"&type="+type.to_s %>' data-remote="true" class="<%=type == 'reply'? 'fr' : 'ml15' %> likeButton" title="点赞" >
       <span class="likeText">赞</span>
       <% num = get_praise_num(activity) %>
       <span class="likeNum"><%= num > 0 ? "（#{num}）" : "" %></span>
     </a>
 <% else %>
-    <a href="<%= praise_tread_praise_minus_path({:obj_id=>activity.id,:obj_type=>activity.class,:user_activity_id=>user_activity_id,:type=>type })%>" data-remote="true" class="<%=type == 'reply'? 'fr' : 'ml15' %> likeButton" title="取消点赞" >
+    <a href='<%= Setting.protocol+"://"+Setting.host_name+"/praise_tread/praise_minus?obj_id="+activity.id.to_s+"&obj_type="+activity.class.name+"&user_activity_id="+user_activity_id.to_s+"&type="+type.to_s %>'  data-remote="true" class="<%=type == 'reply'? 'fr' : 'ml15' %> likeButton" title="取消点赞" >
       <span class="likeText">已赞</span>
       <% num = get_praise_num(activity) %>
       <span class="likeNum"><%= num > 0 ? "（#{num}）" : "" %></span>
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index c036633a5..f9faa26d6 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -1,5 +1,7 @@
 <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <script>
+    var onUserCard = false;
+    var onImage = false;
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
@@ -8,15 +10,24 @@
             $(".relatePInfo").css("display","none");
         })
         $(".homepagePostPortrait").mouseover(function(){
+            onImage = true;
             $(this).children(".userCard").css("display","block");
         })
         $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
+            var cur = $(this);
+            onImage = false;
+            setTimeout(function(){
+                if (onUserCard == false && onImage == false) {
+                    $(cur).children(".userCard").css("display", "none");
+                }
+            }, 500);
         })
         $(".userCard").mouseover(function(){
+            onUserCard = true;
             $(this).css("display","block");
         })
         $(".userCard").mouseout(function(){
+            onUserCard = false;
             $(this).css("display","none");
         })
         $(".coursesLineGrey").mouseover(function(){
@@ -66,7 +77,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 +89,7 @@
             <% end %>
             <!--Attachment   -->
         <% when "Attachment" %>
-            <%= render :partial => 'projects/attachment_acts', :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/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index e82062e9b..733eacab4 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -21,7 +21,7 @@
         <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
         <% members.each do |member| %>
             <li >
-              <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %>
+              <%= link_to_user_header member.principal, true, :class => "w140_h c_setting_blue fl" %>
               <span class="w180_h fl">
               <!--区分中英文角色显示的不同-->
               <% if User.current.language == "zh" %>
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 07b2896eb..be6330d9b 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -4,6 +4,9 @@
         $("#pro_st_edit_ku").toggle();
     }
 </script>
+<% unless @project.repositories.any? %>
+    <p class="nodata">温馨提示：<%= l(:label_repository_no_data) %></p>
+<% end %>
 <%= str = error_messages_for 'repository' %>
 <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
 <% ip = RepositoriesHelper::REPO_IP_ADDRESS %><!--Added by tanxianbo For formatting project's path-->
@@ -87,8 +90,6 @@
       <% end %>
       </tbody>
     </table>
-<% else %>
-    <p class="nodata">温馨提示：<%= l(:label_repository_no_data) %></p>
 <% end %>
 
 
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index a58aeb281..f2b6cadeb 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -18,7 +18,7 @@
               <li><%= link_to "问题动态", {:controller => "projects", :action => "show", :type => "issue"}, :class => "homepagePostTypeMessage postTypeGrey" %></li>
               <!--<li><%#= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey" %></li>-->
               <li><%= link_to "新闻动态", {:controller => "projects", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey" %></li>
-              <!--<li><%#= link_to "资源库动态", {:controller => "projects", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey" %></li>-->
+              <li><%= link_to "资源库动态", {:controller => "projects", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey" %></li>
               <li><%= link_to "讨论区动态", {:controller => "projects", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey" %></li>
               <!--<li><%#= link_to "问卷动态", {:controller => "courses", :action => "show", :type => "poll"}, :class => "homepagePostTypeQuiz postTypeGrey" %></li>-->
             </ul>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 7477eaabd..aed741ce5 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -41,14 +41,6 @@
           <% content = activity.parent.content%>
       <% end %>
       <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
-        <% if activity.status == 1 %>
-            <span style="font-family:Calibri;font-size:10.5000pt;"><%= activity.created_on.year %></span>
-            <span style="font-size:10.5000pt;">年</span>
-            <span style="font-family:Calibri;font-size:10.5000pt;"><%= activity.created_on.month %></span>
-            <span style="font-size:10.5000pt;">月</span>
-            <span style="font-family:Calibri;font-size:10.5000pt;"><%= activity.created_on.day %></span>
-            <span style="font-size:10.5000pt;">日</span>
-        <% 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>
diff --git a/app/views/users/_homework_repository_list.html.erb b/app/views/users/_homework_repository_list.html.erb
index 99e6d4e27..678bf65d7 100644
--- a/app/views/users/_homework_repository_list.html.erb
+++ b/app/views/users/_homework_repository_list.html.erb
@@ -25,9 +25,9 @@
     <% 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 fl" ,:remote => true%>
+    <%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "fl",:remote => true%>
+    <% if @order == "publish_time"%>
+        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
     <% end%>
   </li>
 </ul>
diff --git a/app/views/users/_import_resource_info.html.erb b/app/views/users/_import_resource_info.html.erb
index bc1152ce4..0a9d92b5c 100644
--- a/app/views/users/_import_resource_info.html.erb
+++ b/app/views/users/_import_resource_info.html.erb
@@ -26,11 +26,14 @@
       <a href="<%= import_resources_user_path(User.current, :type => '6', :subfield_file_id => params[:subfield_file_id]) %>" id="public_resources_choose" class="subject-choose choose-active fl" data-remote="true">公共资源</a>
       <a href="<%= import_resources_user_path(User.current, :type => '1', :subfield_file_id => params[:subfield_file_id]) %>"  id="my_resources_choose" class="subject-choose fl" data-remote="true">我的资源</a>
   <% end %>
-  <%#= form_tag( url_for(:controller => 'users', :action => 'import_resources_search', :id => User.current.id, :type => 1),
-                :remote => true , :method => 'get',  :id => 'resource_search_form') do %>
+  <div id="user_import_resource_search">
+    <%=render :partial=>'users/user_import_resource_search', :locals => {:type => @type, :search => '', :mul_id => @resource_id, :mul_type => @resource_type} %>
+  </div>
+  <!--<%#= form_tag( url_for(:controller => 'users', :action => 'import_resources_search', :id => User.current.id), :remote => true , :method => 'get',  :id => 'resource_search_form') do %>-->
       <!--<input type="text" name="search" placeholder="输入资源关键词进行搜索" class="subjectSearch fr" />-->
-      <%#= hidden_field_tag(:type,type.nil? ? 1 : type) %>
-  <%# end %>
+      <!--<%#= hidden_field_tag(:type,type.nil? ? 1 : type) %>-->
+      <!--<%#= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :style => 'border-style:none' %>-->
+  <!--<%# end %>-->
 
   <div class="cl"></div>
 
@@ -42,25 +45,10 @@
       <li class="subjectPublisher fl">上传者</li>
       <li class="fl subjectDate">上传时间</li>
     </ul>
-    <%= form_tag( url_for({:controller => 'users', :action => 'import_into_container',
-                        :mul_id => params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id],
-                        :mul_type => params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"}),
-                        :method => 'post',  :id => 'resource_import_container_form') do %>
-      <% @attachments.each do |attach| %>
-        <ul class="subjectRow">
-          <li class="subjectName fl hidden">
-            <label>
-              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
-              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
-            </label>
-          </li>
-          <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
-          <li class="subjectCount fl hidden"><%= number_to_human_size(attach.filesize) %></li>
-          <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
-          <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
-        </ul>
-      <% end %>
-    <% end %>
+    <div id="import_resource_info_list">
+      <%= render :partial =>  'users/user_import_resource_list',:locals => {:project_id => params[:project_id], :subfield_file_id => params[:subfield_file_id], :course_id => params[:course_id]} %>
+    </div>
+
   </div>
 
   <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#resource_import_container_form').submit();hideModal()">选用</a></div>
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/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index f679f9c8c..a545038f1 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -16,7 +16,7 @@
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>
           <li style="display: none"><%= attach.author_id %></li>
-          <li class="resource-list-size fr"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
           <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
diff --git a/app/views/users/_show_detail_info.html.erb b/app/views/users/_show_detail_info.html.erb
index 3ebcab21e..7d4919149 100644
--- a/app/views/users/_show_detail_info.html.erb
+++ b/app/views/users/_show_detail_info.html.erb
@@ -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/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 0e55c246c..eb73f9226 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -9,19 +9,6 @@
         $("#relateProject,.relatePInfo").mouseout(function(){
             $(".relatePInfo").css("display","none");
         })
-        $(".homepagePostPortrait").mouseover(function(){
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
-        })
-        $(".userCard").mouseover(function(){
-
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            $(this).css("display","none");
-        })
         $(".coursesLineGrey").mouseover(function(){
             $(this).css("color","#ffffff");
         })
@@ -89,7 +76,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_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
new file mode 100644
index 000000000..f48e6c8fb
--- /dev/null
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -0,0 +1,19 @@
+<%= form_tag( url_for({:controller => 'users', :action => 'import_into_container',
+                     :mul_id => @resource_id,
+                     :mul_type => @resource_type}),
+                     :method => 'post',  :id => 'resource_import_container_form') do %>
+    <% @attachments.each do |attach| %>
+        <ul class="subjectRow">
+          <li class="subjectName fl hidden">
+            <label>
+              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
+              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
+            </label>
+          </li>
+          <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
+          <li class="subjectCount fl hidden"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
+          <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
+        </ul>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_import_resource_search.html.erb b/app/views/users/_user_import_resource_search.html.erb
new file mode 100644
index 000000000..fc86ec26e
--- /dev/null
+++ b/app/views/users/_user_import_resource_search.html.erb
@@ -0,0 +1,29 @@
+<input type="text" name="search" placeholder="输入资源关键词进行搜索" class="subjectSearch fr" />
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_hws(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for({:controller => 'users', :action => 'import_resources_search', :id => User.current.id}) %>'+'?name='+ e.target.value+'&type=<%=type %>'+'&mul_id=<%=@resource_id %>'+'&mul_type=<%=@resource_type %>',
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询项目
+    $("input[name='search']").on('input', function (e) {
+        throttle(search_hws,window,e);
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 62568d505..7de1ce417 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? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
+        <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 6bc169f21..894eedbfc 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -1,30 +1,30 @@
-<% if ma.class == UserFeedbackMessage %>
-    <% if ma.journals_for_message_type == "JournalsForMessage" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
-            <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))" %>
-          </li>
-          <div  style="display: none" class="message_title_red system_message_style" >
-            <% if ma.journals_for_message.reply_id == 0 %>
-                <%= ma.journals_for_message.notes.html_safe %>
-            <% else %>
-                <div class="fl"><strong>您的留言：</strong></div>
-                <div class="ml60"><%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %></div>
-                <div class="fl"><strong>回复内容：</strong></div>
-                <div class="ml60"><%= ma.journals_for_message.notes.html_safe %></div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
-
-        </ul>
-    <% end %>
+<% if ma.class == UserFeedbackMessage %>
+    <% if ma.journals_for_message_type == "JournalsForMessage" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <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))" %>-->
+          </li>
+          <div  style="display: none" class="message_title_red system_message_style" >
+            <% if ma.journals_for_message.reply_id == 0 %>
+                <%= ma.journals_for_message.notes.html_safe %>
+            <% else %>
+                <div class="fl"><strong>您的留言：</strong></div>
+                <div class="ml60"><%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %></div>
+                <div class="fl"><strong>回复内容：</strong></div>
+                <div class="ml60"><%= ma.journals_for_message.notes.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
+
+        </ul>
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 6eddf1e05..bea78130a 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -1,21 +1,11 @@
 <div id="users_setting">
   <div class="resourcesUploadBox mt10"><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
   <div id="search_div">
-    <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type} %>
+    <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type, :order => @order, :sort => @score, :status => @status} %>
   </div>
 </div>
 <div class="cl"></div>
-<ul class="resource-list-tab mt10">
-  <li class="resource-list-checkbox fl"> </li>
-  <li class="resource-list-name fl">资源名称</li>
-  <li class="resource-list-time fr">上传时间</li>
-  <li class="resource-list-quote fr">引用数</li>
-  <li class="resource-list-download fr">下载数</li>
-  <li class="resource-list-size fr">大小</li>
-  <li class="resource-list-uploader fr">上传者</li>
-  <li class="resource-list-type fr">类别</li>
-  <li class="resource-list-from fr">来源</li>
-</ul>
+<%= render :partial => 'users/user_resource_tip_list', :locals => { :type => @type, :status => @status} %>
 <div class="cl"></div>
 <form id="resources_list_form">
   <div id="resources_list">
@@ -23,7 +13,6 @@
   </div>
   <div class="cl"></div>
 
-
   <div class="resource-list-option fl">
     <div class="resource-check-all">
       <input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" />
diff --git a/app/views/users/_user_resource_tip_list.html.erb b/app/views/users/_user_resource_tip_list.html.erb
new file mode 100644
index 000000000..5d5876ac8
--- /dev/null
+++ b/app/views/users/_user_resource_tip_list.html.erb
@@ -0,0 +1,33 @@
+<ul class="resource-list-tab mt10" id="resource_tip_list">
+  <li class="resource-list-checkbox fl"> </li>
+  <li class="resource-list-name fl">资源名称</li>
+  <li class="resource-list-time fr">
+    <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
+    <% if @order == "created_on" %>
+        <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
+    <% end %>
+  </li>
+  <li class="resource-list-quote fr">
+    <%= link_to "引用数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "quotes"), :class => "fl", :remote => true %>
+    <% if @order == "quotes" %>
+        <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "quotes"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
+    <% end %>
+  </li>
+  <li class="resource-list-download fr">
+    <%= link_to "下载数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "fl", :remote => true %>
+    <% if @order == "downloads" %>
+        <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
+    <% end %>
+  </li>
+  <li class="resource-list-size fr">
+    <div style="margin: 0 auto; width: 40px">
+      <%= link_to "大小", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "fl", :remote => true %>
+      <% if @order == "filesize" %>
+          <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
+      <% end %>
+    </div>
+  </li>
+  <li class="resource-list-uploader fr">上传者</li>
+  <li class="resource-list-type fr">类别</li>
+  <li class="resource-list-from fr">来源</li>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_user_resource_type_filter.html.erb b/app/views/users/_user_resource_type_filter.html.erb
new file mode 100644
index 000000000..6e5ed51c3
--- /dev/null
+++ b/app/views/users/_user_resource_type_filter.html.erb
@@ -0,0 +1,29 @@
+<ul class="resourcesSelect">
+  <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+    <ul class="resourcesType">
+      <li>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 1, :search => @switch_search) %>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
+      </li>
+      <li>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 2, :search => @switch_search) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
+        <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
+      </li>
+      <li>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 3, :search => @switch_search) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
+        <%#= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), id="resource_type_project", :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
+      </li>
+      <li>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 5, :search => @switch_search) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
+        <%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
+      </li>
+      <div id="my_files_resource">
+        <% if @type != "6" %>
+            <li>
+              <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 4, :search => @switch_search) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
+              <%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
+            </li>
+        <% end %>
+      </div>
+    </ul>
+  </li>
+</ul>
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/import_resources.js.erb b/app/views/users/import_resources.js.erb
index 6244e8e64..b07f534e7 100644
--- a/app/views/users/import_resources.js.erb
+++ b/app/views/users/import_resources.js.erb
@@ -1,9 +1,9 @@
 <% if params[:project_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :project_id => params[:project_id]} ) %>');
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :project_id => params[:project_id], :mul_id => @resource_id, :mul_type => @resource_type}) %>');
 <% elsif params[:course_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :course_id => params[:course_id]} ) %>');
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :course_id => params[:course_id], :mul_id => @resource_id, :mul_type => @resource_type}) %>');
 <% elsif params[:subfield_file_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :subfield_file_id => params[:subfield_file_id]} ) %>');
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :subfield_file_id => params[:subfield_file_id], :mul_id => @resource_id, :mul_type => @resource_type}) %>');
 <% end %>
 showModal('ajax-modal', '615px');
 $('#ajax-modal').siblings().remove();
diff --git a/app/views/users/import_resources_search.js.erb b/app/views/users/import_resources_search.js.erb
index 549cf6329..928235f4c 100644
--- a/app/views/users/import_resources_search.js.erb
+++ b/app/views/users/import_resources_search.js.erb
@@ -1,25 +1,5 @@
-//$("#resources_list").html('<%#= escape_javascript( render :partial => 'users/import_resource_info' ,:locals=>{ :attachments => @attachments, :type => @type})%>');
-//$("#pages").html('<%#= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-//$("#res_all_count").html(<%#= @atta_count%>);
-//$("#res_count").html(0);
-//$("#checkboxAll").attr('checked',false);
-
-
-<% if params[:project_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :project_id => params[:project_id]} ) %>');
-<% elsif params[:course_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :course_id => params[:course_id]} ) %>');
-<% elsif params[:subfield_file_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :subfield_file_id => params[:subfield_file_id]} ) %>');
-<% end %>
-showModal('ajax-modal', '615px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-<% if params[:project_id] %>
-$('#ajax-modal').parent().css("top","10%").css("left","34%").css("border","3px solid #269ac9");
-<% else %>
-$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9");
-<% end %>
-$('#ajax-modal').parent().addClass("popbox_polls");
-
-
+$("#import_resource_info_list").html('<%= escape_javascript( render :partial => 'user_import_resource_list',
+                                    :locals => {:user => @user, :type => @type,
+                                    :mul_id => @resource_id,
+                                    :mul_type => @resource_type}) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
diff --git a/app/views/users/resource_search.js.erb b/app/views/users/resource_search.js.erb
index d295ce003..9583274c6 100644
--- a/app/views/users/resource_search.js.erb
+++ b/app/views/users/resource_search.js.erb
@@ -1,5 +1,14 @@
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
\ No newline at end of file
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file
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_resource.html.erb b/app/views/users/user_resource.html.erb
index f45eb11c2..80167db56 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -1,12 +1,8 @@
-<%= javascript_include_tag 'bootstrap'%>
+<%= javascript_include_tag 'bootstrap' %>
 <%= stylesheet_link_tag 'project' %>
 <%= stylesheet_link_tag 'leftside' %>
-<%= javascript_include_tag 'attachments'%>
-<!--<script type="text/css">-->
-<!--html,body{ overflow-y:scroll;}-->
-<!--html,body{ overflow:scroll; min-height:101%;}-->
-<!--html{ overflow:-moz-scrollbars-vertical;}-->
-<!--</script>-->
+<%= javascript_include_tag 'attachments' %>
+
 <script>
     function remote_get_resources(user_id,type){
 
@@ -21,14 +17,6 @@
         $("#resource_search_form").submit();
     }
 
-    function show_public_resource(){
-        $("#resource_remote").html('<%= escape_javascript( render :partial => 'user_resource_info' ,:locals => { :tpye => 6}) %>');
-    }
-
-    function show_public_resource(){
-        $("#resource_remote").html('<%= escape_javascript( render :partial => 'user_resource_info' ,:locals => { :tpye => 1}) %>');
-    }
-
     function closeModal()
     {
         hideModal($(".uploadBoxContainer"));
@@ -62,38 +50,16 @@
 <div>
   <ul class="resource-banner">
     <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(@user, :type => '6', :status => @status) %>" class="resource-tab resource-tab-active" id="public_resource_list" data-remote="true">公共资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '6', :status => 6) %>" class="resource-tab resource-tab-active" id="public_resource_list" data-remote="true">公共资源</a>
     </li>
     <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(@user, :type => '1', :status => @status) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
     </li>
     <li class="fl w770 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
-      <ul class="resourcesSelect">
-        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-          <ul class="resourcesType">
-            <li>
-              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 1)%>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
-            </li>
-            <li>
-              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 2) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
-              <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
-            </li>
-            <li>
-              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 3) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
-              <%#= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), id="resource_type_project", :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
-            </li>
-            <li>
-              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 5) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
-              <%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
-            </li>
-            <li>
-              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 4) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
-              <%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
-            </li>
-          </ul>
-        </li>
-      </ul>
+      <div id="user_resource_type_filter">
+        <%= render :partial => 'user_resource_type_filter' %>
+      </div>
     </li>
     <div class="cl"></div>
   </ul>
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index 4ba186579..2fa0035b2 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -1,14 +1,15 @@
 $("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form', :locals => {:user => @user, :type => @type} ) %>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' , :locals => { :attachments => @attachments}) %>');
+$("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count %>);
 
-$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6', :status => @status) %>');
-$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1', :status => @status) %>');
-
-$("#resource_type_all").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 1) %>');
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= user_resource_user_path(@user, :type => @type, :status => 1) %>');
 $("#resource_type_course").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 2) %>');
 $("#resource_type_project").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 3) %>');
 $("#resource_type_user").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 5) %>');
diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index f69057273..e818f2870 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -1,7 +1,15 @@
-
 closeModal();
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-//这里不能将翻页的更新
-$("#res_all_count").html('<%=  @atta_count%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
\ No newline at end of file
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file
diff --git a/app/views/users/user_resource_delete.js.erb b/app/views/users/user_resource_delete.js.erb
index e16abf28d..9583274c6 100644
--- a/app/views/users/user_resource_delete.js.erb
+++ b/app/views/users/user_resource_delete.js.erb
@@ -1,5 +1,14 @@
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_all_count").html('<%= @atta_count%>')
+$("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
\ No newline at end of file
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file
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/initializers/30-redmine.rb b/config/initializers/30-redmine.rb
index 5a5f7c55a..28167c014 100644
--- a/config/initializers/30-redmine.rb
+++ b/config/initializers/30-redmine.rb
@@ -1,8 +1,8 @@
 I18n.default_locale = 'en'
 I18n.backend = Redmine::I18n::Backend.new
 
-require 'redmine'
 require 'trustie'
+require 'redmine'
 
 # Load the secret token from the Redmine configuration file
 secret = Redmine::Configuration['secret_token']
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3da533eb7..033f12ad2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1523,6 +1523,9 @@ en:
   label_excellent_courses_list: excellent_courses
   label_course_resource_list: course_resource_list
   label_project_resource_list: project_resource_list
+  label_organization_list: organzation_list
+  label_latest_login_teacher_list: latest_login_teacher_list
+  label_latest_login_user_list: latest_login_teacher_list
 
   #api
   label_recently_updated_notification: Recently updated notification
@@ -1535,3 +1538,12 @@ en:
   error_upload_avatar_to_large: "too big (%{max_size})"
   not_valid_image_file: not a valid image file
 
+  #resource
+  label_resource_name: Resource_name
+  label_resource_type: Rescource_type
+  label_resource_size: Rescource_size
+  label_resource_upload_date: Resource_upload_date
+  label_resource_download_times: Resource_download_times
+  label_resource_upload_author: Resource_upload_author
+  label_resource_belongs_course: Resource_belongs_course
+  label_resource_belongs_project: Resource_belongs_project
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 37d26dbd8..d36117556 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -563,6 +563,7 @@ zh:
   label_overall_activity: 活动概览
   label_new: 新建
   label_latest_login_user_list: 最近登录用户列表
+  label_latest_login_teacher_list: 最近登录教师列表
 
   label_logged_as: 登录为
   label_environment: 环境
@@ -2111,4 +2112,14 @@ zh:
 
   # 课程推荐
   label_homework_commont: 作业
-  label_homework_recommendation: 课程推荐
\ No newline at end of file
+  label_homework_recommendation: 课程推荐
+
+  #资源
+  label_resource_name: 资源名称
+  label_resource_type: 资源类型
+  label_resource_size: 资源大小
+  label_resource_upload_date: 上传时间
+  label_resource_download_times: 下载次数
+  label_resource_upload_author: 上传者
+  label_resource_belongs_course: 所属课程
+  label_resource_belongs_project: 所属项目
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index bde12fa59..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
@@ -876,6 +877,7 @@ RedmineApp::Application.routes.draw do
   # additional routes for having the file name at the end of url
   get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'
   get 'attachments/attachment_versions/:id',:to=>'attachments#attachment_versions',:as=>'attachments_versions'
+  get 'attachments/attachment_history_download/:id',:to=>'attachments#attachment_history_download',:as=>'attachment_history_download'
   post 'attachments/upload_attachment_version',:to=>'attachments#upload_attachment_version',:as=>'upload_attachment_version'
   get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
   get 'attachments/download_history/:id/:filename', :to => 'attachments#download_history', :id => /\d+/, :filename => /.*/, :as => 'download_history_attachment'
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/20160316055201_attachment_project_count_update.rb b/db/migrate/20160316055201_attachment_project_count_update.rb
new file mode 100644
index 000000000..0f436aab2
--- /dev/null
+++ b/db/migrate/20160316055201_attachment_project_count_update.rb
@@ -0,0 +1,19 @@
+class AttachmentProjectCountUpdate < ActiveRecord::Migration
+  def up
+    Project.all.each do |project|
+      unless project.attachments.count.to_i == 0
+        attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{project.id} and container_type ='Project'").count
+        project_score = ProjectScore.where("project_id=?", project.id).first
+        if project_score.nil?
+          ProjectScore.create(:project_id => project.id, :attach_num => 0)
+        else
+          project_score.attach_num = attachment_count
+          project_score.save
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160317090350_create_user_actions.rb b/db/migrate/20160317090350_create_user_actions.rb
new file mode 100644
index 000000000..d7893fcad
--- /dev/null
+++ b/db/migrate/20160317090350_create_user_actions.rb
@@ -0,0 +1,11 @@
+class CreateUserActions < ActiveRecord::Migration
+  def change
+    create_table :user_actions do |t|
+      t.integer :user_id
+      t.string :action_type
+      t.integer :action_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index af5fe2197..2c55aad61 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,8 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160225031230) do
+ActiveRecord::Schema.define(:version => 20160317090350) do
+
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
     t.string   "act_type",                                :null => false
@@ -1781,6 +1782,14 @@ ActiveRecord::Schema.define(:version => 20160225031230) do
     t.integer "fields_bits",                 :default => 0
   end
 
+  create_table "user_actions", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "action_type"
+    t.integer  "action_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "user_activities", :force => true do |t|
     t.string   "act_type"
     t.integer  "act_id"
diff --git a/lib/trustie.rb b/lib/trustie.rb
index 2010e2d43..b7bd97de9 100644
--- a/lib/trustie.rb
+++ b/lib/trustie.rb
@@ -2,3 +2,4 @@ require 'trustie/utils'
 require 'trustie/utils/image'
 require 'trustie/gitlab/api'
 require 'trustie/grack/grack'
+require 'trustie/at/at'
diff --git a/lib/trustie/at/at.rb b/lib/trustie/at/at.rb
new file mode 100644
index 000000000..e010d4a4d
--- /dev/null
+++ b/lib/trustie/at/at.rb
@@ -0,0 +1,23 @@
+#coding=utf-8
+
+module Trustie
+  module At
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def act_as_at_message(content, send_id)
+        self.send :define_method, :act_as_at_message_func do
+          users = self[content].scan /<span class="at" data-user-id="(.+?)">/m
+          users && users.flatten.uniq.each do |uids|
+            uids.split(",").each do |uid|
+              self.at_messages << AtMessage.new(user_id: uid, sender_id: self[send_id])
+            end
+          end
+        end
+      end
+
+    end
+  end
+end
+
+ActiveRecord::Base.send(:include, Trustie::At)
\ No newline at end of file
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index fff30dec5..b5255f786 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -247,11 +247,11 @@ function regexTopicDescription()
 
 function submit_topic()
 {
-    if(regexTopicSubject() && regexTopicDescription())
-    {
+//    if(regexTopicSubject() && regexTopicDescription())
+//    {
         message_content_editor.sync();
         $("#message-form").submit();
-    }
+//    }
 }
 
 function reset_topic(){
@@ -1432,3 +1432,4 @@ function submit_course_feedback() {
 function show_more_tool(){
     $('#navContentCourse').css('display', 'block');
 }
+
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 7dd416dec..b478e2d9b 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -32,30 +32,34 @@ $(function(){
             return;
         }
 
-        $.post(
-            '/student_work/program_test',
-            {homework: homework_id, student_work_id: student_work_id, src: src, title: title, is_test: is_test},
-            function(data,status){
-                tested = true;
-                console.log(data);
-                if(data.index <=0){
-                    data.index = $('.ProResultTop').length+1;
-                }
+        $.ajax({
+            url: '/student_work/program_test',
+            type: 'POST',
+            timeout: 60*1000,
+            data: {homework: homework_id, student_work_id: student_work_id, src: src, title: title, is_test: is_test}
+        }).done(function(data){
+            tested = true;
+            console.log(data);
+            if(data.index <=0){
+                data.index = $('.ProResultTop').length+1;
+            }
+            if (typeof cb == 'function') {cb(data); return;}
+            var html=bt('t:result-list',data);
+            $('.ProResult').prepend(html);
 
-                if (typeof cb == 'function') {cb(data); return;}
-
-                
-                var html=bt('t:result-list',data);
-                $('.ProResult').prepend(html);
-
-                if (data.status==0 && is_test != 'true') {
-                    var r=confirm("答题正确，是否立刻提交?");
-                    if (r) {
-                        $(".HomeWorkCon form").submit();
-                    }
+            if (data.status==0 && is_test != 'true') {
+                var r=confirm("答题正确，是否立刻提交?");
+                if (r) {
+                    $(".HomeWorkCon form").submit();
                 }
             }
-        );
+        }).fail(function(xhr, status){
+            if(status == 'timeout'){
+                alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
+            } else {
+                alert("测试失败,服务器出错.")
+            }
+        });
     };
 
     $('#test-program-btn').on('click', test_program);
diff --git a/public/javascripts/organization.js b/public/javascripts/organization.js
index e04a8b282..7c1f3578c 100644
--- a/public/javascripts/organization.js
+++ b/public/javascripts/organization.js
@@ -3,11 +3,11 @@
  */
 function submit_topic()
 {
-    if(regexTopicSubject() && regexTopicDescription())
-    {
+//    if(regexTopicSubject() && regexTopicDescription())
+//    {
         message_content_editor.sync();
         $("#message-form").submit();
-    }
+//    }
 }
 
 function regexTopicSubject() {
@@ -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/javascripts/project.js b/public/javascripts/project.js
index c08c81054..75f6bb84e 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -618,11 +618,11 @@ function regexTopicDescription()
 }
 function submit_topic_project()
 {
-    if(regexTopicSubject() && regexTopicDescription())
-    {
+//    if(regexTopicSubject() && regexTopicDescription())
+//    {
         message_content_editor.sync();
         $("#message-form-project").submit();
-    }
+//    }
 }
 
 function reset_topic(){
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 346fc5b54..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;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 498b19df3..94e3fa85a 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -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}
@@ -1476,7 +1476,7 @@ a.choose-active {background-color:#269ac9; color:#ffffff;}
 .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:265px; height:430px; overflow-y:auto;}
+.subject-content-wrapper {border:1px solid #dddddd; border-top:none; padding:10px; width:265px; height:985px; overflow-y:auto;}
 .subject-list-type {width:50px; text-align:center;}
 .subject-list-count {width:60px; text-align:center;}
 .subject-list-from {width:145px; text-align:center;}
@@ -1486,4 +1486,4 @@ a.choose-active {background-color:#269ac9; color:#ffffff;}
 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; }
+a:hover.st_img { border:1px solid #1c9ec7; }
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 1d437a10a..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;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index b9f93ba43..0a3732ced 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -117,6 +117,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt6{ margin-top:6px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px !important;}
+.mt16{ margin-top:16px !important;}
 .mt20{margin-top: 20px;}
 .mt30{ margin-top: 30px;}
 .mt40{ margin-top: 40px;}
@@ -1131,6 +1132,8 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 
 a.group-btn{  background: url(../images/course/hwork_icon.png) -2px -58px no-repeat !important; height:20px; display:block; padding-left:23px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a.program-btn{background: url(../images/homepage_icon.png) -86px -393px no-repeat; width:30px; height:20px; display:block; padding-left:23px; color:#888888;}
-
 /*视频播放默认图标*/
 .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;}
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
diff --git a/spec/factories/user_actions.rb b/spec/factories/user_actions.rb
new file mode 100644
index 000000000..38dbed67e
--- /dev/null
+++ b/spec/factories/user_actions.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :user_action, :class => 'UserActions' do
+    user_id 1
+action_type "MyString"
+action_id 1
+  end
+
+end
diff --git a/spec/models/user_actions_spec.rb b/spec/models/user_actions_spec.rb
new file mode 100644
index 000000000..afe799fb9
--- /dev/null
+++ b/spec/models/user_actions_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe UserActions, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end