diff --git a/1234567 b/1234567
index e9cd9a1c1..08de77ab4 100644
--- a/1234567
+++ b/1234567
@@ -1 +1 @@
-{"access_token":"yFUfEXFu0_Pl_jdojoRv6eA8pmGjyRkRIL1VCB2HZ4kVJhEq6crriyCRCI-_u5QbWgtepiIOvqTHtXpKgzMuaB7Eo7MjlMcXeecqhzTjnvpivK5HUzGhZXBG1dk_BxicJAFlCAARIN","expires_in":7200,"got_token_at":1461934858}
\ No newline at end of file
+{"access_token":"bFlabz0uBcoIBfWL7nBJkgpl26aOWDy-dyCOvH_MjUo_hMOOKG83WV1cCL1MG6H-AE-6eMI0iyLoOoAMv9Y3pFFsLYD-GAGr3UH9fT8OqeHMDlFhXyRTvHv9l2QPHGpcARUcCGANEH","expires_in":7200,"got_token_at":1462934760}
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index f3b06c2d4..9f31edad1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,13 @@
 source 'https://rubygems.org/'
-### 这里执行bundle config mirror.https://rubygems.org https://gems.ruby-china.org 切换到ruby-china源
+### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
 end
 
+gem 'certified'
+
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
 gem 'gitlab', path: 'lib/gitlab-cli'
diff --git a/app/api/mobile/entities/blog_comment.rb b/app/api/mobile/entities/blog_comment.rb
index b11194b30..67904d11e 100644
--- a/app/api/mobile/entities/blog_comment.rb
+++ b/app/api/mobile/entities/blog_comment.rb
@@ -47,6 +47,7 @@ module Mobile
       blog_comment_expose :created_at
       blog_comment_expose :lasted_comment
       blog_comment_expose :id
+      blog_comment_expose :locked
       blog_comment_expose :praise_count
       expose :blog_comment_children, using:Mobile::Entities::BlogComment do |c,opt|
         if c.is_a? (::BlogComment)
diff --git a/app/api/mobile/entities/message.rb b/app/api/mobile/entities/message.rb
index 912b07e62..051c92886 100644
--- a/app/api/mobile/entities/message.rb
+++ b/app/api/mobile/entities/message.rb
@@ -51,6 +51,7 @@ module Mobile
       message_expose :replies_count
       message_expose :praise_count
       message_expose :created_on
+      message_expose :locked
       message_expose :id
       message_expose :lasted_comment
       expose :message_children,using:Mobile::Entities::Message do |c,opt|
diff --git a/app/assets/javascripts/sub_document_comments.js.coffee b/app/assets/javascripts/sub_document_comments.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/sub_document_comments.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/sub_domains.js.coffee b/app/assets/javascripts/sub_domains.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/sub_domains.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/sub_document_comments.css.scss b/app/assets/stylesheets/sub_document_comments.css.scss
new file mode 100644
index 000000000..c88f77750
--- /dev/null
+++ b/app/assets/stylesheets/sub_document_comments.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the sub_document_comments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/sub_domains.css.scss b/app/assets/stylesheets/sub_domains.css.scss
new file mode 100644
index 000000000..7a751c0d9
--- /dev/null
+++ b/app/assets/stylesheets/sub_domains.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the sub_domains controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 8ae20972c..d3f681a06 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -593,7 +593,7 @@ class AdminController < ApplicationController
     end
   end
 
-  #代码测试列表
+#代码测试列表
   def code_work_tests
     #求出所有条数
     tCount = CodeTests.count()
@@ -644,4 +644,13 @@ class AdminController < ApplicationController
       format.html
     end
   end
+  #分享作业申请
+  def apply_for_homework
+    homeworks = ApplyHomework.where("user_id != 0")
+    @homework = paginateHelper homeworks,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
 end
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 1d7e94c06..9a72bb4df 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -125,7 +125,7 @@ class BoardsController < ApplicationController
     if @order.to_i == 2
       @type = 2
       @topics.each do |topic|
-        topic[:infocount] = get_praise_num(topic) + (topic.parent ? x.parent.children.count : topic.children.count)
+        topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count)
         if topic[:infocount] < 0
           topic[:infocount] = 0
         end
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index fabacf1ba..689ef2bd7 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -11,6 +11,9 @@ class HomeworkCommonController < ApplicationController
   before_filter :member_of_course, :only => [:index]
 
   def index
+    #unless params[:page]
+    #  update_homework_time(@course.homework_commons)
+    #end
     @new_homework = HomeworkCommon.new
     @new_homework.homework_detail_manual = HomeworkDetailManual.new
     @new_homework.course = @course
@@ -400,4 +403,47 @@ class HomeworkCommonController < ApplicationController
     student_works += student_works
     student_works[index + 1 .. index + n]
   end
+
+  def update_homework_time homeworks
+    unless homeworks.nil?
+      homeworks.each do |h|
+        if h.homework_type == 3
+          student_works = h.student_work_projects.where("is_leader = 1")
+          time = h.updated_at
+          unless student_works.nil?
+            student_works.each do |s|
+              project = Project.find s.project_id
+              unless project.nil? && project.gpid.nil?
+                project_time=project.updated_on
+                project_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last
+                if format_time(time) < format_time(project_time)
+                  time = project_time
+                end
+                begin
+                  # gitlab端获取默认分支
+                  g = Gitlab.client
+                  default_branch = g.project(project.gpid).default_branch
+                  changesets = g.commits(project.gpid, :ref_name => default_branch)
+                  changesets_latest_coimmit = changesets[0]
+                  unless changesets[0].blank?
+                    if format_time(time) < format_time(changesets_latest_coimmit.created_at)
+                      time = changesets_latest_coimmit.created_at
+                    end
+                  end
+                rescue
+                  logger.error("############## ==> update homework project time")
+                end
+              end
+            end
+          end
+          puts h.updated_at
+          puts time
+          s_time = time
+          if format_time(time) > format_time(h.updated_at)
+            h.update_attribute(:updated_at, s_time)
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index d35d7ac63..76b229dbf 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -83,6 +83,8 @@ class NewsController < ApplicationController
 
         sort_type = @b_sort == 1 ? "asc" : "desc"
 
+        #scope = News.find_by_sql("select a.*,b.updated_at from news a, course_activities b where a.course_id = 532 and a.course_id = b.course_id and b.course_act_id = a.id ) ")
+
         scope = @course ? @course.news.course_visible : News.course_visible
         news_arr = scope.map{|news| news.id}
 
@@ -101,7 +103,8 @@ class NewsController < ApplicationController
         end
 
         scope_order.each do |topic|
-          topic[:updated_at] = CourseActivity.where("course_act_type='#{topic.class}' and course_act_id =#{topic.id}").first.updated_at
+          topic[:updated_at] = topic.course_acts.first.updated_at
+          #topic[:updated_at] = CourseActivity.where("course_act_type='#{topic.class}' and course_act_id =#{topic.id}").first.updated_at
         end
 
         #根据 赞+回复数排序
diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index d1a8b23dd..c6047d227 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -79,7 +79,7 @@ class OrgDocumentCommentsController < ApplicationController
 
   def add_reply
     @document = OrgDocumentComment.find(params[:id]).root
-    @act = OrgActivity.find(params[:id])
+    @act = OrgActivity.find(params[:act_id])
     @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
     @comment.content = params[:org_content]
     @document.children << @comment
diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 661073cdc..c628b25fc 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -15,6 +15,12 @@ class OrgSubfieldsController < ApplicationController
         end
       end
       @subfield.update_attributes(:field_type => params[:field_type])
+      # 如果栏目是教师，不参入类型的配置，定义为右三模式
+      # 新增模块命名规则，左边1开头，右边2开头，以前的不变
+      # eg：23 右三
+      if params[:field_type] == "Comptec"
+        @subfield.update_attributes(:status => 23)
+      end
     else
       @res = false
     end
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index f3c01f21e..c94f734e1 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -28,7 +28,7 @@ class OrganizationsController < ApplicationController
   helper :project_score
   helper :issues
   include UsersHelper
-  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout]
+  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers]
   layout 'base_org'
   def index
 
@@ -76,7 +76,7 @@ class OrganizationsController < ApplicationController
 
   def show
     # 组织新类型 show_mode：判断标准 1为新类型，0为旧
-    if @organization.show_mode == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
+    if @organization.show_mode.to_i == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         # REDO:时间紧，暂时先这样
         @org_logo_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 0 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
@@ -84,10 +84,6 @@ class OrganizationsController < ApplicationController
 
         @subfield_content = @organization.org_subfields.order("priority")
         @organization = Organization.find(params[:id])
-          # @org_subfield = OrgSubfield.find(params[:org_subfield_id])
-          # @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
-          # @org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
-
           shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
           project_ids = (@organization.projects.map(&:id)-shield_project_ids) << 0
@@ -95,35 +91,33 @@ class OrganizationsController < ApplicationController
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           @project_acts = get_project_activities_org @organization, project_ids
           @course_acts = get_course_activities_org @organization, course_ids
-          #@org_acts = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc')
-          #@project_acts = OrgActivity.where("(container_id =? and container_type =?) " +
-                                                # "or (container_type ='Project' and org_act_type in ('Issue','Message') and container_id in (#{project_ids.join(',')})) ",
-                                                # @organization.id, 'Organization').order('updated_at desc').limit(8)
-
-          #@course_acts  = OrgActivity.where("(container_id =? and container_type =?) " +
-                                               # "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
-                                              # @organization.id, 'Organization').order('updated_at desc').limit(8)
-
-
-
-        # 项目两种动态
-        #@project_acts = get_project_activities_org @organization
-
-        # 课程动态
-        #@project_acts_issues = get_project_activities_org @organization
-        #@course_acts = get_course_activities_org @organization
-
-        render :layout => 'base_org_newstyle'
+        render :layout => 'base_org2'
       else
         render_403
       end
     else
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         @organization = Organization.find(params[:id])
+        # params[:org_subfield_id] 存在即对应的栏目，否则进入组织动态
         if params[:org_subfield_id]
           @org_subfield = OrgSubfield.find(params[:org_subfield_id])
-          @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
-          @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
+          if @org_subfield.field_type == "Comptec" || @org_subfield.field_type == "Compstu"
+
+            # @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,( SELECT `courses`.* FROM `courses` INNER JOIN `members` ON `courses`.`id` = `members`.`course_id` WHERE `members`.`user_id` = u.id AND (courses.status<>9)) as course_count
+            #                               from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 order by course_count desc")
+            @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 order by course_count desc")
+            # @org_count = @org_teachers.count
+            # @limit = 25
+            # @is_remote = true
+            # @atta_count = @attachments.count
+            # @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+            # @offset ||= @atta_pages.offset
+            # #@curse_attachments_all = @all_attachments[@offset, @limit]
+            # @attachments = paginateHelper @attachments,25
+          else
+            @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
+            @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
+          end
         else
           shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
@@ -164,6 +158,57 @@ class OrganizationsController < ApplicationController
 
   end
 
+  def teachers
+    unless @organization.allow_set_teachers
+      render_403
+      return
+    end
+    q = params[:search].nil? ? "" : "#{params[:search].strip}"
+    @field = OrgSubfield.find(params[:org_subfield_id])
+    @type = params[:type]
+    if @type == "courses" || @type.nil?
+      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    elsif @type == "students"
+      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    elsif @type == "resources"
+      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from attachments where attachments.author_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    elsif @type == "famous"
+      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    end
+    limit = 10
+    # @is_remote = true
+    @teachers_count = @org_teachers.count
+    @atta_pages = Paginator.new @teachers_count, limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @org_teachers = paginateHelper @org_teachers, limit
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def searchmember_by_name  members, name
+    #searchPeopleByRoles(project, StudentRoles)
+    mems = []
+    if name != ""
+      name = name.to_s.downcase
+      members.each do |m|
+        username = m.user[:lastname].to_s.downcase + m.user[:firstname].to_s.downcase
+        if(m.user[:login].to_s.downcase.include?(name) ||  m.user.user_extensions[:student_id].to_s.downcase.include?(name) || username.include?(name))
+          mems << m
+        end
+      end
+    else
+      mems = members
+    end
+    mems
+  end
+
   def get_project_message_activities_org org
     project_ids = org.projects.map{|project| project.id}.join(",")
     unless project_ids.blank?
@@ -187,7 +232,7 @@ class OrganizationsController < ApplicationController
   def get_project_activities_org org, project_ids
     unless project_ids.blank?
       project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids.join(',')}) and container_type = 'project'
-                  and org_act_type in ('Message', 'Issue') order by updated_at desc limit 8;")
+                  and org_act_type in ('Message', 'Issue') order by updated_at desc limit 5;")
     else
       project_acts = nil
     end
@@ -198,7 +243,7 @@ class OrganizationsController < ApplicationController
   def get_course_activities_org org, course_ids
     unless course_ids.blank?
       project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids.join(',')}) and container_type = 'course'
-                  and org_act_type in ('HomeworkCommon', 'Poll',  'Message', 'News', 'Course') order by updated_at desc limit 8;")
+                  and org_act_type in ('HomeworkCommon', 'Poll',  'Message', 'News', 'Course') order by updated_at desc limit 5;")
     else
       project_acts = nil
     end
@@ -243,6 +288,7 @@ class OrganizationsController < ApplicationController
     # @organization.domain = params[:organization][:domain]
     @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == 'on' ? 1 : 0
+    @organization.allow_teacher = params[:organization][:allow_teacher] == 'on' ? 1 : 0
     @organization.show_mode = params[:show_mode]
     #@organization.name = params[:organization][:name]
     @organization.save
@@ -425,6 +471,18 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  # 设置为名师
+  def set_excellent_teacher
+    @ex_teacher = User.find(params[:user])
+    @ex_teacher.update_column(:excellent_teacher, 1)
+  end
+
+  # 取消名师
+  def reset_excellent_teacher
+    @ex_teacher = User.find(params[:user])
+    @ex_teacher.update_column(:excellent_teacher, 0)
+  end
+
   def hide_org_subfield
     @org_subfield = OrgSubfield.find(params[:org_subfield_id])
     @org_subfield.update_attribute(:hide, 1)
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index b73ecf9b9..4a148bb8b 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -32,9 +32,9 @@ class RepositoriesController < ApplicationController
 
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats]
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
-  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
+  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked, :project_archive]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -95,6 +95,13 @@ class RepositoriesController < ApplicationController
 
   end
 
+  # 一键ZIP下载
+  def project_archive
+    g = Gitlab.client
+    g.get()
+    # g.project_archive(params[:gpid].to_i, params[:rev])
+  end
+
   # 判断用户是否已经fork过该项目
   def has_forked?(project, user)
     projects = Project.where("user_id =?", user)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index cc1a1e9c7..deab2feb6 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -123,6 +123,7 @@ class StudentWorkController < ApplicationController
         #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
         resultObj[:status] = -1
         resultObj[:results] = result["results"].first  #本次测试结果
+        result["error_msg"] = result["error_msg"][0..2047]
         resultObj[:error_msg] = result["error_msg"]   #编译错误时的信息
 
         #该状态用于存入CodeTests
@@ -499,6 +500,7 @@ class StudentWorkController < ApplicationController
         render_403
         return
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count
 
     end
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -760,49 +762,64 @@ class StudentWorkController < ApplicationController
     #老师、教辅可以随时评分，学生只能在匿评作业的匿评阶段进行评分
     render_403 and return unless @is_teacher || @homework.homework_detail_manual.comment_status == 2
     @score = student_work_score @work,User.current
+    #@score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+    #@score.score = params[:score] if params[:score]
+    #if User.current.admin?
+    #  @score.reviewer_role = 1
+    #else
+    #  role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
+    #  @score.reviewer_role = get_role_by_name(role)
+    #end
+    #@is_new = false
+    @is_last_a = @work.student_works_scores.empty?
+    @new_score = StudentWorksScore.new
+    if @score && params[:score]
+      @new_score.score = params[:score].to_i == -1 ? @score.score : params[:score]
+    elsif @score.nil? && params[:score]
+      @new_score.score = params[:score].to_i == -1 ? nil : params[:score]
+    end
+    @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+    @new_score.user_id = User.current.id
+    @new_score.student_work_id = @work.id
+    if User.current.admin?
+      @new_score.reviewer_role = 1
+    else
+      role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
+      @new_score.reviewer_role = get_role_by_name(role)
+    end
     if @score
-      @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
-      @score.score = params[:score] if params[:score]
-      if User.current.admin?
-        @score.reviewer_role = 1
+      if @is_teacher
+        @is_new = true
+        @is_last_a = false
       else
-        role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
-        @score.reviewer_role = get_role_by_name(role)
+        @is_new = false
       end
-      @is_new = false
     else
-      @is_last_a = @work.student_works_scores.empty?
-      @score = StudentWorksScore.new
-      @score.score = params[:score] if params[:score]
-      @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
-      @score.user_id = User.current.id
-      @score.student_work_id = @work.id
-      if User.current.admin?
-        @score.reviewer_role = 1
-      else
-        role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
-        @score.reviewer_role = get_role_by_name(role)
-      end
       @is_new = true
     end
 
-    @score.save_attachments(params[:attachments])
-    render_attachment_warning_if_needed(@score)
+    @new_score.save_attachments(params[:attachments])
+    render_attachment_warning_if_needed(@new_score)
 
-    if @score.save
-      case @score.reviewer_role
+    if @new_score.save
+      case @new_score.reviewer_role
         when 1 #教师评分：最后一个教师评分为最终评分
-          @work.teacher_score = @score.score
+          @work.teacher_score = @new_score.score
         when 2 #教辅评分 教辅评分显示平均分
-          @work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+          #@work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+          ts_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 2 AND score IS NOT NULL ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
+          @work.teaching_asistant_score = ts_score.first.score.nil? ? nil : ts_score.first.score.try(:round, 2).to_f
         when 3 #学生评分 学生评分显示平均分
-          @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+          #@work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+          stu_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 3 ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
+          @work.student_score = stu_score.first.score.try(:round, 2).to_f
       end
       @homework.update_attributes(:updated_at => Time.now)
       update_course_activity(@homework.class,@homework.id)
       update_user_activity(@homework.class,@homework.id)
       update_org_activity(@homework.class,@homework.id)
       if @work.save
+        @work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => @work.id).first
         respond_to do |format|
           format.js
         end
@@ -835,6 +852,14 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  #提交未评分的评语
+  def add_comments_to_work
+    @work = StudentWork.find params[:id]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #为作品点赞
   def praise_student_work
     pt = PraiseTread.new
@@ -990,6 +1015,10 @@ class StudentWorkController < ApplicationController
     end
     attachment = @work.attachments.where("attachtype = 7").first
     attachment.update_attributes(:description => params[:description])
+    if attachment.attachtype == 7
+      student_work = StudentWork.find attachment.container_id
+      CourseMessage.create(:user_id => student_work.homework_common.user_id, :course_id => student_work.homework_common.course_id, :viewed => false,:course_message_id=>attachment.container_id,:course_message_type=>'StudentWork',:status=>2)
+    end
     respond_to do |format|
       format.js
     end
@@ -1147,7 +1176,7 @@ class StudentWorkController < ApplicationController
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
     if @homework.homework_type == 1 #匿评作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
+      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
                             l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
       count_row = 1
       items.each do |homework|
@@ -1157,15 +1186,16 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
         sheet1[count_row,5] = homework.name
-        sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
-        sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
-        sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
-        sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
-        sheet1[count_row,10] = format_time(homework.created_at)
+        sheet1[count_row,6] = strip_html homework.description
+        sheet1[count_row,7] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
+        sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
+        sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+        sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+        sheet1[count_row,11] = format_time(homework.created_at)
         count_row += 1
       end
     elsif @homework.homework_type == 2 #编程作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
+      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
                             l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
       count_row = 1
       items.each do |homework|
@@ -1175,12 +1205,13 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
         sheet1[count_row,5] = homework.name
-        sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
-        sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
-        sheet1[count_row,8] = homework.system_score.nil? ? l(:label_without_score) : format("%.2f",homework.system_score)
-        sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
-        sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
-        sheet1[count_row,11] = format_time(homework.created_at)
+        sheet1[count_row,6] = homework.description
+        sheet1[count_row,7] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
+        sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
+        sheet1[count_row,9] = homework.system_score.nil? ? l(:label_without_score) : homework.system_score.round(2)
+        sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+        sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+        sheet1[count_row,12] = format_time(homework.created_at)
         count_row += 1
       end
     end
diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
new file mode 100644
index 000000000..767e1ba29
--- /dev/null
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -0,0 +1,208 @@
+class SubDocumentCommentsController < ApplicationController
+  before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
+  before_filter :find_subfield_content, :only => [:show, :index]
+  helper :attachments,:organizations
+  layout 'base_sub_domain'
+
+  def new
+    @sub_document_comment = SubDocumentComment.new
+  end
+
+
+  def create
+    @sub_document_comment = SubDocumentComment.new(:sub_domain_id => params[:sub_domain_id], :creator_id => User.current.id, :org_subfield_id => params[:org_subfield_id])
+    @sub_document_comment.title = params[:sub_document_comment][:title]
+    @sub_document_comment.content = params[:sub_document_comment][:content]
+    # @sub_document_comment.save_attachments(params[:attachments])
+    if params[:field_id]
+      @sub_document_comment.org_subfield_id = params[:field_id].to_i
+    end
+    if @sub_document_comment.save
+      flash.keep[:notice] = l(:notice_successful_create)
+      redirect_to org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)
+      # EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @sub_document_comment.id, :created_at => @sub_document_comment.updated_at)
+      # if params[:field_id]
+      #   @org_subfield = OrgSubfield.find(params[:field_id])
+      #   if @org_subfield.subfield_subdomain_dir.nil?
+      #     redirect_to organization_path(@organization, :org_subfield_id => params[:field_id])
+      #   else
+      #     redirect_to show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => @org_subfield.subfield_subdomain_dir.name)
+      #   end
+      # else
+      #   redirect_to organization_org_document_comments_path(@organization)
+      # end
+    else
+      redirect_to new_org_document_comment_path(:organization_id => @organization.id)
+    end
+  end
+
+  def show
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @document = SubDocumentComment.find(params[:id])
+      respond_to do |format|
+        format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
+      end
+    else
+      render_403
+    end
+  end
+
+  def index
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @documents = @subdomain.sub_document_comments.where("parent_id is null").order("created_at desc")
+      @is_remote = true
+      @limit = 20
+      @atta_count = @documents.count
+      @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+      @offset ||= @atta_pages.offset
+      @documents = paginateHelper @documents,20
+      respond_to do |format|
+        format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
+      end
+    else
+      render_403
+    end
+  end
+
+  def update
+    @sub_document =  SubDocumentComment.find(params[:id])
+    @sub_document.update_attributes(:title => params[:sub_document_comment][:title], :content => params[:sub_document_comment][:content])
+    @organization = OrgSubfield.find(params[:org_subfield_id]).organization
+    # Attachment.attach_files(@org_document, params[:attachments])
+    # @org_document.save_attachments(params[:attachments])
+    if @sub_document.parent.nil?
+      act  = OrgActivity.where("org_act_type='SubDocumentComment' and org_act_id =?", @sub_document.id).first
+      act.update_attributes(:updated_at => @sub_document.updated_at)
+      # EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document.id, :created_at => Time.now)
+    end
+    respond_to do |format|
+      format.html {
+        if params[:flag].to_i == 0
+
+          # render :action => 'index', :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'
+          redirect_to org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => params[:org_subfield_id], :sub_domain_id => params[:sub_domain_id])
+          # render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'
+          # redirect_to organization_path(@organization)
+        else
+          redirect_to org_subfield_sub_domain_sub_document_comment_path(:org_subfield_id => params[:org_subfield_id], :sub_domain_id => params[:sub_domain_id])
+        end
+      }
+    end
+  end
+
+  def edit
+    @sub_document = SubDocumentComment.find(params[:id])
+    @flag = params[:flag]
+    render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'
+  end
+
+  def add_reply
+    @document = SubDocumentComment.find(params[:id]).root
+    @subdomain = @document.sub_domain
+    @org_subfield = @subdomain.org_subfield
+    @organization = @org_subfield.organization
+    @act = OrgActivity.find(params[:id])
+    @comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:sub_content]
+    @document.children << @comment
+    @document.save
+  end
+
+  def add_reply_in_doc
+    @document = SubDocumentComment.find(params[:id]).root
+    @subdomain = @document.sub_domain
+    @org_subfield = @subdomain.org_subfield
+    @organization = @org_subfield.organization
+    @comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain_id, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:flag] ? params[:sub_content] : params[:org_comment][:sub_content]
+    @document.children << @comment
+    @document.save
+    respond_to do |format|
+      format.html {redirect_to org_subfield_sub_domain_sub_document_comment_path(:id => @document.id, :org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)}
+    end
+  end
+
+  def destroy
+    @sub_document_comment = SubDocumentComment.find(params[:id])
+    @sub_document_comment.destroy
+  rescue ActiveRecord::RecordNotFound
+    respond_to do |format|
+      # format.html{
+      #   redirect_to org_subfield_sub_domain_sub_document_comments_path(:id => params[:sub_domain_id], :org_subfield_id => params[:org_subfield_id])
+      # }
+      format.js
+    end
+  end
+
+  def delete_reply
+    @sub_document_comment = OrgDocumentComment.find(params[:id])
+    @document = @sub_document_comment.root
+    org = @sub_document_comment.organization
+    @sub_document_comment.destroy
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+  def quote
+    @org_comment = OrgDocumentComment.find(params[:id])
+    @subject = @org_comment.content
+    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+
+    @content = "> #{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)}\n> "
+    @temp = OrgDocumentComment.new
+    #@course_id = params[:course_id]
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)} <br/>#{@org_comment.content.html_safe}</blockquote>".html_safe
+    respond_to do | format|
+      format.js
+    end
+  end
+
+  def reply
+    @document = OrgDocumentComment.find(params[:id]).root
+    @quote = params[:quote][:quote]
+    @org_document = OrgDocumentComment.new(:creator_id => User.current.id, :reply_id => params[:id])
+
+    # params[:blog_comment][:sticky] = params[:blog_comment][:sticky] || 0
+    # params[:blog_comment][:locked] =  params[:blog_comment][:locked] || 0
+    @org_document.title = params[:org_document_comment][:title]
+    @org_document.content = params[:org_document_comment][:content]
+    @org_document.content = @quote + @org_document.content
+    #@org_document.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
+    @document.children << @org_document
+    # @user_activity_id = params[:user_activity_id]
+    # user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
+    # if user_activity
+    #   user_activity.updated_at = Time.now
+    #   user_activity.save
+    # end
+    # attachments = Attachment.attach_files(@org_document, params[:attachments])
+    # render_attachment_warning_if_needed(@org_document)
+    #@article.save
+    # redirect_to user_blogs_path(:user_id=>params[:user_id])
+    respond_to do |format|
+      format.html {
+        # if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+        #   redirect_to syllabus_course_path(:id=>params[:course_id])
+        # else
+        redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)
+        # end
+
+      }
+      format.js
+    end
+  end
+
+  private
+  def find_subdomain_and_subfield
+    @subdomain = SubDomain.find(params[:sub_domain_id])
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @organization = @org_subfield.organization
+  rescue ActiveRecord::RecordNotFound
+    # source_subdomain_subfield not found
+    render_404
+  end
+
+  def find_subfield_content
+    @subfield_content = @organization.org_subfields.order("priority")
+  end
+end
diff --git a/app/controllers/sub_domains_controller.rb b/app/controllers/sub_domains_controller.rb
new file mode 100644
index 000000000..e32935789
--- /dev/null
+++ b/app/controllers/sub_domains_controller.rb
@@ -0,0 +1,63 @@
+class SubDomainsController < ApplicationController
+  layout 'base_org'
+  before_filter :find_org_subfield_and_subdomain, :only => [:show, :index, :domain_update_priority, :destroy, :update, :hide_sub_domain, :show_sub_domain]
+
+  def new
+    @subdomain = SubDomain.new
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @organization = @org_subfield.organization
+  end
+
+  def create
+    if SubDomain.where("org_subfield_id=#{params[:org_subfield_id]} and name=?",params[:name]).count == 0
+      @res = true
+      @subfield = OrgSubfield.find(params[:org_subfield_id])
+      @organization = @subfield.organization
+      @subdomain = SubDomain.create(:name => params[:name], :org_subfield_id => params[:org_subfield_id], :priority => @subfield.sub_domains.blank? ? 1 : @subfield.sub_domains.order("priority").last.priority + 1)
+      @subdomain.update_column(:field_type, params[:field_type])
+    else
+      @res = false
+    end
+  end
+
+  def update
+    @subdomain.update_column(:name, params[:name])
+  end
+
+  def domain_update_priority
+    @subdomain.update_attribute(:priority, params[:priority].to_i)
+  end
+
+  def destroy
+    @subdomain.destroy
+  end
+
+  def show
+    render_404
+    # @subfield_content = @organization.org_subfields.order("priority")
+    # render layout: @organization.switch_type ? 'base_sub_domain' : 'base_org'
+  end
+
+  def index
+
+  end
+
+  def hide_sub_domain
+    @subdomain.update_attribute(:hide, 1)
+  end
+
+  def show_sub_domain
+    @subdomain.update_attribute(:hide, 0)
+  end
+
+
+  private
+  def find_org_subfield_and_subdomain
+    @subfield = OrgSubfield.find(params[:org_subfield_id])
+    @subdomain = SubDomain.find(params[:id])
+    @organization = @subfield.organization
+  rescue ActiveRecord::RecordNotFound
+    # source_subdomain not found
+    render_404
+  end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f8bf70933..a81ade3fa 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -85,6 +85,29 @@ class UsersController < ApplicationController
   helper :issues
   include UsersHelper
 
+  #展开所有回复
+  def show_all_replies
+    @comment = JournalsForMessage.find params[:comment].to_i
+  end
+
+  #二级回复
+  def reply_to
+    case params[:type]
+      when 'HomeworkCommon'
+        @reply = JournalsForMessage.find params[:reply_id]
+        if params[:user_activity_id]
+          @user_activity_id = params[:user_activity_id]
+        else
+          @user_activity_id = -1
+        end
+        @is_in_course = params[:is_in_course]
+        @course_activity = params[:course_activity].to_i
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def refresh_changests
     if !(@user.nil?) && !(@user.memberships.nil?)
       @user.memberships.each do |member|
@@ -396,6 +419,19 @@ class UsersController < ApplicationController
   end
   # end
 
+  #引用作业请求弹框
+  def apply_homework
+    if User.current.logged?
+      @homework = HomeworkCommon.find params[:homework_id]
+      @state = 2
+    else
+      @state = 1
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #申请引用非公开作业
   def apply_for_homework
     if User.current.logged?
@@ -405,7 +441,7 @@ class UsersController < ApplicationController
         if ah.empty?
           ApplyHomework.create(:user_id => params[:id].to_i, :homework_common_id => params[:homework_id].to_i, :status => 1)
           Mailer.run.apply_for_homework_request(homework, User.current)
-          CourseMessage.create(:user_id => homework.user_id, :course_id => homework.course.id, :viewed => false,:course_message_id=>params[:homework_id].to_i,:course_message_type=>'HomeworkCommon',:status=>5,:apply_user_id=>params[:id].to_i)
+          CourseMessage.create(:user_id => homework.user_id, :course_id => homework.course.id, :viewed => false,:course_message_id=>params[:homework_id].to_i,:course_message_type=>'HomeworkCommon',:status=>5,:apply_user_id=>params[:id].to_i,:content=>params[:content])
           @state = 2
           @ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", params[:id].to_i, params[:homework_id].to_i).first
           @homework = homework
@@ -452,7 +488,7 @@ class UsersController < ApplicationController
         user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
 
         #判断当前用户在当前课程的身份
-        visibleCourse = @user.courses.empty? ? [] : @user.courses.visible
+        visibleCourse = @user.courses.empty? ? [] : @user.courses.where("is_delete = 0").visible
         homework_ids = []
         visibleCourse.each do |course|
             homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'")
@@ -473,7 +509,7 @@ class UsersController < ApplicationController
 
   def choose_user_course
     homework = HomeworkCommon.find params[:send_id].to_i
-    if homework.course.is_public == 0 && homework.user_id != User.current.id
+    if homework.user != User.current && homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course)
       ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:send_id].to_i)
       if ah.empty?
         @status = 2
@@ -586,26 +622,39 @@ class UsersController < ApplicationController
     @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     if(params[:type].blank? || params[:type] == "1") #题库
-      visible_course = Course.where("is_delete = 0")
+      if params[:is_import].to_i == 1
+        visible_course = Course.where("is_public = 1 && is_delete = 0")
+      elsif params[:is_import].to_i == 0
+        visible_course = Course.where("is_delete = 0")
+      end
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #我的题库
-      courses = @user.courses.where("is_delete = 0")
+      courses = @user.courses.where("is_delete = 1")
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id in #{course_ids}").order("#{@order} #{@b_sort}")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
     elsif params[:type] == "3" #申请题库
-      #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id)
+      none_visible_course = Course.where("is_delete = 1")
+      none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
+      #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id).order('created_at desc')
       #homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
-      #@homeworks = HomeworkCommon.where("id in #{homework_ids}")
-      sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} order by ah.created_at desc"
+      #@homeworks = HomeworkCommon.where("id in #{homework_ids} and course_id not in #{none_visible_course_ids}")
+
+      sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} and homework_commons.course_id not in #{none_visible_course_ids} order by ah.created_at desc"
       @homeworks = HomeworkCommon.find_by_sql(sql)
     end
-    if params[:property] && params[:property] == "1"
-      @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
-    elsif params[:property] && params[:property] == "2"
-      @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
-    elsif params[:property] && params[:property] == "3"
-      @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
+    if params[:property]
+      all_homework_ids = @homeworks.empty? ? "(-1)" : "(" + @homeworks.map{|h| h.id}.join(",") + ")"
+      if params[:property] == "1"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 1")
+        #@homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
+      elsif params[:property] == "2"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 2")
+        #@homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
+      elsif params[:property] == "3"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 3")
+        #@homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
+      end
     end
     @type = params[:type]
     @property = params[:property]
@@ -622,7 +671,21 @@ class UsersController < ApplicationController
   end
 
   def show_homework_detail
-    @homework = HomeworkCommon.find params[:homework].to_i
+    homework = HomeworkCommon.find params[:homework].to_i
+    if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) && User.current != homework.user
+      ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:homework].to_i)
+      if ah.empty?
+        @status = 2
+        @homework = nil
+      elsif ah.first.status != 2
+        @status = ah.first.status
+        @homework = nil
+      elsif ah.first.status == 2
+        @homework = homework
+      end
+    else
+      @homework = homework
+    end
     @is_import = params[:is_import]
     respond_to do |format|
       format.js
@@ -637,7 +700,11 @@ class UsersController < ApplicationController
     search = params[:name].to_s.strip.downcase
     type_ids = params[:property]=="" || params[:property].nil? ? "(1, 2, 3)" : "(" + params[:property] + ")"
     if(params[:type].blank? || params[:type] == "1") #全部
-      visible_course = Course.where("is_delete = 0")
+      if params[:is_import].to_i == 1
+        visible_course = Course.where("is_public = 1 && is_delete = 0")
+      elsif params[:is_import].to_i == 0
+        visible_course = Course.where("is_delete = 0")
+      end
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       all_homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'")
       all_user_ids = all_homeworks.map{|hw| hw.user_id}
@@ -652,26 +719,28 @@ class UsersController < ApplicationController
         @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and homework_type in #{type_ids} and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}")
       end
     elsif params[:type] == "2" #我的题库
-      courses = @user.courses.where("is_delete = 0")
+      courses = @user.courses.where("is_delete = 1")
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
       if @order == "course_name"
-        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id not in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
         @homeworks = HomeworkCommon.find_by_sql(sql)
       elsif @order == "user_name"
-        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
       else
-        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
       end
     elsif params[:type] == "3" #申请题库
       apply_homeworks = ApplyHomework.where("user_id = ?",@user.id)
       homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
+      none_visible_course = Course.where("is_delete = 1")
+      none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
       if @order == "course_name"
-        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.id in #{homework_ids} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where courses.is_delete = 0 and homework_commons.id in #{homework_ids} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
         @homeworks = HomeworkCommon.find_by_sql(sql)
       elsif @order == "user_name"
-        @homeworks = HomeworkCommon.where("homework_commons.id in #{homework_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+        @homeworks = HomeworkCommon.where("homework_commons.id in #{homework_ids} and course_id not in #{none_visible_course_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
       else
-        @homeworks = HomeworkCommon.where("id in #{homework_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+        @homeworks = HomeworkCommon.where("id in #{homework_ids} and (name like '%#{search}%') and course_id not in #{none_visible_course_ids} and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
       end
     end
 =begin
@@ -1208,13 +1277,13 @@ class UsersController < ApplicationController
   #显示更多用户课程
   def user_courses4show
     @page = params[:page].to_i + 1
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
+    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
 
   #显示更多用户项目
   def user_projects4show
     @page = params[:page].to_i + 1
-    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
 
   def user_course_activities
@@ -1302,7 +1371,7 @@ class UsersController < ApplicationController
     shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
     @page = params[:page] ? params[:page].to_i + 1 : 0
     user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
-    user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
+    user_course_ids = (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
     project_types = "('Message','Issue','ProjectCreateInfo')"
     principal_types = "JournalsForMessage"
@@ -2549,6 +2618,9 @@ class UsersController < ApplicationController
 
   # 获取我的资源
   def get_my_resources author_id, user_course_ids, user_project_ids, order, score
+    unless author_id.to_i.to_s == author_id
+      author_id = User.find_by_login(author_id).id
+    end
     attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('OrgSubfield','Principal','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("#{order.nil? ? 'created_on' : order} #{score}")
@@ -2556,6 +2628,7 @@ class UsersController < ApplicationController
 
   # 获取我的资源查询结果
   def get_my_resources_search (author_id, user_course_ids, user_project_ids, order, score, search)
+    author_id = User.find_by_login(author_id).id
     @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}")
@@ -2563,6 +2636,7 @@ class UsersController < ApplicationController
 
   # 获取我的课程资源
   def get_course_resources author_id, user_course_ids, order, score
+    author_id = User.find_by_login(author_id).id
     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}")
@@ -2570,6 +2644,7 @@ class UsersController < ApplicationController
 
   # 获取我的课程资源中搜索结果
   def get_course_resources_search author_id, user_course_ids, order, score, search
+    author_id = User.find_by_login(author_id).id
     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}")
@@ -2587,6 +2662,7 @@ class UsersController < ApplicationController
 
   # 获取我的项目资源
   def get_project_resources author_id, user_project_ids, order, score
+    author_id = User.find_by_login(author_id).id
     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}")
@@ -2594,6 +2670,7 @@ class UsersController < ApplicationController
 
   # 获取我的项目资源搜索
   def get_project_resources_search author_id, user_project_ids, order, score, search
+    author_id = User.find_by_login(author_id).id
     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}")
@@ -2611,12 +2688,14 @@ class UsersController < ApplicationController
 
   # 获取我上传的附件
   def get_attch_resources author_id, order, score
+    author_id = User.find_by_login(author_id).id
     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
+    author_id = User.find_by_login(author_id).id
     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
@@ -2635,11 +2714,13 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources author_id, order, score
+    author_id = User.find_by_login(author_id).id
     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
+    author_id = User.find_by_login(author_id).id
     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
 
@@ -2656,7 +2737,7 @@ class UsersController < ApplicationController
   # 资源库 分为全部  课程资源 项目资源 附件
   def user_resource
     # 别人的资源库是没有权限去看的
-    if User.current.id.to_i != params[:id].to_i
+    if User.current.id.to_i != @user.id.to_i
       render_403
       return
     end
@@ -2711,13 +2792,13 @@ class UsersController < ApplicationController
   # 导入资源
   def import_resources
     # 别人的资源库是没有权限去看的
-    if User.current.id.to_i != params[:id].to_i
+    @user = User.find_by_login(params[:id])
+    if User.current != @user
       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.is_delete == 0 && c.id}
@@ -2945,10 +3026,11 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "created_at"
+    sort_name = "updated_on"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a #{sort_type}")
+    # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
+    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
 
     #根据 作业+资源数排序
     if @order.to_i == 2
@@ -2989,10 +3071,11 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "created_on"
+    sort_name = "updated_at"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a #{sort_type}")
+    #@projects = @user.projects.visible.order("#{sort_name} #{sort_type}")
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name} ").order("#{sort_name} #{sort_type}")
 
     #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
     if @order.to_i == 2
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 0d75636f7..30f56a1d9 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -166,7 +166,7 @@ class WechatsController < ActionController::Base
        raise "非法操作, code不存在" unless params[:code]
        openid = get_openid_from_code(params[:code])
        raise "无法获取到openid" unless openid
-       raise "此微信号已绑定用户, 不能得复绑定" if user_binded?(openid)
+       raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
 
        user, last_login_on = User.try_to_login(params[:username], params[:password])
        raise "用户名或密码错误,请重新登录" unless user
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index ed350ab51..fa084e349 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -276,7 +276,7 @@ class WordsController < ApplicationController
             ids = params[:asset_id].split(',')
             update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
           end
-          @homework_common.update_column(:updated_at, Time.now)
+          @homework_common.update_column('updated_at', Time.now)
           update_course_activity(@homework_common.class,@homework_common.id)
           update_user_activity(@homework_common.class,@homework_common.id)
           update_org_activity(@homework_common.class,@homework_common.id)
@@ -296,6 +296,40 @@ class WordsController < ApplicationController
       render_403
     end
   end
+
+  #作业的二级回复
+  def reply_to_homework
+    if User.current.logged?
+      @user = User.current
+      reply = JournalsForMessage.find params[:id].to_i
+      @homework_common = HomeworkCommon.find reply.jour_id
+      if params[:reply_message].size>0 && User.current.logged? && @user
+        options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i}
+        feedback = HomeworkCommon.add_homework_jour(@user, params[:reply_message], reply.jour_id, options)
+        if (feedback.errors.empty?)
+          if params[:asset_id]
+            ids = params[:asset_id].split(',')
+            update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
+          end
+          @homework_common.update_column('updated_at', Time.now)
+          update_course_activity(@homework_common.class,@homework_common.id)
+          update_user_activity(@homework_common.class,@homework_common.id)
+          update_org_activity(@homework_common.class,@homework_common.id)
+          respond_to do |format|
+            format.js{
+              @user_activity_id = params[:user_activity_id].to_i
+              @is_in_course = params[:is_in_course].to_i
+              @course_activity = params[:course_activity].to_i
+            }
+          end
+        else
+          flash[:error] = feedback.errors.full_messages[0]
+        end
+      end
+    else
+      render_403
+    end
+  end
   
   def add_brief_introdution
     user = User.current
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d2f3ad456..229aceb1c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -33,10 +33,29 @@ module ApplicationHelper
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
 
+
+  def user_path(resource, parameters = {})
+    if Fixnum ===  resource
+      resource = User.find(resource)
+    end
+    super
+  end
+
+  # def user_blogs_path(resource,parameters={})
+  #   super
+  # end
+
+
   def update_visiti_count container
     container.update_column(:visits, container.visits + 1)
   end
 
+  def if_hidden_subdomain  field
+    domains = field.sub_domains.select{|domain| domain.hide.to_i == 0}
+    result = domains.length > 0 ? true : false
+    return result
+  end
+
   # Time 2015-03-24 15:27:29
   # Author lizanle
   # Description 从硬盘上删除对应的资源文件
@@ -2953,6 +2972,14 @@ int main(int argc, char** argv){
       return sort_projects
     end
   end
+
+  def project_sort_first projects
+    unless projects.empty?
+      project_ids = '('+projects.map{|pro|pro.project_id}.join(',')+')'
+      sort_projects = ForgeActivity.find_by_sql("SELECT updated_at,user_id, project_id FROM forge_activities WHERE project_id IN #{project_ids} ORDER BY updated_at DESC limit 1")
+      return sort_projects
+    end
+  end
 end
 
 def user_url_in_org(user_id)
@@ -2983,9 +3010,11 @@ 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, is_focus = '')
+def student_work_index_url_in_org(homework_id, is_focus = '', show_work_id = '')
   if is_focus != ''
     Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&is_focus=" + is_focus.to_s
+  elsif show_work_id != ''
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&show_work_id=" + show_work_id.to_s
   else
     Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
   end
@@ -3065,6 +3094,16 @@ def host_with_protocol
   return Setting.protocol + "://" + Setting.host_name
 end
 
+
+#获取回复的所有父节点
+def get_reply_parents parents_rely, comment
+  unless comment.parent.nil?
+    parents_rely << comment.parent
+    get_reply_parents parents_rely, comment.parent
+  end
+  parents_rely
+end
+
 #将有置顶属性的提到数组前面
 def sort_by_sticky topics
   tmpTopics = []
@@ -3208,4 +3247,4 @@ def strip_html(text,len=0,endss="...")
     end
   end
   return ss
-end
+end
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index b3b014de1..cba4fa210 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -5,17 +5,17 @@ module OrganizationsHelper
 
 
   def find_user_not_in_current_org_by_name org
-    if params[:q] && params[:q].lstrip.rstrip != ""
-      scope = Principal.active.sorted.not_member_of_org(org).like(params[:q])
-    else
-      scope = []
-    end
-    principals = paginateHelper scope,10
-    s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
-    links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
-      link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true
-    }
-    s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
+      if params[:q] && params[:q].lstrip.rstrip != ""
+        scope = Principal.active.sorted.not_member_of_org(org).like(params[:q])
+      else
+        scope = []
+      end
+      principals = paginateHelper scope,10
+      s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
+      links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
+        link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true
+      }
+      s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
   end
 
   def get_default_name field
@@ -63,14 +63,128 @@ module OrganizationsHelper
   def subfield_status_option
     type = []
     option1 = []
-    option1 << "列表"
+    option1 << "左一"
+    option1 << "1"
+    type << option1
+    # option2 = []
+    # option2 << "中一"
+    # option2 << "2"
+    # type << option2
+    option3 = []
+    option3 << "左二"
+    option3 << "3"
+    type << option3
+    option4 = []
+    option4 << "左三"
+    option4 << "4"
+    type << option4
+    option5 = []
+    option5 << "左四"
+    option5 << "5"
+    type << option5
+    option6 = []
+    option6 << "右一"
+    option6 << "6"
+    type << option6
+    option7 = []
+    option7 << "右二"
+    option7 << "7"
+    type << option7
+    option8 = []
+    option8 << "右三"
+    option8 << "8"
+    type << option8
+    type
+  end
+
+  # 课程和项目不参与某些模块的排列
+  def subfield_status_option_default
+    type = []
+    option1 = []
+    option1 << "左一"
     option1 << "1"
     type << option1
-    option2 = []
-    option2 << "图片"
-    option2 << "0"
-    type << option2
+    option3 = []
+    option3 << "左二"
+    option3 << "3"
+    type << option3
+    option4 = []
+    option4 << "左三"
+    option4 << "4"
+    type << option4
+    option6 = []
+    option6 << "右一"
+    option6 << "6"
+    type << option6
     type
   end
 
+  def subfield_list_type subfield
+    case subfield.to_i
+      when 1
+        resulet = "左一"
+      when 2
+        resulet = "左二"
+      when 3
+        resulet = "左二"
+      when 4
+        resulet = "左三"
+      when 5
+        resulet = "左四"
+      when 6
+        resulet = "右一"
+      when 7
+        resulet = "右二"
+      when 8
+        resulet = "右三"
+    end
+  end
+
+
+  def get_subfield_acts field
+    org_subfield = OrgSubfield.find(field.id)
+    org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0
+    org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc')
+    org_acts
+  end
+
+  def org_subfield_had_created?(org, type)
+    sub_field = org.org_subfields.select{|subfield| subfield.field_type == type}
+    result = sub_field.length > 0 ? true : false
+    result
+  end
+
+  def org_subfield_type(field)
+    case field.field_type
+      when "Post"
+        result = "帖子"
+      when "Resource"
+        result = "资源"
+      when "Compstu"
+        result = "学生"
+      when "Comptec"
+        result = "教师"
+      when "Complex"
+        result = "综合"
+    end
+  end
+
+  def org_teacher_resource_count user
+    results = Attachment.find_by_sql("SELECT * FROM attachments where author_id = #{user.id};").count
+  end
+
+  def org_teacher_course_count user
+    results = Course.find_by_sql("select * from courses where courses.tea_id = #{user.id}").count
+  end
+
+  def org_student_course_count user
+    course_ids = user.courses.map { |c| c.is_delete == 0 && c.id}
+    results = Member.find_by_sql("select id from courses where courses.tea_id = #{user.id}").count
+  end
+
+  def excellent_teachers
+    User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 order by course_count desc").first(5)
+  end
+
 end
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index 4e11e153e..74788751b 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -23,7 +23,7 @@ module StudentWorkHelper
 
   #获取指定用户对某一作业的评分结果
   def student_work_score work,user
-    StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).first
+    StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).last
   end
 
   #获取指定评分的角色
diff --git a/app/helpers/sub_document_comments_helper.rb b/app/helpers/sub_document_comments_helper.rb
new file mode 100644
index 000000000..c1f2a4de1
--- /dev/null
+++ b/app/helpers/sub_document_comments_helper.rb
@@ -0,0 +1,2 @@
+module SubDocumentCommentsHelper
+end
diff --git a/app/helpers/sub_domains_helper.rb b/app/helpers/sub_domains_helper.rb
new file mode 100644
index 000000000..ee1c18e71
--- /dev/null
+++ b/app/helpers/sub_domains_helper.rb
@@ -0,0 +1,5 @@
+module SubDomainsHelper
+  include OrganizationsHelper
+
+
+end
diff --git a/app/models/apply_homework.rb b/app/models/apply_homework.rb
index 0a7c505a4..f4ded9733 100644
--- a/app/models/apply_homework.rb
+++ b/app/models/apply_homework.rb
@@ -1,5 +1,5 @@
 class ApplyHomework < ActiveRecord::Base
-  #status：1. 待审核 2.审核通过 3.已拒绝
+  #status：1. 等待回复 2.审核通过 3.已拒绝
   belongs_to :user
   belongs_to :homework_common
   attr_accessible :status, :user_id, :homework_common_id
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 754bd4dee..b3f5ce4ed 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -301,7 +301,7 @@ class Attachment < ActiveRecord::Base
     nil
   end
 
-    def filename=(arg)
+  def filename=(arg)
     write_attribute :filename, sanitize_filename(arg.to_s)
     filename
   end
diff --git a/app/models/course_message.rb b/app/models/course_message.rb
index 07bfb22de..703da936b 100644
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@@ -15,7 +15,7 @@ class CourseMessage < ActiveRecord::Base
   validates :course_id,presence: true
   validates :course_message_id,presence: true
   validates :course_message_type, presence: true
-  validates_length_of :content, :maximum => 100
+  #validates_length_of :content, :maximum => 100
   after_create :add_user_message
 
   def add_user_message
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index dae910d60..998ace441 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -18,6 +18,7 @@ class HomeworkCommon < ActiveRecord::Base
   has_many :student_works, :dependent => :destroy, :conditions => "is_test=0"
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+  has_many :apply_homeworks, :dependent => :destroy
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 79ddcd917..d5d148117 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -262,7 +262,7 @@ class Issue < ActiveRecord::Base
       # set default values for new records only
       self.status ||= IssueStatus.default
       self.priority ||= IssuePriority.default
-      self.watcher_user_ids = []
+      # self.watcher_user_ids = []
     end
   end
 
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 10971d46f..4b5ac227f 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -256,6 +256,11 @@ class JournalsForMessage < ActiveRecord::Base
       end
     end
     if self.jour_type == 'HomeworkCommon'
+      if self.m_parent_id.nil?
+        if self.user_id != self.jour.user_id
+          self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.course.id, :viewed => false)
+        end
+      end
       count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.jour.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
       if count == 0
         ws = WechatService.new
diff --git a/app/models/news.rb b/app/models/news.rb
index 1a2205f48..f0457dc81 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -62,7 +62,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index 8cec49686..1151426e3 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -7,6 +7,7 @@ class OrgSubfield < ActiveRecord::Base
   has_many :messages, :through => :org_subfield_messages
   has_many :boards, :dependent => :destroy
   has_many :news, :dependent => :destroy
+  has_many :sub_domains, :dependent => :destroy
   acts_as_attachable
   after_create :create_board_sync
   after_destroy :update_priority
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 427cd4c10..311a37bf8 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -22,4 +22,12 @@ class Organization < ActiveRecord::Base
     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
+
+  def switch_type
+    self.show_mode.to_i == 1 ? true : false
+  end
+
+  def allow_set_teachers
+    self.allow_teacher.to_i == 1 ? true : false
+  end
 end
diff --git a/app/models/school.rb b/app/models/school.rb
index 6cafb0473..b9a1d88cb 100644
--- a/app/models/school.rb
+++ b/app/models/school.rb
@@ -5,4 +5,5 @@ class School < ActiveRecord::Base
   def to_s
   	self.name.to_s
   end
+
 end
diff --git a/app/models/student_works_score.rb b/app/models/student_works_score.rb
index aa38c5dcd..b2fc4fdcd 100644
--- a/app/models/student_works_score.rb
+++ b/app/models/student_works_score.rb
@@ -18,17 +18,29 @@ class StudentWorksScore < ActiveRecord::Base
       receiver = self.student_work.user
       # 判断是第一次评阅还是更新 status:0 新建；1 更新
       if self.created_at == self.updated_at
-        if self.comment.nil?
+        if self.comment.nil? && self.score
           self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
                                                        :viewed => false, :content => "作业评分：#{self.score}", :status=> false)
+        elsif self.score.nil? && self.comment
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "评语：#{self.comment}", :status=> false)
+        elsif self.comment.nil? && self.score.nil?
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "上传了批阅附件", :status=> false)
         else
           self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
                                                     :viewed => false, :content => "作业评分：#{self.score}&nbsp;&nbsp;&nbsp; 评语：#{self.comment}", :status=> false)
         end
       else # 更新
-        if self.comment.nil?
+        if self.comment.nil? && self.score
           self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
                                                        :viewed => false, :content => "作业评分：#{self.score}", :status=> true)
+        elsif self.score.nil? && self.comment
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "评语：#{self.comment}", :status=> true)
+        elsif self.comment.nil? && self.score.nil?
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "上传了批阅附件", :status=> true)
         else
           self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
                                                        :viewed => false, :content => "作业评分：#{self.score}&nbsp;&nbsp;&nbsp; 评语：#{self.comment}", :status=> true)
diff --git a/app/models/sub_document_comment.rb b/app/models/sub_document_comment.rb
new file mode 100644
index 000000000..799fed7ce
--- /dev/null
+++ b/app/models/sub_document_comment.rb
@@ -0,0 +1,33 @@
+class SubDocumentComment < ActiveRecord::Base
+  attr_accessible :content, :creator_id, :locked, :org_subfield_id, :parent_id, :reply_id, :sticky, :sub_domain_id, :title
+
+  include Redmine::SafeAttributes
+  include ApplicationHelper
+  belongs_to :sub_domain
+  belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
+  acts_as_tree :order => "#{SubDocumentComment.table_name}.sticky asc, #{SubDocumentComment.table_name}.created_at desc"
+  acts_as_attachable
+  has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy
+  after_create :document_save_as_sub_activity
+  after_update :update_activity
+  validates_presence_of :content
+
+  #动态的更新
+  private
+  def update_activity
+    org_activity = OrgActivity.where("org_act_type='SubDocumentComment' and org_act_id =?", id).first
+    if org_activity
+      org_activity.updated_at = Time.now
+      org_activity.save
+    end
+  end
+
+  def document_save_as_sub_activity
+    if(self.parent().nil?)
+      self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.sub_domain.id, :container_type => 'SubDomain')
+    else
+      act = OrgActivity.where("org_act_type='SubDocumentComment' and org_act_id =?", self.root.id).first
+      act.update_attributes(:updated_at => self.updated_at)
+    end
+  end
+end
diff --git a/app/models/sub_domain.rb b/app/models/sub_domain.rb
new file mode 100644
index 000000000..0ae325e1a
--- /dev/null
+++ b/app/models/sub_domain.rb
@@ -0,0 +1,5 @@
+class SubDomain < ActiveRecord::Base
+  attr_accessible :field_type, :hide, :name, :org_subfield_id, :priority, :status
+  belongs_to :org_subfield, :foreign_key => :org_subfield_id
+  has_many :sub_document_comments, :dependent => :destroy
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 9b8cb2b8d..035aff625 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -108,6 +108,7 @@ class User < Principal
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
   has_many :student_work_projects, :dependent => :destroy
+  has_many :apply_homeworks, :dependent => :destroy
   #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
@@ -308,6 +309,20 @@ class User < Principal
   end
 
   # ======================================================================
+  def my_workplace
+    self.user_extensions.try(:occupation).to_s
+  end
+
+  def my_blogs_count
+    self.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count
+  end
+
+  def my_students
+    my_students=StudentsForCourse.find_by_sql("SELECT SUM(student_count) as students_count, c.tea_id FROM courses c, (SELECT course_id , COUNT(id) AS student_count FROM students_for_courses GROUP BY course_id) AS ct
+                                 WHERE c.id= ct.course_id and c.tea_id = #{self.id} GROUP BY c.tea_id").first
+    results = my_students.blank? ? 0 : my_students.students_count
+    results
+  end
 
   # 查询用户未读过的记录
   # 用户留言记录
@@ -1072,16 +1087,25 @@ class User < Principal
     anonymous_user
   end
 
+  def self.is_id?(id)
+    Fixnum===id || id.to_i.to_s == id
+  end
+
   # refactor User model find function,
   # return anonymous user when can not find user id = user_id
   def self.find (*args, &block)
     begin
+      return find_by_login(args.first) if args.size==1 && !is_id?(args.first)
       super
     rescue
       self.anonymous
     end
     # super
   end
+
+  def to_param
+    login
+  end
   # Salts all existing unsalted passwords
   # It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
   # This method is used in the SaltPasswords migration and is to be kept as is
diff --git a/app/views/admin/apply_for_homework.html.erb b/app/views/admin/apply_for_homework.html.erb
new file mode 100644
index 000000000..25d15f707
--- /dev/null
+++ b/app/views/admin/apply_for_homework.html.erb
@@ -0,0 +1,89 @@
+<h3>
+  <%=l(:label_apply_homework)%>
+</h3>
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 120px;">
+        作业名称
+      </th>
+      <th style="width: 120px;">
+        课程名称
+      </th>
+      <th style="width: 50px;">
+        作者
+      </th>
+      <th style="width: 50px;">
+        申请者
+      </th>
+      <th style="width: 50px;">
+        申请状态
+      </th>
+      <th style="width: 70px;">
+        申请日期
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <%@count=@page*30 %>
+    <% for homework in @homework do %>
+        <% unless homework.nil? %>
+            <% @count+=1 %>
+            <tr>
+              <td align="center">
+                <%=@count %>
+              </td>
+              <% c_h = HomeworkCommon.find homework.homework_common_id %>
+              <% if c_h %>
+                  <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=c_h.name%>'>
+                    <%=link_to(c_h.try(:name), student_work_index_path(:homework => c_h.id))%>
+                  </td>
+                  <% if c_h.course %>
+                      <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=c_h.course.name%>'>
+                        <%= link_to(c_h.course.name, course_path(c_h.course.id)) %>
+                      </td>
+                  <% end %>
+                  <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if c_h.try(:user).try(:realname) == ' '%><%= c_h.try(:user)%><% else %><%=c_h.try(:user).try(:realname) %><% end %>'>
+                    <% if c_h.try(:user).try(:realname) == ' '%>
+                        <%= link_to(c_h.try(:user), user_path(c_h.user_id)) %>
+                    <% else %>
+                        <%= link_to(c_h.try(:user).try(:realname), user_path(c_h.user_id)) %>
+                    <% end %>
+                  </td>
+              <% end %>
+              <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if homework.try(:user).try(:realname) == ' '%><%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
+                <% if homework.try(:user).try(:realname) == ' '%>
+                    <%= link_to(homework.try(:user), user_path(homework.user_id)) %>
+                <% else %>
+                    <%= link_to(homework.try(:user).try(:realname), user_path(homework.user_id)) %>
+                <% end %>
+              </td>
+              <td align="center">
+                <% if homework.status == 1 %>
+                    等待回复
+                <% elsif homework.status == 2 %>
+                    已通过
+                <% else %>
+                    已拒绝
+                <% end %>
+              </td>
+              <td align="center">
+                <%=format_date( homework.created_at ) %>
+              </td>
+            </tr>
+        <% end %>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_apply_homework)) -%>
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 7a1dc636c..f0b082860 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -16,6 +16,7 @@
         <div class="cl"></div>
       </div>
       <div class="bloglistbox">
+        <% if topics.any? %>
         <% topics.each do |activity| %>
             <ul class="list-file">
               <li><span class="item_list fl"></span>
@@ -61,6 +62,9 @@
           </ul>
           <div class="cl"></div>
         </div>
+        <% else %>
+            <p class="nodata"><%= l(:label_no_data) %></p>
+        <% end %>
       </div>
     </div>
 </div>
diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index 3deb04f6c..df61d2b9c 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -2,6 +2,7 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 <script type="text/javascript">
+    var first_click = true;
     function nh_check_field(params){
         var result=true;
         if(!regexTopicSubject()) {
@@ -49,10 +50,12 @@
              contentmsg:params.contentmsg,
              textarea:params.textarea
              });
-            if(is_checked){
+            if(first_click && is_checked){
                 if(flag){
+                    first_click = false;
                     return true;
                 }else{
+                    first_click = false;
                     $(this)[0].submit();
                     return false;
                 }
diff --git a/app/views/courses/_course_outlines_list.html.erb b/app/views/courses/_course_outlines_list.html.erb
index 42ce30113..2786e59bd 100644
--- a/app/views/courses/_course_outlines_list.html.erb
+++ b/app/views/courses/_course_outlines_list.html.erb
@@ -18,7 +18,7 @@
               <li class="fl">
                 <input name="outline_id" type="radio" value="<%= article.id%>" class="courseSendCheckbox"/>
               </li>
-              <li class="blogTitle fl"><%= article.title%></li>
+              <li class="blogTitle fl mw220"><%= article.title%></li>
             </ul>
             <div class="homeworkPublishTime">发布时间：<%= format_date(article.created_at)%></div>
         <% end %>
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 9875ec9b7..dc2509c77 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -9,7 +9,7 @@
           <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
           <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();">
-          <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>
+          <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
         </li>
         <div class="cl"></div>
         <li  class="ml45">
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index ec099cb09..f8fe7896c 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -87,10 +87,19 @@
         var standard_ans = $.trim($("#question_standard_ans").val());
         if(title.length == 0 || score.length == 0){
             alert("题目标题/分数不能为空");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else if(!/^[1-9][0-9]*$/.test(score)) {
             alert("分数必须是非零开头的数字");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else if(quest_type !=3 && standard_ans.length == 0) {
             alert("标准答案不能为空");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else{
             doc.parent().parent().parent().submit();}
     }
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index 6fd6c201e..43628f104 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -54,9 +54,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+  $(function(){
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this),1);
+      });
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index a24835fc1..875b9ec4c 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -54,9 +54,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question").one('click', function(){
+            add_poll_question($(this),2);
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index 6180dac8e..24a0ad047 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -42,9 +42,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question").one('click', function(){
+            add_poll_question($(this),3);
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index eef7546e5..99c48a3ab 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -90,7 +90,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -102,6 +102,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),1);
+                });
                 }
        }
         else {
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 9e66f17f9..a7ee60aa3 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -89,7 +89,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -101,6 +101,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),2);
+                });
         }
         }else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index 90f604da1..e559805fe 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -65,7 +65,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -77,6 +77,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),3);
+                });
             }
         } else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index 3bcd6b83f..d7a1b85bb 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -50,29 +50,19 @@
         }*/
     </script>
     <ul class="hworkListRow" id="student_work_<%= exercise.id%>">
-      <li class="hworkList340 width530">
-        <ul>
-          <li class="hworkPortrait mt15 mr10">
-            <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %>
-          </li>
-          <div id="show_student_result_div_<%= exercise.id%>" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
-            <li>
-              <ul class="mt10 fl">
-                <li class="hworkStName mr15 mt16" title="姓名" id="student_name_<%= exercise.id%>">
-                  <%=exercise.user.show_name %>
-                </li>
-                <li class="hworkStID mr10 mt16" title="学号" id="student_id_<%= exercise.id%>">
-                  <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
-                </li>
-                <li class="hworkStID mt16" title="班级"  id="student_class_<%= exercise.id%>">
-                  --
-                </li>
-              </ul>
-            </li>
-          </div>
-        </ul>
+      <li class="ml5 mr5" style="width:28px; text-align:center;">1</li>
+      <li class="hworkPortrait mt15 mr10">
+        <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(exercise.user)) %>
       </li>
-      <li class="hworkList130 c_grey student_work_<%= exercise.id%>">
+      <li class="hworkStName" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
+        <%=exercise.user.show_name %>
+      </li><li class="hworkStID pl15 pr10" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
+      <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
+    </li>
+      <li class="hworkStID" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
+        --
+      </li>
+      <li class="hworkList130 ml200 c_grey student_work_<%= exercise.id%>">
         <% if exercise.created_at%>
             <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
             <% if @exercise.end_time <= exercise.created_at %>
diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index 719667973..8957c5048 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -1,5 +1,6 @@
 <ul class="hworkUl">
   <li class="hworkList340 hworkH30 width530">
+    <span class="c_dark f14 fb fl mr5">序号</span>
     <span class="c_dark f14 fb fl mr55">&nbsp;&nbsp;</span>
     <span class="c_dark f14 fb fl mr60">姓名</span>
     <span class="c_dark f14 fb fl mr60">学号</span>
diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb
index 93df27e42..08c030f90 100644
--- a/app/views/forums/_show_topics.html.erb
+++ b/app/views/forums/_show_topics.html.erb
@@ -29,7 +29,9 @@
             <div class="cl"></div>
           </div>
       <% end %>
-
+      <ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+        <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
+      </ul>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index b0ed5a60c..61ffb8b10 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -41,9 +41,6 @@
   <div id="topics_list">
     <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%>
   </div>
-  <ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
-    <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
-  </ul>
 
   <!--<div class="pageRoll">-->
     <!--<div class="pageCell"><a href="javascript:void(0);" class="linkBlue">上一页</a></div>-->
@@ -112,11 +109,13 @@
         <% end %>
     });
 
+    var first_click = true;
     function check_and_submit(){
         if(!check_memo_name()){
             return;
         }
-        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
+        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){
+            first_click = false;
             memo_content.sync();
             $.ajax({
                 url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
diff --git a/app/views/forums/show.js.erb b/app/views/forums/show.js.erb
index 9e36215ac..48b1474cb 100644
--- a/app/views/forums/show.js.erb
+++ b/app/views/forums/show.js.erb
@@ -1,2 +1 @@
 $("#topics_list").html("<%= escape_javascript(render :partial => 'show_topics',:locals => {:memos=>@memos})%>")
-$("#pages").html('<%= pagination_links_full @topic_pages, @topic_count,:per_page_links => false,:remote =>true%>');
\ No newline at end of file
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 1e0f46926..ff18e68bd 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -84,10 +84,10 @@
 <% end%>
 
 <script type="text/javascript">
-    var coursecount = <%= @user.courses.visible.where("is_delete =?", 0).select("courses.* FROM `course_activities` WHERE course_activities.course_id = courses.id) ").count %>;
+    var coursecount = <%= @user.courses.visible.where("is_delete =?", 0).count %>;
     var courseshowcount = document.getElementsByClassName("coursesLineGrey").length;
 
-    if((coursecount == courseshowcount)&&(coursecount > 5) ){
+    if((coursecount <= courseshowcount)&&(coursecount > 5) ){
         $("#user_show_more_course").hide();
         $('#user_hide_course').show();
     }
diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
index ef40a6fa1..16100a353 100644
--- a/app/views/layouts/_user_projects.html.erb
+++ b/app/views/layouts/_user_projects.html.erb
@@ -64,10 +64,10 @@
 <% end%>
 
 <script type="text/javascript">
-    var projectcount = <%= @user.projects.visible.select("projects.* FROM `forge_activities` WHERE forge_activities.project_id = projects.id) ").count %>;
+    var projectcount = <%= @user.projects.visible.count %>;
     var projectshowcount = document.getElementsByClassName("projectsLineGrey").length;
 
-    if((projectcount == projectshowcount)&&(projectcount > 5)){
+    if((projectcount <= projectshowcount)&&(projectcount > 5)){
         $("#user_show_more_project").hide();
         $('#user_hide_project').show();
     }
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index b2cfa9877..2a33a8acd 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -134,6 +134,7 @@
       </div>
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+
       </div>
       <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %></div>
     </div>
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index fc550c90f..9b481fac5 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -1,192 +1,236 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <title><%= h html_title %></title>
-  <meta name="description" content="<%= Redmine::Info.app_name %>" />
-  <meta name="keywords" content="issue,bug,tracker" />
-  <%= csrf_meta_tag %>
-  <%= favicon %>
-  <%= javascript_heads %>
-  <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'org2','jquery/jquery-ui-1.9.2' %>
-  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
-  <%= javascript_include_tag 'attachments' %>
-  <%#= call_hook :view_layouts_base_html_head %>
-  <!-- page specific tags -->
-  <%#= yield :header_tags -%>
-  <!-- MathJax的配置 -->
-  <script type="text/javascript"
-          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-  </script>
-  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
-  <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({
-        showMathMenu: false,
-        showMathMenuMSIE: false,
-          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
-        });
-  </script>
-  <script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script><!--焦点图-->
-  <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
-
-  <script src="/javascripts/scrollPic.js"></script><!--滚动-->
-  <script>
-      window.onload = function(){
-          scrollPic();
-      }
-      function scrollPic() {
-          var scrollPic = new ScrollPic();
-          scrollPic.scrollContId   = "scrollPic"; //内容容器ID
-          scrollPic.arrLeftId      = "LeftArr";//左箭头ID
-          scrollPic.arrRightId     = "RightArr"; //右箭头ID
-
-          scrollPic.frameWidth     = 760;//显示框宽度
-          scrollPic.pageWidth      = 760; //翻页宽度
-
-          scrollPic.speed          = 10; //移动速度(单位毫秒，越小越快)
-          scrollPic.space          = 10; //每次移动像素(单位px，越大越快)
-          scrollPic.autoPlay       = true; //自动播放
-          scrollPic.autoPlayTime   = 3; //自动播放间隔时间(秒)
-
-          scrollPic.initialize(); //初始化
-      }
-  </script>
-
-</head>
-
-<!--add by huang-->
-<script type="text/javascript">
-    function org_new_files_upload()
-    {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
-        showModal('ajax-modal', '513px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
-        $('#ajax-modal').parent().addClass("popbox_polls");
-    }
-
-    function org_new_files_banner_upload()
-    {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
-        showModal('ajax-modal', '513px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
-        $('#ajax-modal').parent().addClass("popbox_polls");
-    }
-</script>
-<body onload="prettyPrint();">
-<!--内容开始-->
-<header>
-  <div class="sn-header">
-    <%= render :partial => 'organizations/org_logined_header' %>
-    <div class="sn-row sn-bg-white">
-      <div class="sn-logo"> <img src="/images/sn_logo.jpg" width="367" height="63" alt="logo" class="sn-mt13" /> <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
-        <input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />
-      </div>
-    </div>
-    <!--导航-->
-    <div class="sn-row sn-bg-blue">
-      <ul class="sn-nav">
-        <% @subfield_content.each do |field| %>
-            <% if is_default_field?(field) %>
-                <% case field.name %>
-            <% when 'activity' %>
-                    <li class="nav-element">
-                      <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
-                    </li>
-                <% when 'course' %>
-                    <li class="nav-element">
-                      <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
-                    </li>
-                <% when 'project' %>
-                    <li class="nav-element">
-                      <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
-                    </li>
-                <% end %>
-            <% else %>
-                <% if field.field_type == "Post" && field.hide == 0 %>
-                    <li class="nav-element">
-                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
-                    </li>
-                <% elsif field.field_type == "Resource" && field.hide == 0 %>
-                    <li class="nav-element">
-                      <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
-                    </li>
-                <% end %>
-            <% end %>
-        <% end %>
-        <% if User.current.admin_of_org?(@organization) %>
-            <li class="nav-element">
-              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
-            </li>
-        <% end %>
-      </ul>
-    </div>
-  </div>
-</header>
-<%# 更新访问数,刷新的时候更新访问次数 %>
-<%  update_visiti_count @organization %>
-<%# over %>
-<!--内容开始-->
-<div class="sn-content">
-<div class="sn-content-left fl sn-mt15">
-  <% @subfield_content.each do |field| %>
-      <% if field.status.to_i == 1 %>
-          <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 2 %>
-          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
-          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 3 %>
-            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
-            <div class="cl"></div>
-          </div>
-      <% elsif field.status.to_i == 4 %>
-          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 5 %>
-          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
-      <% end %>
-  <% end %>
-</div>
-<!--右侧-->
-<div class="sn-content-right fr sn-mt15">
-  <% @subfield_content.each do |field| %>
-      <% if field.status.to_i == 6 %>
-          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 7 %>
-          <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 8 %>
-          <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
-      <% end %>
-  <% end %>
-</div>
-<div class="cl"></div>
-</div>
-<!--内容结束-->
-<footer>
-  <!--footer-->
-  <div class="sn-row sn-bg-grey2">
-    <div class="sn-footer">
-      <ul class="sn-footer-link">
-        <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
-        <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
-        <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
-        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
-      </ul>
-      <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
-      <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
-        卫星导航仿真与测试开放实验室</div>
-    </div>
-  </div>
-</footer>
-
-<div id="ajax-indicator" style="display:none;">
-  <span><%= l(:label_loading) %></span>
-</div>
-<%#= call_hook :view_layouts_base_body_bottom %>
-</body>
-</html>
-
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <%= stylesheet_link_tag  'org2','jquery/jquery-ui-1.9.2' %>
+  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+  <%= javascript_include_tag 'attachments' %>
+  <%#= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%#= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+  </script>
+  <!--<script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>-->
+  <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
+
+  <script src="/javascripts/scrollPic.js"></script><!--滚动-->
+  <script>
+    $(document).ready(function(){
+        scrollPic();
+    });
+      function scrollPic() {
+          var scrollPic = new ScrollPic();
+          scrollPic.scrollContId   = "scrollPic"; //内容容器ID
+          scrollPic.arrLeftId      = "LeftArr";//左箭头ID
+          scrollPic.arrRightId     = "RightArr"; //右箭头ID
+
+          scrollPic.frameWidth     = 760;//显示框宽度
+          scrollPic.pageWidth      = 760; //翻页宽度
+
+          scrollPic.speed          = 10; //移动速度(单位毫秒，越小越快)
+          scrollPic.space          = 10; //每次移动像素(单位px，越大越快)
+          scrollPic.autoPlay       = true; //自动播放
+          scrollPic.autoPlayTime   = 3; //自动播放间隔时间(秒)
+
+          scrollPic.initialize(); //初始化
+      };
+  </script>
+
+</head>
+
+<!--add by huang-->
+<body onload="prettyPrint();">
+<!--内容开始-->
+<header>
+  <div class="sn-header">
+    <%= render :partial => 'organizations/org_logined_header' %>
+    <div class="sn-row sn-bg-white">
+      <div class="sn-logo">
+        <% if @org_logo_attchment.blank? %>
+            <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13" alt=""/>
+        <% else %>
+            <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+        <% end %>
+        <!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>-->
+
+        <!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />-->
+      </div>
+    </div>
+    <!--导航-->
+    <div class="sn-row sn-bg-blue sn-p-relative">
+      <ul class="sn-nav">
+        <% @subfield_content.each do |field| %>
+            <% if is_default_field?(field) %>
+                <% case field.name %>
+                <% when 'activity' %>
+                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                      <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
+                    </li>
+                <% when 'course' %>
+                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                      <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+                    </li>
+                <% when 'project' %>
+                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
+                      <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
+                    </li>
+                <% end %>
+            <% else %>
+                <% if field.field_type == "Post" && field.hide == 0 %>
+                    <li class="nav-element">
+                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                    </li>
+                    <!--二级目录-->
+                    <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                      <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                        <% field.sub_domains.each do |subdomain| %>
+                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                            <li class="sn-subnav-slice">|</li>
+                        <% end %>
+                      </ul>
+                    </div>
+                <% elsif field.field_type == "Resource" && field.hide == 0 %>
+                    <li class="nav-element">
+                      <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                    </li>
+                <% end %>
+            <% end %>
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <li class="nav-element">
+              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+            </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</header>
+<%# 更新访问数,刷新的时候更新访问次数 %>
+<%  update_visiti_count @organization %>
+<%# over %>
+<!--内容开始-->
+<div class="sn-content">
+<div class="sn-content-left fl sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 1 %>
+          <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 3 %>
+          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
+          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
+            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
+            <div class="cl"></div>
+          </div>
+      <% elsif field.status.to_i == 4 %>
+          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 5 %>
+          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<!--右侧-->
+<div class="sn-content-right fr sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 6 %>
+          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 7 %>
+          <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 8 %>
+          <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 23 %>
+          <%= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<div class="cl"></div>
+</div>
+<!--内容结束-->
+<footer>
+  <!--footer-->
+  <div class="sn-row sn-bg-grey2">
+    <div class="sn-footer">
+      <ul class="sn-footer-link">
+        <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
+        <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+        <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+      </ul>
+      <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+      <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
+        卫星导航仿真与测试开放实验室</div>
+    </div>
+  </div>
+</footer>
+
+<!--页面底部-->
+<div class="cl"></div>
+<div id="ajax-modal" style="display:none;"></div>
+
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<%#= call_hook :view_layouts_base_body_bottom %>
+</body>
+<script>
+    $(".nav-element").mouseover(function(){
+        $(this).next(".sn-grey-opacity").show(0);
+    });
+    $(".sn-grey-opacity").mouseover(function(){
+        $(this).show(0);
+    });
+    $(".nav-element").mouseout(function(){
+        $(this).next(".sn-grey-opacity").delay(150).hide(0);
+    });
+    $(".sn-grey-opacity").mouseout(function(){
+        $(this).delay(150).hide(0);
+    });
+    $(".sn-sub-nav").each(function(){
+        $(this).children(".sn-subnav-slice:last").hide();
+    });
+</script>
+
+<!--add by huang-->
+<script type="text/javascript">
+    function org_new_files_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function org_new_files_banner_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+</script>
+
+</html>
+
diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb
new file mode 100644
index 000000000..871e2cdea
--- /dev/null
+++ b/app/views/layouts/base_sub_domain.html.erb
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <%= stylesheet_link_tag  'org_new_style','jquery/jquery-ui-1.9.2', 'org2' %>
+  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+  <%= javascript_include_tag 'attachments' %>
+  <%#= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%#= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+  </script>
+  <!--<script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>-->
+  <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
+
+  <script>
+      $(document).ready(function(){
+        $(".nav-element").mouseover(function(){
+            $(this).next(".sn-grey-opacity").show(0);
+      });
+        $(".sn-grey-opacity").mouseover(function(){
+            $(this).show(0);
+        });
+        $(".nav-element").mouseout(function(){
+            $(this).next(".sn-grey-opacity").delay(150).hide(0);
+        });
+        $(".sn-grey-opacity").mouseout(function(){
+            $(this).delay(150).hide(0);
+        });
+        $(".sn-sub-nav").each(function(){
+            $(this).children(".sn-subnav-slice:last").hide();
+        });
+    });
+  </script>
+
+</head>
+
+<!--add by huang-->
+<script type="text/javascript">
+    function org_new_files_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function org_new_files_banner_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+</script>
+<body onload="prettyPrint();">
+<!--内容开始-->
+<div class="sn-inner-body">
+  <header>
+    <div class="sn-header">
+      <%= render :partial => 'organizations/org_logined_header' %>
+      <div class="sn-row sn-bg-white">
+        <div class="sn-logo">
+          <% if @org_logo_attchment.blank? %>
+              <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13" alt=""/>
+          <% else %>
+              <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
+          <% end %>
+          <% if User.current.admin_of_org?(@organization) %>
+                <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+          <% end %>
+
+        </div>
+      </div>
+      <!--导航-->
+      <div class="sn-row sn-bg-blue sn-p-relative">
+        <ul class="sn-nav">
+          <% @subfield_content.each do |field| %>
+              <% if is_default_field?(field) %>
+                  <% case field.name %>
+                  <% when 'activity' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
+                      </li>
+                  <% when 'course' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+                      </li>
+                  <% when 'project' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
+                      </li>
+                  <% end %>
+              <% else %>
+                  <% if field.field_type == "Post" && field.hide == 0 %>
+                      <li class="nav-element">
+                        <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      </li>
+                      <!--二级目录-->
+                      <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                        <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                          <% field.sub_domains.each do |subdomain| %>
+                              <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey" %></li>
+                              <li class="sn-subnav-slice">|</li>
+                          <% end %>
+                        </ul>
+                      </div>
+                  <% elsif field.field_type == "Resource" && field.hide == 0 %>
+                      <li class="nav-element">
+                        <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      </li>
+                  <% end %>
+              <% end %>
+          <% end %>
+          <% if User.current.admin_of_org?(@organization) %>
+              <li class="nav-element">
+                <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+              </li>
+          <% end %>
+        </ul>
+      </div>
+      <div class="sn-row">
+        <div class="sn-banner">
+          <img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" />
+          <!--<a href="#" class="sn-banner-add" title="点击替换图片" ></a>-->
+        </div>
+      </div>
+    </div>
+  </header>
+<%# 更新访问数,刷新的时候更新访问次数 %>
+  <%  update_visiti_count @organization %>
+<%# over %>
+  <!--内容开始-->
+
+  <!--内容结束-->
+  <%= render_flash_messages %>
+  <%= yield %>
+  <%= call_hook :view_layouts_base_content %>
+  <div style="clear:both;"></div>
+
+  <footer>
+    <!--footer-->
+    <div class="sn-row sn-bg-grey2">
+      <div class="sn-footer">
+        <ul class="sn-footer-link">
+          <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
+          <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+          <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+          <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+        </ul>
+        <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+        <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
+          卫星导航仿真与测试开放实验室</div>
+      </div>
+    </div>
+  </footer>
+</div>
+
+<!--页面底部-->
+<div class="cl"></div>
+<div id="ajax-modal" style="display:none;"></div>
+
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+</body>
+</html>
+
+
+
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 313a1e86a..e43aa499f 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -226,8 +226,7 @@
 
            end
         %>
-        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
-
+        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" >
           <div class = "leftCoursesList" id="homepageLeftMenuCourses">
               <ul>
@@ -258,7 +257,7 @@
            end
         %>
 
-        <% projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
+        <% projects = @user.projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
         <div class="homepageLeftMenuCourses <%= projects.empty? ? 'none' : ''%>" >
           <div class = "leftProjecsList" id="homepageLeftMenuForge">
               <ul>
@@ -347,28 +346,30 @@
   </div><!--floatbox end-->
 </div>
 <script type="text/javascript">
+    $(function(){
+        $('#user_hide_course').hide();
+        $('#user_hide_project').hide();
+    });
+
     $("#courseMenu").mouseenter(function(){
         $("#topnav_course_menu").show();
     });
     $("#courseMenu").mouseleave(function(){
         $("#topnav_course_menu").hide();
     });
-
-    $('#user_hide_course').hide();
     function leftCourseslistChange(){
         $('#homepageLeftMenuCourses').slideToggle();
         $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon");
         $('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon");
 
     }
-
-    $('#user_hide_project').hide();
     function leftProjectslistChange(){
         $('#homepageLeftMenuForge').slideToggle();
         $('#hide_show_projecticon').toggleClass("homepageLeftMenuHideIcon");
         $('#hide_show_projecticon').toggleClass("homepageLeftMenuMoreIcon");
 
     }
+
 </script>
 </body>
 </html>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index ee9d63720..46346eb71 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -186,7 +186,7 @@
                   <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
                     <%= l(:label_cancel_with_space) %>
                   </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
                     <%= l(:label_comment_with_space) %>
                   </a>
                 </p>
@@ -199,6 +199,9 @@
 </div>
 <script type="text/javascript">
     $(function(){
+        $("#news_submit_comment").one('click',function(){
+            submitComment();
+        });
         $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
             var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb
index 0a7770ac0..640854164 100644
--- a/app/views/news/_organization_show.html.erb
+++ b/app/views/news/_organization_show.html.erb
@@ -161,7 +161,7 @@
                   <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
                     <%= l(:label_cancel_with_space) %>
                   </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
                     <%= l(:label_comment_with_space) %>
                   </a>
                 </p>
@@ -174,6 +174,9 @@
 </div>
 <script type="text/javascript">
     $(function(){
+        $("#news_submit_comment").one('click',function(){
+            submitComment();
+        });
         $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
             var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 74378e3fd..6b91c98ed 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -171,7 +171,7 @@
                   <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
                     <%= l(:label_cancel_with_space) %>
                   </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
                     <%= l(:label_comment_with_space) %>
                   </a>
                 </p>
@@ -184,6 +184,9 @@
 </div>
 <script type="text/javascript">
     $(function(){
+        $("#news_submit_comment").one('click',function(){
+            submitComment();
+        });
         $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
             var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");
diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb
index 79858dd03..d904cb920 100644
--- a/app/views/org_document_comments/add_reply.js.erb
+++ b/app/views/org_document_comments/add_reply.js.erb
@@ -1,2 +1,2 @@
-$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
+$("#organization_document_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
 sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");
diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb
index 219a05194..04cd83ef9 100644
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@@ -1,15 +1,15 @@
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
-<% end %>
-
-<%= render :partial => 'new' %>
-<% unless @documents.nil? %>
-    <% @documents.each do |document| %>
-        <script>
-            $(function() {
-                sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "OrgActivity");
-            });
-        </script>
-          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
-    <% end %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
+<%= render :partial => 'new' %>
+<% unless @documents.nil? %>
+    <% @documents.each do |document| %>
+        <script>
+            $(function() {
+                sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "OrgActivity");
+            });
+        </script>
+          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 3e08d9f9e..5cc6d5c91 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -4,6 +4,7 @@
         :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}) %>");
+    $("#org_excellent_teachers").html("<%= escape_javascript(render :partial => 'organizations/setting_excellent_teachers') %>");
 <% end %>
 $("#subfield_name").val("");
 $("#sub_dir").val("");
\ No newline at end of file
diff --git a/app/views/org_subfields/destroy.js.erb b/app/views/org_subfields/destroy.js.erb
index d069b1cd8..c14eeae8f 100644
--- a/app/views/org_subfields/destroy.js.erb
+++ b/app/views/org_subfields/destroy.js.erb
@@ -2,4 +2,5 @@ $("#org_subfield_list").html("");
 $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
     :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
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#org_excellent_teachers").html("<%= escape_javascript(render :partial => 'organizations/setting_excellent_teachers') %>");
\ No newline at end of file
diff --git a/app/views/organizations/_link_subfield_more.html.erb b/app/views/organizations/_link_subfield_more.html.erb
new file mode 100644
index 000000000..cb4a82ed1
--- /dev/null
+++ b/app/views/organizations/_link_subfield_more.html.erb
@@ -0,0 +1,9 @@
+<% 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 "更多", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more" , :target => "_blank"  %>
+    <% else %>
+        <%= link_to "更多", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more" , :target => "_blank"  %>
+    <% end %>
+<% else %>
+    <%= link_to "更多", organization_path(@organization, :org_subfield_id => field.id), :class => "more" , :target => "_blank"  %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 33e2835dd..b4ca46959 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -140,8 +140,8 @@
       <div class="cl"></div>
       <% if activity.student_works.count != 0 %>
         <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %>
-        <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
-        <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %>
+        <%# student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
+        <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
             <div>
@@ -159,8 +159,18 @@
           <% 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"><%= 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 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_url_in_org(activity.id, '', sw.id), :alt => "学生头像" %>
+                      <p class="w100 hidden">
+                        <%= link_to sw.user.show_name, student_work_index_url_in_org(activity.id, '', sw.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>
                 <% 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>
@@ -182,7 +192,8 @@
             <% 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_url_in_org(sort_projects.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
+                <% first_pro = project_sort_first(projects).first %>
+                #&nbsp;<%=time_from_now first_pro.updated_at %><%= link_to User.find(first_pro.user_id).show_name, user_activities_url_in_org(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
               </div>
               <div class="cl"></div>
               <% sort_projects.each_with_index do |pro, i| %>
@@ -275,7 +286,8 @@
   <% count=activity.journals_for_messages.count %>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
+      <div class="homepagePostReplyBannerCount"><span>回复</span>
+        <span  class="reply_iconup" > ︿</span>
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
           <% if activity.user == User.current %>
@@ -317,23 +329,60 @@
                       <% else %>
                           <%= link_to comment.try(:user).try(:realname), user_url_in_org(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.user == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                      <%= time_from_now(comment.created_on) %>
+                    </div>
+                    <% unless comment.m_parent_id.nil? %>
+                        <% parents_rely = [] %>
+                        <% parents_rely = get_reply_parents parents_rely, comment %>
+                        <% length = parents_rely.length %>
+                        <div id="comment_reply_<%=comment.id %>">
+                          <% if length <= 3 %>
+                              <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
                           <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                              <div class="orig_cont clearfix">
+                                <div class="orig_cont clearfix">
+                                  <div id="comment_reply_<%=parents_rely[length - 1].id %>">
+                                    <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+                                  </div>
+                                  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+                                </div>
+                                <div class="orig_cont_hide clearfix"><span class="orig_icon" >&darr; </span><span class="orig_icon" style="display:none;" > &uarr;</span><%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %></div>
+                                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                              </div>
                           <% end %>
-                      </span>
-                      <div id="message_edit_<%=comment.id %>" style="display: none" class="mr10 fr">
-                        <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                            <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity},
-                                        :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
-                        <% end %>
-                      </div>
-                    </div>
+                        </div>
+                    <% end %>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
+                    <div class="orig_reply mb10 mt-10">
+                      <div class="reply">
+                                <span class="reply-right">
+                                    <span id="reply_praise_count_<%=comment.id %>">
+                                      <% if comment.user == User.current %>
+                                          <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                                      <% else %>
+                                          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                                      <% end %>
+                                    </span>
+                                    <span style="position: relative" class="fr mr20">
+                                        <%= link_to(
+                                                    l(:button_reply),
+                                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
+                                                    :remote => true,
+                                                    :method => 'get',
+                                                    :title => l(:button_reply)) %>
+                                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                                    </span>
+                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
+                                  <% if User.current.admin? ||is_teacher || comment.user == User.current%>
+                                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
+                                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                                    <% end %>
+                                </span>
+                        <div class="cl"></div>
+                      </div>
+                    </div>
+                    <p id="reply_message_<%= comment.id%>"></p>
                   </div>
                   <div class="cl"></div>
                 </li>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index ebab8354c..4340213a4 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -43,6 +43,13 @@
             $(this).prev().css("color","#808080");
             $(this).css("z-index", "1");
         })
+
+        //二级菜单滑动时箭头方向控制
+        $(".homepageLeftMenuMoreIcon").toggle(function(){
+            $(this).css("background","url(/images/homepage_icon.png) 100px -624px no-repeat");
+        },function(){
+            $(this).css("background","url(/images/homepage_icon.png) -74px -240px no-repeat");
+        });
     })
 </script>
 
@@ -83,35 +90,55 @@
             </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}", 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 => "发布帖子"%>
+        <div style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
+          <% if field.field_type == "Post" || field.field_type == "Complex" || field.field_type == "Compstu" || field.field_type == "Comptec" %> <!--讨论帖子-->
+              <div class="homepageLeftMenuBlock">
+                <!--<a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>-->
+                <% 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 homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% else %>
+                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% end %>
+                <% else %>
+                    <% if field.field_type == "Comptec" %>
+                        <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% else %>
+                        <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% end %>
+                <% end %>
+                <% if User.current.logged? and User.current.admin_of_org?(organization) && field.field_type != "Comptec"  %>
+                    <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
+                <% end %>
+              </div>
+              <div class="<%= (field.sub_domains.count == 0) ? 'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:none;">
+                <ul>
+                  <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('priority').uniq.limit(5), :org_subfield_id => field.id} %>
+                </ul>
+              </div>
+
+              <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
+                  <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
+                    <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
+                  </li>
               <% 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" %>
+              <div class="homepageLeftMenuBlock">
+                  <% 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 homepageMenuControl hidden" %>
+                      <% else %>
+                          <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %>
+                      <% 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}", org_subfield_files_path(field), :class => "homepageMenuText homepageMenuControl hidden" %>
                   <% 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>-->
+                  <% 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>-->
+              </div>
           <% end %>
         </div>
         <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
diff --git a/app/views/organizations/_org_subdomain.html.erb b/app/views/organizations/_org_subdomain.html.erb
new file mode 100644
index 000000000..b096a14ae
--- /dev/null
+++ b/app/views/organizations/_org_subdomain.html.erb
@@ -0,0 +1,11 @@
+<% subdomains.each do |subdomain|%>
+    <li class="homepageLeftMenuCoursesLine" style="display:<%= subdomain.hide.to_i == 0?'block':'none' %>;position:relative;" id="sub_domain_hide_<%= subdomain.id %>">
+      <%= link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => org_subfield_id), :class => "coursesLineGrey hidden", :title => subdomain.name %>
+    </li>
+<% end %>
+<%# if subdomains.size == 5 %>
+    <!--<li class="homepageLeftMenuMore" id="show_more_org_project">-->
+      <!--<input type="hidden" value="<%#= page %>" id="org_project_page_num">-->
+      <!--<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%#=  more_org_projects_organization_path(org_id) %>');"></a>-->
+    <!--</li>-->
+<%# end%>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftD.html.erb b/app/views/organizations/_org_subfield_leftD.html.erb
index 676d5d1c3..6af0e9f60 100644
--- a/app/views/organizations/_org_subfield_leftD.html.erb
+++ b/app/views/organizations/_org_subfield_leftD.html.erb
@@ -1,117 +1,104 @@
-<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-  <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-  <div class="sn-index-partnerbox " >
-    <ul id="scrollPic" >
-      <li>
-        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt=""/></a>
-        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt=""/></a>
-      </li>
-      <li>
-        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt=""/></a>
-        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt=""/></a>
-      </li>
-    </ul>
-    <div class="cl"></div>
-    <div class="partner-btnbox">
-      <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
-      <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
-      <div class="cl"></div>
-    </div>
-  </div>
-</div>
-
-<% if is_default_field?(field) %>
-    <% case field.name %>
-    <% when 'course' %>
-        <p>暂无内容！</p>
-    <% when 'project' %>
-        <p>暂无内容！</p>
-    <% end %>
-<% else %>
-    <% if field.field_type == "Post" %> <%# 讨论类型 %>
-        <% org_acts = get_subfield_acts field %>
-        <% unless org_acts.blank? %>
-           <% org_acts.each do |activity| %>
-                <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-                  <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-                  <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
-                    <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
-                        <% document = activity.org_act %>
-                        <% org_subfield_id = params[:org_subfield_id] %>
-                        <% flag = 2 %>
-                        <% iamge_path = get_image_path_from_content(document.content) %>
-                        <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
-                        <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
-                        <% end %>
-                    <% elsif activity.container_type == 'OrgSubfield' %>
-                        <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                            <% message = Message.find(activity.org_act_id) %>
-                            <% if message.board.org_subfield_id %>
-                                <% iamge_path = get_image_path_from_content(message.content) %>
-                                <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
-                                <% else %>
-                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
-                                <% end %>
-                            <% else %>
-                                <% iamge_path = get_image_path_from_content(message.content) %>
-                                <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
-                                <% else %>
-                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
-                                <% end %>
-                            <% end %>
-                        <% end %>
-                        <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                            <% news = News.find(activity.org_act_id) %>
-                            <% iamge_path = get_image_path_from_content(news.description) %>
-                            <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
-                            <% else %>
-                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
-                            <% end %>
-                        <% end %>
-                    <% end %>
-                  </div>
-                </div>
-           <% end %>
-        <% else %>
-            <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-              <div class="sn-index-partnerbox " >
-                <ul id="scrollPic" >
-                  <li>
-                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt=""/></a>
-                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt=""/></a>
-                  </li>
-                  <li>
-                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt=""/></a>
-                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt=""/></a>
-                  </li>
-                </ul>
-                <div class="cl"></div>
-                <div class="partner-btnbox">
-                  <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
-                  <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
-                  <div class="cl"></div>
-                </div>
-              </div>
-            </div>
-        <% end %>
-    <% elsif field.field_type == "Resource" %>
-        <% org_attachs = get_attach_org2(field) %>
-        <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
-          <% 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 image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
-              <% else %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
-              <% end %>
-          <% else %>
-              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
-          <% end %>
-        </div>
-    <% end %>
-<% end %>
+<% if is_default_field?(field) %>
+    <% case field.name %>
+<% when 'course' %>
+        <p>暂无内容！</p>
+    <% when 'project' %>
+        <p>暂无内容！</p>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %> <%# 讨论类型 %>
+        <% org_acts = get_subfield_acts field %>
+        <% unless org_acts.blank? %>
+            <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title"><%= field.name %>
+                <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+              </h2>
+              <div class="sn-index-partnerbox " >
+                <ul id="scrollPic" >
+                  <div class="scroll-control">
+                      <div class="scroll-container">
+                        <% org_acts.first(8).each do |activity| %>
+                            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                                <% document = activity.org_act %>
+                                <% org_subfield_id = params[:org_subfield_id] %>
+                                <% flag = 2 %>
+                                <% iamge_path = get_image_path_from_content(document.content) %>
+                                <% if iamge_path.nil? %>
+                                    <li class="sn-fl"><%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg" %></li>
+                                <% else %>
+                                    <li class="sn-fl"><%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg"  %></li>
+                                <% end %>
+                            <% elsif activity.container_type == 'OrgSubfield' %>
+                                <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                                    <% message = Message.find(activity.org_act_id) %>
+                                    <% if message.board.org_subfield_id %>
+                                        <% iamge_path = get_image_path_from_content(message.content) %>
+                                        <% if iamge_path.nil? %>
+                                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
+                                        <% else %>
+                                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
+                                        <% end %>
+                                    <% else %>
+                                        <% iamge_path = get_image_path_from_content(message.content) %>
+                                        <% if iamge_path.nil? %>
+                                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
+                                        <% else %>
+                                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
+                                        <% end %>
+                                    <% end %>
+                                <% end %>
+                                <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                                    <% news = News.find(activity.org_act_id) %>
+                                    <% iamge_path = get_image_path_from_content(news.description) %>
+                                    <% if iamge_path.nil? %>
+                                        <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
+                                    <% else %>
+                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
+                                    <% end %>
+                                <% end %>
+                            <% end %>
+                        <% end %>
+                      </div>
+                  </div>
+                </ul>
+                <div class="cl"></div>
+                <div class="partner-btnbox">
+                  <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
+                  <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
+                  <div class="cl"></div>
+                </div>
+              </div>
+            </div>
+        <% else %>
+            <%= render :partial => 'organizations/org_subfield_leftD_default', :locals => {:field => field} %>
+        <% end %>
+    <% elsif field.field_type == "Resource" %>
+        <% org_attachs = get_attach_org2(field) %>
+        <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+          <% 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 image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+              <% end %>
+          <% else %>
+              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+          <% end %>
+        </div>
+    <% end %>
+<% end %>
+
+<script>
+  $(document).ready(function(){
+      var num = $(".scroll-container").children().size();
+      var num = Math.round(num/4);
+      var divWidth = 380*num;
+      $(".scroll-container").css("width",divWidth).css("height",110);
+      if(num%2 != 0) {
+          var controlWidth = 380*num + 380;
+      }else{
+          var controlWidth = 380*num;
+      }
+      $(".scroll-control").css("width",controlWidth);
+  });
+</script>
diff --git a/app/views/organizations/_org_subfield_leftD_default.html.erb b/app/views/organizations/_org_subfield_leftD_default.html.erb
new file mode 100644
index 000000000..257622836
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftD_default.html.erb
@@ -0,0 +1,19 @@
+<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+  <h2 class="h2-title">栏目名称</h2>
+  <div class="sn-index-partnerbox " >
+    <ul id="scrollPic" >
+      <div style="width: 760px;">
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+      </div>
+    </ul>
+    <div class="cl"></div>
+    <div class="partner-btnbox">
+      <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
+      <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb
index a987e23cb..e7481ce0a 100644
--- a/app/views/organizations/_org_subfield_leftM1.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1.html.erb
@@ -1,256 +1,285 @@
-<h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-<div class="cl"></div>
-<% if is_default_field?(field) %>
-    <% case field.name %>
-    <% when 'course' %>
-        <% if @course_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
-        <% else %>
-            <% @course_acts.first(1).each do |act| %>
-                <% if act.org_act_type == "HomeworkCommon" %>
-                    <% activity = HomeworkCommon.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-news-bigbox fl">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.updated_at %></span>
-                      <div class="sn-news-txt">
-                        <p><%= activity.description.to_s.html_safe %></p>
-                      </div>
-                    </div>
-                <% elsif act.org_act_type == "Message" %>
-                    <% activity = Message.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.content) %>
-                    <div class="sn-news-bigbox fl">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% end %>
-                      <h3>
-                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
-                        <% else %>
-                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
-                        <% end %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
-                      <div class="sn-news-txt">
-                        <p><%= activity.content.to_s.html_safe %></p>
-                      </div>
-                    </div>
-                <% elsif act.org_act_type == "News" %>
-                    <% activity = News.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-news-bigbox fl">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.created_on %></span>
-                      <div class="sn-news-txt">
-                        <p><%= activity.description.to_s.html_safe %></p>
-                      </div>
-                    </div>
-                <% elsif act.org_act_type == "Poll" %>
-                    <% activity = Poll.find(act.org_act_id) %>
-                    <% has_commit = has_commit_poll?(activity.id ,User.current)%>
-                    <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
-                    <% iamge_path = get_image_path_from_content(activity.polls_description) %>
-                    <% if ( activity.polls_status==2) %>
-                        <div class="sn-news-bigbox fl">
-                          <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
-                          <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
-                          <% end %>
-                          <h3>
-                            <% if has_commit %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
-                            <% else %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
-                            <% end %>
-                          </h3>
-                          <span class="txt-grey"><%= format_date activity.published_at %></span>
-                          <div class="sn-news-txt">
-                            <p><%= activity.polls_description.to_s.html_safe %></p>
-                          </div>
-                        </div>
-                    <% end %>
-                <% end %>
-            <% end %>
-        <% end %>
-    <% when 'project' %>
-        <% if @project_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
-        <% else %>
-            <% @project_acts.first(4).each do |act| %>
-                <% if act.org_act_type == "Issue" %>
-                    <% activity = Issue.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-news-bigbox fl">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
-                      <div class="sn-news-txt">
-                        <p><%= activity.description.to_s.html_safe %></p>
-                      </div>
-                    </div>
-                <% elsif act.org_act_type == "Message" %>
-                    <% activity = Message.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.content) %>
-                    <div class="sn-news-bigbox fl">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% end %>
-                      <h3>
-                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
-                        <% else %>
-                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
-                        <% end %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
-                      <div class="sn-news-txt">
-                        <p><%= activity.content.to_s.html_safe %></p>
-                      </div>
-                    </div>
-                <% elsif act.org_act_type == "News" %>
-                    <% activity = News.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-news-bigbox fl">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey">2016-04-08</span>
-                      <div class="sn-news-txt">
-                        <p><%= activity.description.to_s.html_safe %></p>
-                      </div>
-                    </div>
-                <% end %>
-            <% end %>
-        <% end %>
-    <% end %>
-<% else %>
-    <% if field.field_type == "Post" %>
-        <% org_acts = get_subfield_acts field %>
-        <% if org_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
-        <% else %>
-            <% org_acts.first(4).each do |activity| %>
-                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
-                    <% document = activity.org_act %>
-                    <% org_subfield_id = params[:org_subfield_id] %>
-                    <% flag = 2 %>
-                    <% iamge_path = get_image_path_from_content(document.content) %>
-                    <div class="sn-news-bigbox fl">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %>
-                      </h3>
-                      <span class="txt-grey"><%= format_date document.created_at %></span>
-                      <div class="sn-news-txt">
-                        <p><%= document.content.to_s.html_safe %></p>
-                      </div>
-                    </div>
-                <% else activity.container_type == 'OrgSubfield' %>
-                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                        <% message = Message.find(activity.org_act_id) %>
-                        <% if message.parent_id.nil? %>
-                            <% content = message.content%>
-                        <% else %>
-                            <% content = message.parent.content%>
-                        <% end %>
-                        <% iamge_path = get_image_path_from_content(content) %>
-                        <% if message.board.org_subfield_id %>
-                            <div class="sn-news-bigbox fl">
-                              <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                              <% else %>
-                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %>
-                              <% end %>
-                              <h3>
-                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
-                                <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
-                                <% end %>
-                              </h3>
-                              <span class="txt-grey"><%= format_date message.created_on %></span>
-                              <div class="sn-news-txt">
-                                <p><%= content.to_s.html_safe %></p>
-                              </div>
-                            </div>
-                        <% else %>
-                            <div class="sn-news-bigbox fl">
-                              <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
-                              <% else %>
-                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
-                              <% end %>
-                              <h3>
-                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h3-title" %>
-                                <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h3-title" %>
-                                <% end %>
-                              </h3>
-                              <span class="txt-grey"><%= format_date message.created_on %></span>
-                              <div class="sn-news-txt">
-                                <p><%= content.to_s.html_safe %></p>
-                              </div>
-                            </div>
-                        <% end %>
-                    <% end %>
-                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                        <% news = News.find(activity.org_act_id) %>
-                        <% iamge_path = get_image_path_from_content(news.description) %>
-                        <div class="sn-news-bigbox fl">
-                          <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
-                          <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
-                          <% end %>
-                          <h3>
-                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %>
-                          </h3>
-                          <span class="txt-grey"><%= format_date news.created_on %></span>
-                          <div class="sn-news-txt">
-                            <p><%= news.description.to_s.html_safe %></p>
-                          </div>
-                        </div>
-                    <% end %>
-                <% end %>
-            <% end %>
-        <% end %>
-    <% end %>
-<% end %>
-
-
+
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <% if @course_acts.blank? %>
+            <h2 class="h2-title">课程动态</h2>
+            <div class="cl"></div>
+            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+        <% else %>
+            <h2 class="h2-title">课程动态</h2>
+            <div class="cl"></div>
+            <% @course_acts.first(1).each do |act| %>
+                <% if act.org_act_type == "HomeworkCommon" %>
+                    <% activity = HomeworkCommon.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_at %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.name.to_s, student_work_index_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.created_on %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
+                      </div>
+
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.title.to_s, news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "Poll" %>
+                    <% activity = Poll.find(act.org_act_id) %>
+                    <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                    <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                    <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                    <% if ( activity.polls_status==2) %>
+                        <div class="sn-news-bigbox fl">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <% end %>
+                          <h3>
+                            <% if has_commit %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
+                            <% else %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
+                            <% end %>
+                          </h3>
+                          <span class="txt-grey"><%= format_date activity.published_at %></span>
+                          <div class="sn-news-txt">
+                            <div class="sn-news-wrap"><%= activity.polls_description.to_s.html_safe %></div>
+                          </div>
+                          <div class="sn-read-more"><%=link_to "查看全文>>", poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% when 'project' %>
+        <% if @project_acts.blank? %>
+            <h2 class="h2-title">项目动态</h2>
+            <div class="cl"></div>
+            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+        <% else %>
+            <h2 class="h2-title">项目动态</h2>
+            <div class="cl"></div>
+            <% @project_acts.first(1).each do |act| %>
+                <% if act.org_act_type == "Issue" %>
+                    <% activity = Issue.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.subject.to_s, issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3> <!--+"(帖子标题)"-->
+                            <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey">2016-04-08</span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %>
+        <% org_acts = get_subfield_acts field %>
+        <% if org_acts.blank? %>
+            <h2 class="h2-title"><%= field.name %></h2>
+            <div class="cl"></div>
+            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+        <% else %>
+            <h2 class="h2-title"><%= field.name %>
+              <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+            </h2>
+            <div class="cl"></div>
+            <% org_acts.first(1).each do |activity| %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                    <% document = activity.org_act %>
+                    <% org_subfield_id = params[:org_subfield_id] %>
+                    <% flag = 2 %>
+                    <% iamge_path = get_image_path_from_content(document.content) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date document.created_at %></span>
+                      <div class="sn-news-txt">
+                        <div class="sn-news-wrap"><%= document.content.to_s.html_safe %></div>
+                      </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                    </div>
+                <% else activity.container_type == 'OrgSubfield' %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                        <% message = Message.find(activity.org_act_id) %>
+                        <% if message.parent_id.nil? %>
+                            <% content = message.content%>
+                        <% else %>
+                            <% content = message.parent.content%>
+                        <% end %>
+                        <% iamge_path = get_image_path_from_content(content) %>
+                        <% if message.board.org_subfield_id %>
+                            <div class="sn-news-bigbox fl">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <% end %>
+                              <h3> <!--+"(帖子标题)"-->
+                                    <%= link_to message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
+                              </h3>
+                              <span class="txt-grey"><%= format_date message.created_on %></span>
+                              <div class="sn-news-txt">
+                                <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
+                              </div>
+                              <div class="sn-read-more"><%=link_to "查看全文>>", message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                            </div>
+                        <% else %>
+                            <div class="sn-news-bigbox fl">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h3-title" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h3-title" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey"><%= format_date message.created_on %></span>
+                              <div class="sn-news-txt">
+                                <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
+                              </div>
+                              <div class="sn-read-more">
+                                <% if message.parent_id.nil? %>
+                                    <%=link_to "查看全文>>", message.subject.to_s.html_safe, board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+                                <% else %>
+                                    <%=link_to "查看全文>>", message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+                                <% end %>
+                              </div>
+                            </div>
+                        <% end %>
+                    <% end %>
+                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                        <% news = News.find(activity.org_act_id) %>
+                        <% iamge_path = get_image_path_from_content(news.description) %>
+                        <div class="sn-news-bigbox fl">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
+                          <% end %>
+                          <h3>
+                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %>
+                          </h3>
+                          <span class="txt-grey"><%= format_date news.created_on %></span>
+                          <div class="sn-news-txt">
+                            <div class="sn-news-wrap"><%= news.description.to_s.html_safe %></div>
+                          </div>
+                          <div class="sn-read-more"><%=link_to "查看全文>>", news.title.to_s, news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% end %>
+
+<script>
+  $(".sn-read-more").hide();
+  $(".sn-news-txt").each(function(){
+      var txtHeight = $(this).children().height();
+      if (txtHeight > 180){
+          $(this).next().show();
+      }
+  });
+</script>
+
+
diff --git a/app/views/organizations/_org_subfield_leftM1_default.html.erb b/app/views/organizations/_org_subfield_leftM1_default.html.erb
index 919d76363..d785b6225 100644
--- a/app/views/organizations/_org_subfield_leftM1_default.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1_default.html.erb
@@ -1,8 +1,8 @@
-<div class="sn-news-bigbox fl">
-  <a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/news/img-news-big.jpg" width="380" height="165" alt=""/></a>
-  <h3><a href="javascript:void(0);" target="_blank" class="h3-title"></a></h3>
-  <span class="txt-grey"></span>
-  <div class="sn-news-txt">
-    <p></p>
-  </div>
-</div>
+<div class="sn-news-bigbox fl">
+  <a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/default_blank/left-02.jpg" width="380" height="165" alt="" style="display:block;" /></a>
+  <h3><a href="javascript:void(0);" target="_blank" class="h3-title"></a></h3>
+  <span class="txt-grey"></span>
+  <div class="sn-news-txt">
+    <p></p>
+  </div>
+</div>
diff --git a/app/views/organizations/_org_subfield_leftM2.html.erb b/app/views/organizations/_org_subfield_leftM2.html.erb
index aec1a88fe..1beccb918 100644
--- a/app/views/organizations/_org_subfield_leftM2.html.erb
+++ b/app/views/organizations/_org_subfield_leftM2.html.erb
@@ -5,18 +5,19 @@
         <% if @course_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% @course_acts.first(4).each do |act| %>
+            <% @course_acts[1..4].each do |act| %>
                 <% if act.org_act_type == "HomeworkCommon" %>
                     <% activity = HomeworkCommon.find(act.org_act_id) %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
+           
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_at %></span>
                       <div class="cl"></div>
@@ -26,15 +27,15 @@
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
                         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                         <% else %>
-                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                         <% end %>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
@@ -45,12 +46,12 @@
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.created_on %></span>
                       <div class="cl"></div>
@@ -63,15 +64,15 @@
                     <% if ( activity.polls_status==2) %>
                         <div class="sn-news-small mb18">
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
                           <% end %>
                           <h3>
                             <% if has_commit %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                                <div class="sn-title-wrap"><%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %><span class="title-ellipsis">...</span></div>
                             <% else %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                                <div class="sn-title-wrap"><%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %><span class="title-ellipsis">...</span></div>
                             <% end %>
                           </h3>
                           <span class="txt-grey fl "><%= format_date activity.published_at %></span>
@@ -85,18 +86,18 @@
         <% if @project_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% @project_acts.first(4).each do |act| %>
+            <% @project_acts[1..4].each do |act| %>
                 <% if act.org_act_type == "Issue" %>
                     <% activity = Issue.find(act.org_act_id) %>
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
                       <div class="cl"></div>
@@ -106,15 +107,15 @@
                     <% iamge_path = get_image_path_from_content(activity.content) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
                         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                         <% else %>
-                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                         <% end %>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
@@ -125,12 +126,12 @@
                     <% iamge_path = get_image_path_from_content(activity.description) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.created_on %></span>
                       <div class="cl"></div>
@@ -145,7 +146,7 @@
         <% if org_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% org_acts.first(4).each do |activity| %>
+            <% org_acts[1..4].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                     <% document = activity.org_act %>
                     <% org_subfield_id = params[:org_subfield_id] %>
@@ -153,12 +154,12 @@
                     <% iamge_path = get_image_path_from_content(document.content) %>
                     <div class="sn-news-small mb18">
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                       <% end %>
                       <h3>
-                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <div class="sn-title-wrap"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date document.created_at %></span>
                       <div class="cl"></div>
@@ -175,15 +176,15 @@
                         <% if message.board.org_subfield_id %>
                             <div class="sn-news-small mb18">
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                                  <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                               <% else %>
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                               <% end %>
                               <h3>
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% end %>
                               </h3>
                               <span class="txt-grey fl "><%= format_date message.created_on %></span>
@@ -192,15 +193,15 @@
                         <% else %>
                             <div class="sn-news-small mb18">
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                                  <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                               <% else %>
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                               <% end %>
                               <h3>
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% end %>
                               </h3>
                               <span class="txt-grey fl "><%= format_date message.created_on %></span>
@@ -213,12 +214,12 @@
                         <% iamge_path = get_image_path_from_content(news.description) %>
                         <div class="sn-news-small mb18">
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <%= link_to image_tag("/images/default_blank/left-03.jpg", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
                           <% end %>
                           <h3>
-                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h4-title fl mt10" %>
+                            <div class="sn-title-wrap"><%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                           </h3>
                           <span class="txt-grey fl "><%= format_date news.created_on %></span>
                           <div class="cl"></div>
@@ -230,4 +231,15 @@
     <% end %>
 <% end %>
 <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+<script>
+      $(".h4-title").each(function(){
+          var titleHeight = $(this).height();
+          if (titleHeight > 52){
+              $(this).next().show();
+          }
+          else {
+              $(this).next().hide();
+          }
+      });
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftM2_default.html.erb b/app/views/organizations/_org_subfield_leftM2_default.html.erb
index 1b47d9d5c..639b8d5be 100644
--- a/app/views/organizations/_org_subfield_leftM2_default.html.erb
+++ b/app/views/organizations/_org_subfield_leftM2_default.html.erb
@@ -1,26 +1,38 @@
-<div class="sn-news-smallbox fl">
-  <div class="sn-news-small mb18">
-    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small01.jpg" width="85" height="85" alt=""/></a>
-    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
-    <span class="txt-grey fl">2016-04-08</span>
-    <div class="cl"></div>
-  </div>
-  <div class="sn-news-small mb18">
-    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small02.jpg" width="85" height="85" alt=""/></a>
-    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
-    <span class="txt-grey fl">2016-04-08</span>
-    <div class="cl"></div>
-  </div>
-  <div class="sn-news-small mb18">
-    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small03.jpg" width="85" height="85" alt=""/></a>
-    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
-    <span class="txt-grey fl">2016-04-08</span>
-    <div class="cl"></div>
-  </div>
-  <div class="sn-news-small ">
-    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small04.jpg" width="85" height="85" alt=""/></a>
-    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
-    <span class="txt-grey fl">2016-04-08</span>
-    <div class="cl"></div>
-  </div>
-</div>
\ No newline at end of file
+<div class="sn-news-small mb18">
+  <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+  <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+  <span class="txt-grey fl">时间</span>
+  <div class="cl"></div>
+</div>
+<div class="sn-news-small mb18">
+  <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+  <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+  <span class="txt-grey fl">时间</span>
+  <div class="cl"></div>
+</div>
+  <div class="sn-news-small mb18">
+    <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+    <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+    <span class="txt-grey fl">时间</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small ">
+    <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+    <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+    <span class="txt-grey fl">时间</span>
+    <div class="cl"></div>
+</div>
+
+<script>
+    $(document).ready(function(){
+        $(".h4-title").each(function(){
+            var titleHeight = $(this).height();
+            if (titleHeight > 52){
+                $(this).next().show();
+            }
+            else {
+                $(this).next().hide();
+            }
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb
index 2db926776..d0439439a 100644
--- a/app/views/organizations/_org_subfield_leftMD.html.erb
+++ b/app/views/organizations/_org_subfield_leftMD.html.erb
@@ -1,258 +1,300 @@
-<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-  <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-  <div class="sn-index-resourcescon">
+
   <% if is_default_field?(field) %>
       <% case field.name %>
       <% when 'course' %>
           <% if @course_acts.blank? %>
-              <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title">课程动态</h2>
+                <div class="sn-index-resourcescon">
+                    <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                    <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
-              <% @course_acts.first(4).each do |act| %>
-                  <% if act.org_act_type == "HomeworkCommon" %>
-                      <% activity = HomeworkCommon.find(act.org_act_id) %>
-                      <% iamge_path = get_image_path_from_content(activity.description) %>
-                      <div class="sn-index-resourcesbox">
-                        <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% end %>
-                        <h3>
-                          <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
-                        </h3>
-                        <div class="resources-tagbox">
-                          <%= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
-                        </div>
-                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                      </div>
-                  <% elsif act.org_act_type == "Message" %>
-                      <% activity = Message.find(act.org_act_id) %>
-                      <% iamge_path = get_image_path_from_content(activity.content) %>
-                      <div class="sn-index-resourcesbox">
-                        <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% end %>
-                        <h3>
-                          <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                              <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
-                          <% else %>
-                              <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
-                          <% end %>
-                        </h3>
-                        <div class="resources-tagbox">
-                          <%= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
-                        </div>
-                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                      </div>
-                  <% elsif act.org_act_type == "News" %>
-                      <% activity = News.find(act.org_act_id) %>
-                      <% iamge_path = get_image_path_from_content(activity.description) %>
-                      <div class="sn-index-resourcesbox">
-                        <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% end %>
-                        <h3>
-                          <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
-                        </h3>
-                        <div class="resources-tagbox">
-                          <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
-                        </div>
-                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                      </div>
-                  <% elsif act.org_act_type == "Poll" %>
-                      <% activity = Poll.find(act.org_act_id) %>
-                      <% has_commit = has_commit_poll?(activity.id ,User.current)%>
-                      <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
-                      <% iamge_path = get_image_path_from_content(activity.polls_description) %>
-                      <% if ( activity.polls_status==2) %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title">课程动态</h2>
+                <div class="sn-index-resourcescon">
+                  <% @course_acts.first(4).each do |act| %>
+                      <% if act.org_act_type == "HomeworkCommon" %>
+                          <% activity = HomeworkCommon.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.description) %>
+                          <div class="sn-index-resourcesbox">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% end %>
+                            <h3>
+                              <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                            </h3>
+                            <div class="resources-tagbox">
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                            </div>
+                            <%#= link_to "更多", student_work_index_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
+                          </div>
+                      <% elsif act.org_act_type == "Message" %>
+                          <% activity = Message.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="sn-index-resourcesbox">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
-                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
                             <h3>
-                              <% if has_commit %>
-                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title"  %>
+                              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                  <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% else %>
-                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title"  %>
+                                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%= link_to activity.polls_description.to_s.html_safe, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-tag" %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                            </div>
+                          </div>
+                      <% elsif act.org_act_type == "News" %>
+                          <% activity = News.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.description) %>
+                          <div class="sn-index-resourcesbox">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% end %>
+                            <h3>
+                              <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                            </h3>
+                            <div class="resources-tagbox">
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
-                            <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                            <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
                           </div>
+                      <% elsif act.org_act_type == "Poll" %>
+                          <% activity = Poll.find(act.org_act_id) %>
+                          <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                          <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                          <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                          <% if ( activity.polls_status==2) %>
+                              <div class="sn-index-resourcesbox">
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <% end %>
+                                <h3>
+                                  <% if has_commit %>
+                                      <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title sn-hidden"  %>
+                                  <% else %>
+                                      <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title sn-hidden"  %>
+                                  <% end %>
+                                </h3>
+                                <div class="resources-tagbox">
+                                  <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.polls_description, :maxheight=>54, :maxwordsnum => 28} %>
+                                  <%#= link_to activity.polls_description.to_s.html_safe, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-tag" %>
+                                </div>
+                              </div>
+                          <% end %>
                       <% end %>
                   <% end %>
-              <% end %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% end %>
       <% when 'project' %>
           <% if @project_acts.blank? %>
-              <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title">项目动态</h2>
+                <div class="sn-index-resourcescon">
+                  <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
-              <% @project_acts.first(4).each do |act| %>
-                  <% if act.org_act_type == "Issue" %>
-                      <% activity = Issue.find(act.org_act_id) %>
-                      <% iamge_path = get_image_path_from_content(activity.description) %>
-                      <div class="sn-index-resourcesbox">
-                        <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% end %>
-                        <h3>
-                          <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
-                        </h3>
-                        <div class="resources-tagbox">
-                          <%= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
-                        </div>
-                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                      </div>
-                  <% elsif act.org_act_type == "Message" %>
-                      <% activity = Message.find(act.org_act_id) %>
-                      <% iamge_path = get_image_path_from_content(activity.content) %>
-                      <div class="sn-index-resourcesbox">
-                          <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                          <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                          <% end %>
-                          <h3>
-                            <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title">项目动态</h2>
+                <div class="sn-index-resourcescon">
+                  <% @project_acts.first(4).each do |act| %>
+                      <% if act.org_act_type == "Issue" %>
+                          <% activity = Issue.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.description) %>
+                          <div class="sn-index-resourcesbox">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% else %>
-                                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
                             <% end %>
-                          </h3>
-                          <div class="resources-tagbox">
-                            <%= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                            <h3>
+                              <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                            </h3>
+                            <div class="resources-tagbox">
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                            </div>
                           </div>
-                          <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                      </div>
-                  <% elsif act.org_act_type == "News" %>
-                      <% activity = News.find(act.org_act_id) %>
-                      <% iamge_path = get_image_path_from_content(activity.description) %>
-                      <div class="sn-index-resourcesbox">
-                        <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% end %>
-                        <h3>
-                            <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
-                        </h3>
-                        <div class="resources-tagbox">
-                          <%= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
-                        </div>
-                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                      </div>
+                      <% elsif act.org_act_type == "Message" %>
+                          <% activity = Message.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.content) %>
+                          <div class="sn-index-resourcesbox">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% end %>
+                            <h3>
+                              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                  <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                              <% else %>
+                                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                              <% end %>
+                            </h3>
+                            <div class="resources-tagbox">
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                            </div>
+                          </div>
+                      <% elsif act.org_act_type == "News" %>
+                          <% activity = News.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.description) %>
+                          <div class="sn-index-resourcesbox">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% end %>
+                            <h3>
+                              <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                            </h3>
+                            <div class="resources-tagbox">
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                            </div>
+                            <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank"  %>
+                          </div>
+                      <% end %>
                   <% end %>
-              <% end %>
+                  <div class="cl"></div>
+                </div>
+              </div>
+
           <% end %>
       <% end %>
   <% else %>
       <% if field.field_type == "Post" %>
           <% org_acts = get_subfield_acts field %>
           <% if org_acts.blank? %>
-              <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                  <h2 class="h2-title"><%= field.name %></h2>
+                  <div class="sn-index-resourcescon">
+                  <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
-              <% org_acts.first(4).each do |activity| %>
-                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
-                      <% document = activity.org_act %>
-                      <% org_subfield_id = params[:org_subfield_id] %>
-                      <% flag = 2 %>
-                      <% iamge_path = get_image_path_from_content(document.content) %>
-                      <div class="sn-index-resourcesbox">
-                        <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% else %>
-                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
-                        <% end %>
-                        <h3>
-                          <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title" %>
-                        </h3>
-                        <div class="resources-tagbox">
-                          <%= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
-                        </div>
-                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                      </div>
-                  <% else activity.container_type == 'OrgSubfield' %>
-                      <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                          <% message = Message.find(activity.org_act_id) %>
-                          <% if message.parent_id.nil? %>
-                              <% content = message.content%>
-                          <% else %>
-                              <% content = message.parent.content%>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title"><%= field.name %>
+                  <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+                </h2>
+                <div class="sn-index-resourcescon">
+                  <% org_acts.first(4).each do |activity| %>
+                      <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                          <% document = activity.org_act %>
+                          <% org_subfield_id = params[:org_subfield_id] %>
+                          <% flag = 2 %>
+                          <% iamge_path = get_image_path_from_content(document.content) %>
+                          <div class="sn-index-resourcesbox">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% end %>
+                            <h3>
+                              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                            </h3>
+                            <div class="resources-tagbox">
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
+                            </div>
+                            <%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank"  %>
+
+                          </div>
+                      <% else activity.container_type == 'OrgSubfield' %>
+                          <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                              <% message = Message.find(activity.org_act_id) %>
+                              <% if message.parent_id.nil? %>
+                                  <% content = message.content%>
+                              <% else %>
+                                  <% content = message.parent.content%>
+                              <% end %>
+                              <% iamge_path = get_image_path_from_content(content) %>
+                              <% if message.board.org_subfield_id %>
+                                  <div class="sn-index-resourcesbox">
+                                    <% if iamge_path.nil? %>
+                                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                    <% else %>
+                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                    <% end %>
+                                    <h3>
+                                      <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                          <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                                      <% else %>
+                                          <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
+                                      <% end %>
+                                    </h3>
+                                    <div class="resources-tagbox">
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                                    </div>
+                                    <%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
+                                  </div>
+                              <% else %>
+                                  <div class="sn-index-resourcesbox">
+                                    <% if iamge_path.nil? %>
+                                        <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                    <% else %>
+                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                    <% end %>
+                                    <h3>
+                                      <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                          <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title sn-hidden" %>
+                                      <% else %>
+                                          <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title sn-hidden" %>
+                                      <% end %>
+                                    </h3>
+                                    <div class="resources-tagbox">
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
+                                    </div>
+                                    <%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
+                                  </div>
+                              <% end %>
                           <% end %>
-                          <% iamge_path = get_image_path_from_content(content) %>
-                          <% if message.board.org_subfield_id %>
+                          <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                              <% news = News.find(activity.org_act_id) %>
+                              <% iamge_path = get_image_path_from_content(news.description) %>
                               <div class="sn-index-resourcesbox">
                                 <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                    <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
                                 <% else %>
-                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
                                 <% end %>
                                 <h3>
-                                  <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                      <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title" %>
-                                  <% else %>
-                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title" %>
-                                  <% end %>
+                                  <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title sn-hidden" %>
                                 </h3>
                                 <div class="resources-tagbox">
-                                  <%= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                                  <%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
+                                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
                                 </div>
-                                <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                              </div>
-                          <% else %>
-                              <div class="sn-index-resourcesbox">
-                                <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
-                                <% else %>
-                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
-                                <% end %>
-                                <h3>
-                                  <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                      <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title" %>
-                                  <% else %>
-                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title" %>
-                                  <% end %>
-                                </h3>
-                                <div class="resources-tagbox">
-                                  <%= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
-                                </div>
-                                <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                                <%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
                               </div>
                           <% end %>
                       <% end %>
-                      <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                          <% news = News.find(activity.org_act_id) %>
-                          <% iamge_path = get_image_path_from_content(news.description) %>
-                          <div class="sn-index-resourcesbox">
-                            <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
-                            <% else %>
-                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
-                            <% end %>
-                            <h3>
-                              <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title" %>
-                            </h3>
-                            <div class="resources-tagbox">
-                              <%= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
-                            </div>
-                            <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
-                          </div>
-                      <% end %>
                   <% end %>
-              <% end %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% end %>
       <% end %>
   <% end %>
-    <div class="cl"></div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftMD_default.html.erb b/app/views/organizations/_org_subfield_leftMD_default.html.erb
index 4268c7cc8..c080d5481 100644
--- a/app/views/organizations/_org_subfield_leftMD_default.html.erb
+++ b/app/views/organizations/_org_subfield_leftMD_default.html.erb
@@ -1,11 +1,11 @@
 <div class="sn-index-resourcesbox">
-  <a href="javascript:void()" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/files-default.jpg" width="185" height="125" alt=""/></a>
-  <h3><a href="javascript:void()" target="_blank" class="resources-title">仪器资源</a></h3>
-  <div class="resources-tagbox">
-    <a href="javascript:void()" target="_blank" class="resources-tag">测试服务</a>
-    <a href="javascript:void()" target="_blank" class="resources-tag">开放日</a>
-    <a href="javascript:void()" target="_blank" class="resources-tag">仪器共享</a>
-    <a href="javascript:void()" target="_blank" class="resources-tag">定制测试</a>
-  </div>
-  <a href="javascript:void()" target="_blank" class="more-btn">更多</a>
+  <a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/left-04.jpg" width="185" height="125" alt=""/></a>
+  <!--<h3><a href="javascript:void(0);" target="_blank" class="resources-title sn-hidden">仪器资源</a></h3>-->
+  <!--<div class="resources-tagbox">-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">测试服务</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">开放日</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">仪器共享</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">定制测试</a>-->
+  <!--</div>-->
+  <!--<a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>-->
 </div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftT.html.erb b/app/views/organizations/_org_subfield_leftT.html.erb
index e64044a6b..f683aabad 100644
--- a/app/views/organizations/_org_subfield_leftT.html.erb
+++ b/app/views/organizations/_org_subfield_leftT.html.erb
@@ -14,7 +14,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -25,7 +25,7 @@
                           <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -42,7 +42,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -58,7 +58,7 @@
                           <% if ( activity.polls_status==2) %>
                               <div class="fcon" style="display: none;">
                                 <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
+                                    <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
                                 <% end %>
@@ -101,7 +101,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -112,7 +112,7 @@
                           <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -129,7 +129,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -172,7 +172,7 @@
                           <% iamge_path = get_image_path_from_content(document.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -190,7 +190,7 @@
                                   <% iamge_path = get_image_path_from_content(content) %>
                                   <div class="fcon" style="display: none;">
                                     <% if iamge_path.nil? %>
-                                        <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                        <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% else %>
                                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% end %>
@@ -211,7 +211,7 @@
                                   <% iamge_path = get_image_path_from_content(content) %>
                                   <div class="fcon" style="display: none;">
                                     <% if iamge_path.nil? %>
-                                        <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
+                                        <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% else %>
                                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% end %>
@@ -230,7 +230,7 @@
                               <% iamge_path = get_image_path_from_content(news.description) %>
                               <div class="fcon" style="display: none;">
                                 <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
+                                    <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
                                 <% end %>
diff --git a/app/views/organizations/_org_subfield_leftT_default.html b/app/views/organizations/_org_subfield_leftT_default.html.erb
similarity index 65%
rename from app/views/organizations/_org_subfield_leftT_default.html
rename to app/views/organizations/_org_subfield_leftT_default.html.erb
index f2f66758f..2e681965a 100644
--- a/app/views/organizations/_org_subfield_leftT_default.html
+++ b/app/views/organizations/_org_subfield_leftT_default.html.erb
@@ -3,7 +3,7 @@
     <div id="fsD1" class="focus">
         <div  class="fPic">
             <div class="fcon-default">
-                <a target="_blank" href="javascript:void(0);"><img src="/images/default_blank/banner-default.jpg" alt="" ></a>
+                <a><img src="/images/default_blank/left_01.jpg" alt="" ></a>
             </div>
         </div>
     </div>
diff --git a/app/views/organizations/_org_subfield_rightD.html.erb b/app/views/organizations/_org_subfield_rightD.html.erb
index 131ae5183..2953d1a0a 100644
--- a/app/views/organizations/_org_subfield_rightD.html.erb
+++ b/app/views/organizations/_org_subfield_rightD.html.erb
@@ -10,14 +10,14 @@
         <% org_acts = get_subfield_acts field %>
         <% unless org_acts.blank? %>
             <% activity = org_acts.first %>
-            <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <div class="sn-index-smallbanner sn-mb20" style="display:<%= field.hide == 0?'block':'none' %>;">
               <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
                   <% document = activity.org_act %>
                   <% org_subfield_id = params[:org_subfield_id] %>
                   <% flag = 2 %>
                   <% iamge_path = get_image_path_from_content(document.content) %>
                   <% if iamge_path.nil? %>
-                      <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                      <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                   <% else %>
                       <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                   <% end %>
@@ -27,14 +27,14 @@
                       <% if message.board.org_subfield_id %>
                           <% iamge_path = get_image_path_from_content(message.content) %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                              <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                           <% end %>
                       <% else %>
                           <% iamge_path = get_image_path_from_content(message.content) %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                              <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
                           <% end %>
@@ -44,7 +44,7 @@
                       <% news = News.find(activity.org_act_id) %>
                       <% iamge_path = get_image_path_from_content(news.description) %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                          <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
                       <% end %>
@@ -52,21 +52,21 @@
               <% end %>
             </div>
         <% else %>
-            <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
-              <a href="javascript:void(0);" target="_blank" ><img  src="/images/default_blank/ad-default.jpg" width="369" height="169" alt=""/></a>
+            <div class="sn-index-smallbanner sn-mb20" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <a href="javascript:void(0);" target="_blank" ><img  src="/images/default_blank/right-03.jpg" width="369" height="169" alt=""/></a>
             </div>
         <% end %>
     <% elsif field.field_type == "Resource" %>
         <% org_attachs = get_attach_org2(field) %>
-        <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+        <div class="sn-index-smallbanner sn-mb20" style="display:<%= field.hide == 0?'block':'none' %>;">
           <% 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 image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+                  <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
               <% else %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+                  <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
               <% end %>
           <% else %>
-              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+              <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
           <% end %>
         </div>
     <% end %>
diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb
index d75b9f20f..d1b86f047 100644
--- a/app/views/organizations/_org_subfield_rightM.html.erb
+++ b/app/views/organizations/_org_subfield_rightM.html.erb
@@ -1,6 +1,6 @@
 <% if is_default_field?(field) %>
     <% case field.name %>
-<% when 'course' %>
+    <% when 'course' %>
         <p>暂无内容！</p>
     <% when 'project' %>
         <p>暂无内容！</p>
@@ -19,11 +19,12 @@
                   <h2 class="h2-title "><%= field.name %></h2>
                   <div class="sn-index-wx">
                     <% if iamge_path.nil? %>
-                        <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+                        <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                     <% else %>
                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                     <% end %>
-                    <p class="fl sn-index-txt sn-w229"><%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></p>
+                    <p class="fl sn-index-txt sn-w229"><%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %></p>
+                    <p class="fl sn-f12 sn-read-all" style="display:none;"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %></p>
                     <div class="cl"></div>
                   </div>
               <% else activity.container_type == 'OrgSubfield' %>
@@ -34,11 +35,12 @@
                           <h2 class="h2-title "><%= field.name %></h2>
                           <div class="sn-index-wx">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+                                <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% end %>
-                            <p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
+                            <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
+                            <p class="fl sn-f12 sn-read-all" style="display:none;"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %></p>
                             <div class="cl"></div>
                           </div>
                       <% else %>
@@ -46,11 +48,12 @@
                           <h2 class="h2-title "><%= field.name %></h2>
                           <div class="sn-index-wx">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
+                                <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% end %>
-                            <p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
+                            <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
+                            <p class="fl sn-f12 sn-read-all" style="display:none;"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %></p>
                             <div class="cl"></div>
                           </div>
                       <% end %>
@@ -61,11 +64,12 @@
                       <h2 class="h2-title "><%= field.name %></h2>
                       <div class="sn-index-wx">
                         <% if iamge_path.nil? %>
-                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
+                            <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
                         <% end %>
-                        <p class="fl sn-index-txt"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
+                        <p class="fl sn-index-txt sn-w229"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
+                        <p class="fl sn-f12 sn-read-all" style="display:none;"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %></p>
                         <div class="cl"></div>
                       </div>
                   <% end %>
@@ -75,8 +79,8 @@
             <div class="sn-index-wxbox" style="display:<%= field.hide == 0?'block':'none' %>;">
               <h2 class="h2-title "><%= field.name %></h2>
               <div class="sn-index-wx">
-                <img class="fl sn-index-wximg" src="/images/wx.gif" width="104" height="104" alt=""/>
-                <p class="fl sn-index-txt">暂无内容！</p>
+                <img class="fl sn-index-wximg" src="/images/default_blank/right-02.jpg" width="104" height="104" alt=""/>
+                <p class="fl sn-index-txt sn-w229"></p>
                 <div class="cl"></div>
               </div>
             </div>
@@ -86,13 +90,22 @@
         <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
           <% 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 image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+                  <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
               <% else %>
-                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+                  <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
               <% end %>
           <% else %>
-              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+              <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
           <% end %>
         </div>
     <% end %>
 <% end %>
+
+<script>
+  $(".sn-index-txt").each(function(){
+      var wholeHeight = $(this).children().height();
+      if (wholeHeight > 54){
+          $(this).next().show();
+      }
+  });
+</script>
diff --git a/app/views/organizations/_org_subfield_rightM2.html.erb b/app/views/organizations/_org_subfield_rightM2.html.erb
new file mode 100644
index 000000000..1482f64a2
--- /dev/null
+++ b/app/views/organizations/_org_subfield_rightM2.html.erb
@@ -0,0 +1,33 @@
+<% unless excellent_teachers.count == 0 %>
+    <div class="sn-teacher-wrap" style="display:<%= field.hide == 0?'block':'none' %>;">
+      <h2 class="h2-title sn-mb5"><%= field.name %>
+        <%= link_to "更多", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => field.id), :target => "_blank", :class => "more" %>
+      </h2>
+      <% excellent_teachers.each do |teacher| %>
+          <div class="sn-teacher-list">
+        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sn-fl sn-avatar-circle", :style => "display:block;"), user_path(teacher), :alt => "用户头像", :target => '_blank'  %>
+            <!--<a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>-->
+            <div class="sn-teacher-info">
+              <%=link_to teacher.try(:realname) ? teacher.try(:realname) :teacher.try(:login), user_path(teacher), :class => "sn-teacher-name sn-hidden", :title => '', :target => '_blank' %></a>
+              <span class="sn-teacher-unit sn-hidden" title="<%= teacher.my_workplace %>"><%= teacher.my_workplace %></span> </div>
+            <div class="sn-teacher-social">
+              <% unless teacher.my_blogs_count == 0 %>
+                  <span class="sn-mr20">博客 <%= teacher.my_blogs_count %></span>
+              <% end %>
+              <% unless teacher.courses.count == 0 %>
+                  <span class="sn-mr20">课程 <%= teacher.courses.count %></span>
+              <% end %>
+              <% unless teacher.my_students == 0 %>
+                  <span>学生 <%= teacher.my_students %></span>
+              <% end %>
+            </div>
+            <div class="sn-cl"></div>
+          </div>
+      <% end %>
+    </div>
+
+    <script>
+        $(".sn-teacher-list:last").addClass("sn-border-none");
+    </script>
+<% end  %>
+
diff --git a/app/views/organizations/_org_subfield_rightT.html.erb b/app/views/organizations/_org_subfield_rightT.html.erb
index e93031991..f28c3fdbb 100644
--- a/app/views/organizations/_org_subfield_rightT.html.erb
+++ b/app/views/organizations/_org_subfield_rightT.html.erb
@@ -1,223 +1,247 @@
-<div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
-<h2 class="h2-title mb18"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
-<% if is_default_field?(field) %>
-    <% case field.name %>
-    <% when 'course' %>
-        <% if @course_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
-        <% else %>
-            <% @course_acts.first(4).each do |act| %>
-                <% if act.org_act_type == "HomeworkCommon" %>
-                    <% activity = HomeworkCommon.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-index-active">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
-                      </h3>
-                      <span class="txt-grey "><%= format_date activity.updated_at %></span>
-                    </div>
-                <% elsif act.org_act_type == "Message" %>
-                    <% activity = Message.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.content) %>
-                    <div class="sn-index-active">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% end %>
-                      <h3>
-                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
-                        <% else %>
-                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
-                        <% end %>
-                      </h3>
-                      <span class="txt-grey "><%= format_date activity.updated_on %></span>
-                    </div>
-                <% elsif act.org_act_type == "News" %>
-                    <% activity = News.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-index-active">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
-                      </h3>
-                      <span class="txt-grey "><%= format_date activity.created_on %></span>
-                    </div>
-                <% elsif act.org_act_type == "Poll" %>
-                    <% activity = Poll.find(act.org_act_id) %>
-                    <% has_commit = has_commit_poll?(activity.id ,User.current)%>
-                    <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
-                    <% iamge_path = get_image_path_from_content(activity.polls_description) %>
-                    <% if ( activity.polls_status==2) %>
-                        <div class="sn-index-active">
-                          <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
-                          <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
-                          <% end %>
-                          <h3>
-                            <% if has_commit %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title"  %>
-                            <% else %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title"  %>
-                            <% end %>
-                          </h3>
-                          <span class="txt-grey "><%= format_date activity.published_at %></span>
-                        </div>
-                    <% end %>
-                <% end %>
-            <% end %>
-        <% end %>
-    <% when 'project' %>
-        <% if @project_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
-        <% else %>
-            <% @project_acts.first(4).each do |act| %>
-                <% if act.org_act_type == "Issue" %>
-                    <% activity = Issue.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-index-active">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
-                      </h3>
-                      <span class="txt-grey "><%= format_date activity.updated_on %></span>
-                    </div>
-                <% elsif act.org_act_type == "Message" %>
-                    <% activity = Message.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.content) %>
-                    <div class="sn-index-active">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% end %>
-                      <h3>
-                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
-                        <% else %>
-                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
-                        <% end %>
-                      </h3>
-                      <span class="txt-grey "><%= format_date activity.updated_on %></span>
-                    </div>
-                <% elsif act.org_act_type == "News" %>
-                    <% activity = News.find(act.org_act_id) %>
-                    <% iamge_path = get_image_path_from_content(activity.description) %>
-                    <div class="sn-index-active">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
-                      </h3>
-                      <span class="txt-grey "><%= format_date activity.created_on %></span>
-                    </div>
-                <% end %>
-            <% end %>
-        <% end %>
-    <% end %>
-<% else %>
-    <% if field.field_type == "Post" %>
-        <% org_acts = get_subfield_acts field %>
-        <% if org_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
-        <% else %>
-            <% org_acts.first(4).each do |activity| %>
-                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
-                    <% document = activity.org_act %>
-                    <% org_subfield_id = params[:org_subfield_id] %>
-                    <% flag = 2 %>
-                    <% iamge_path = get_image_path_from_content(document.content) %>
-                    <div class="sn-index-active">
-                      <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% else %>
-                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
-                      <% end %>
-                      <h3>
-                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "active-title" %>
-                      </h3>
-                      <span class="txt-grey "><%= format_date document.created_at %></span>
-                    </div>
-                <% else activity.container_type == 'OrgSubfield' %>
-                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                        <% message = Message.find(activity.org_act_id) %>
-                        <% if message.parent_id.nil? %>
-                            <% content = message.content%>
-                        <% else %>
-                            <% content = message.parent.content%>
-                        <% end %>
-                        <% iamge_path = get_image_path_from_content(content) %>
-                        <% if message.board.org_subfield_id %>
-                            <div class="sn-index-active">
-                              <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
-                              <% else %>
-                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
-                              <% end %>
-                              <h3>
-                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %>
-                                <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %>
-                                <% end %>
-                              </h3>
-                              <span class="txt-grey "><%= format_date message.created_on %></span>
-                            </div>
-                        <% else %>
-                            <div class="sn-index-active">
-                              <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
-                              <% else %>
-                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
-                              <% end %>
-                              <h3>
-                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "active-title" %>
-                                <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "active-title" %>
-                                <% end %>
-                              </h3>
-                              <span class="txt-grey "><%= format_date message.created_on %></span>
-                            </div>
-                        <% end %>
-                    <% end %>
-                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                        <% news = News.find(activity.org_act_id) %>
-                        <% iamge_path = get_image_path_from_content(news.description) %>
-                        <div class="sn-index-active">
-                          <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
-                          <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
-                          <% end %>
-                          <h3>
-                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "active-title" %>
-                          </h3>
-                          <span class="txt-grey "><%= format_date news.created_on %></span>
-                        </div>
-                    <% end %>
-                <% end %>
-            <% end %>
-        <% end %>
-    <% end %>
-<% end %>
-<div class="cl"></div>
-</div>
\ No newline at end of file
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <% if @course_acts.blank? %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18">课程动态</h2>
+              <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
+        <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18">课程动态</h2>
+              <% @course_acts.first(4).each do |act| %>
+                  <% if act.org_act_type == "HomeworkCommon" %>
+                      <% activity = HomeworkCommon.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.description) %>
+                      <div class="sn-index-active">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+                        </h3>
+                        <span class="txt-grey "><%= format_date activity.updated_at %></span>
+                      </div>
+                  <% elsif act.org_act_type == "Message" %>
+                      <% activity = Message.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.content) %>
+                      <div class="sn-index-active">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% end %>
+                        <h3>
+                          <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                              <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+                          <% else %>
+                              <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+                          <% end %>
+                        </h3>
+                        <span class="txt-grey "><%= format_date activity.updated_on %></span>
+                      </div>
+                  <% elsif act.org_act_type == "News" %>
+                      <% activity = News.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.description) %>
+                      <div class="sn-index-active">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+                        </h3>
+                        <span class="txt-grey "><%= format_date activity.created_on %></span>
+                      </div>
+                  <% elsif act.org_act_type == "Poll" %>
+                      <% activity = Poll.find(act.org_act_id) %>
+                      <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                      <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                      <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                      <% if ( activity.polls_status==2) %>
+                          <div class="sn-index-active">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
+                            <% end %>
+                            <h3>
+                              <% if has_commit %>
+                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title"  %>
+                              <% else %>
+                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title"  %>
+                              <% end %>
+                            </h3>
+                            <span class="txt-grey "><%= format_date activity.published_at %></span>
+                          </div>
+                      <% end %>
+                  <% end %>
+              <% end %>
+              <div class="cl"></div>
+            </div>
+
+        <% end %>
+    <% when 'project' %>
+        <% if @project_acts.blank? %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18">项目动态</h2>
+              <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
+        <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18">项目动态</h2>
+              <% @project_acts.first(4).each do |act| %>
+                  <% if act.org_act_type == "Issue" %>
+                      <% activity = Issue.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.description) %>
+                      <div class="sn-index-active">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+                        </h3>
+                        <span class="txt-grey "><%= format_date activity.updated_on %></span>
+                      </div>
+                  <% elsif act.org_act_type == "Message" %>
+                      <% activity = Message.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.content) %>
+                      <div class="sn-index-active">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% end %>
+                        <h3>
+                          <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                              <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+                          <% else %>
+                              <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+                          <% end %>
+                        </h3>
+                        <span class="txt-grey "><%= format_date activity.updated_on %></span>
+                      </div>
+                  <% elsif act.org_act_type == "News" %>
+                      <% activity = News.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.description) %>
+                      <div class="sn-index-active">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+                        </h3>
+                        <span class="txt-grey "><%= format_date activity.created_on %></span>
+                      </div>
+                  <% end %>
+              <% end %>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %>
+        <% org_acts = get_subfield_acts field %>
+        <% if org_acts.blank? %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %></h2>
+              <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
+        <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %>
+                <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+                <!--<a href="javascript:void(0);" target="_blank" class="more">更多</a>-->
+              </h2>
+              <% org_acts.first(4).each do |activity| %>
+                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                      <% document = activity.org_act %>
+                      <% org_subfield_id = params[:org_subfield_id] %>
+                      <% flag = 2 %>
+                      <% iamge_path = get_image_path_from_content(document.content) %>
+                      <div class="sn-index-active">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "active-title" %>
+                        </h3>
+                        <span class="txt-grey "><%= format_date document.created_at %></span>
+                      </div>
+                  <% else activity.container_type == 'OrgSubfield' %>
+                      <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                          <% message = Message.find(activity.org_act_id) %>
+                          <% if message.parent_id.nil? %>
+                              <% content = message.content%>
+                          <% else %>
+                              <% content = message.parent.content%>
+                          <% end %>
+                          <% iamge_path = get_image_path_from_content(content) %>
+                          <% if message.board.org_subfield_id %>
+                              <div class="sn-index-active">
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
+                                <% end %>
+                                <h3>
+                                  <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                      <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %>
+                                  <% else %>
+                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %>
+                                  <% end %>
+                                </h3>
+                                <span class="txt-grey "><%= format_date message.created_on %></span>
+                              </div>
+                          <% else %>
+                              <div class="sn-index-active">
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
+                                <% end %>
+                                <h3>
+                                  <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                      <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "active-title" %>
+                                  <% else %>
+                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "active-title" %>
+                                  <% end %>
+                                </h3>
+                                <span class="txt-grey "><%= format_date message.created_on %></span>
+                              </div>
+                          <% end %>
+                      <% end %>
+                      <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                          <% news = News.find(activity.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(news.description) %>
+                          <div class="sn-index-active">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/right-01.jpg", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
+                            <% end %>
+                            <h3>
+                              <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "active-title" %>
+                            </h3>
+                            <span class="txt-grey "><%= format_date news.created_on %></span>
+                          </div>
+                      <% end %>
+                  <% end %>
+              <% end %>
+              <div class="cl"></div>
+            </div>
+        <% end %>
+    <% end %>
+<% end %>
diff --git a/app/views/organizations/_org_subfield_rightT_default.html.erb b/app/views/organizations/_org_subfield_rightT_default.html.erb
new file mode 100644
index 000000000..ac1abc1c8
--- /dev/null
+++ b/app/views/organizations/_org_subfield_rightT_default.html.erb
@@ -0,0 +1,5 @@
+<div class="sn-index-active">
+  <a href="javascript:void()" target="_blank" class="sn-activeimg"><img src="/images/default_blank/right-01.jpg" width="330" height="210" alt=""/></a>
+  <h3><a href="javascript:void()" target="_blank" class="active-title">帖子标题</a></h3>
+  <span class="txt-grey ">创建时间</span>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_teachers_list.html.erb b/app/views/organizations/_org_teachers_list.html.erb
new file mode 100644
index 000000000..f2523fb9f
--- /dev/null
+++ b/app/views/organizations/_org_teachers_list.html.erb
@@ -0,0 +1,59 @@
+<% org_teachers.each do |org_teacher| %>
+    <% school = School.where("id =?", org_teacher.school_id).first %>
+    <div class="teacher-list-row">
+      <div>
+        <div class="teacher-avatar">
+          <%= link_to image_tag(url_to_avatar(org_teacher), :width => "90", :height => "90"), user_url_in_org(org_teacher), :alt => "用户头像" %>
+        </div>
+        <div class="fl">
+          <div class="ml25 mb20"><span class="teacher-name"><%=link_to org_teacher.try(:realname).nil? ? org_teacher.try(:login) : org_teacher.try(:realname), user_url_in_org(org_teacher) %></span>
+            <% unless school.nil? %>
+                <span class="f12 fontGrey2 mr15"><%= school.name %></span>
+            <% end %>
+            <% unless org_teacher.nil? %>
+                <span class="f12 fontGrey2"><%= org_teacher.technical_title %></span></div>
+            <% end %>
+            <div class="teacher-social-block">
+              <div class="block-num"><%= org_teacher.courses.count %></div>
+              <div class="block-title">课程数</div>
+            </div>
+            <div class="block-slice"></div>
+            <div class="teacher-social-block">
+              <div class="block-num"><%= org_teacher.my_students %></div>
+              <div class="block-title">学生数</div>
+            </div>
+            <div class="block-slice"></div>
+            <div class="teacher-social-block">
+              <div class="block-num"><%= org_teacher_resource_count(org_teacher) %></div>
+              <div class="block-title">资源数</div>
+            </div>
+            </div>
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="javascript:void(0);" class="fr teacher-select" onclick="hide($(this),'<%= org_teacher.id %>');" id="hide_<%= org_teacher.id %>"><%= org_teacher.excellent_teacher==0?"设为名师":"取消设置" %></a>
+            <!--<a href="javascript:void(0);" class="fr teacher-select">设为名师</a>-->
+        <% else %>
+            <!--<%# if(org_teacher.watched_by?(User.current)) %>-->
+                <!--<%#= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>org_teacher.id,:target_id=>org_teacher.id),:class => "fr teacher-select", :method => "delete",:remote => "true", :title => "取消关注"%>-->
+            <!--<%# else %>-->
+                <!--<%#= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>org_teacher.id,:target_id=>org_teacher.id),:class => "fr teacher-select", :method => "post",:remote => "true", :title => "添加关注"%>-->
+            <!--<%# end %>-->
+        <% end %>
+      </div>
+      <div class="cl"></div>
+    </div>
+<% end %>
+
+<script>
+    function hide(content, id){
+        if (content.text() == '设为名师')
+            $.ajax({
+                url: "/organizations/set_excellent_teacher?user=" + id,
+                type: "post"
+            });
+        else
+            $.ajax({
+                url: "/organizations/reset_excellent_teacher?user=" + id,
+                type: "post"
+            });
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_setting_excellent_teachers.html.erb b/app/views/organizations/_setting_excellent_teachers.html.erb
new file mode 100644
index 000000000..ea6c1c9a6
--- /dev/null
+++ b/app/views/organizations/_setting_excellent_teachers.html.erb
@@ -0,0 +1,6 @@
+<% if @organization.allow_set_teachers && !org_subfield_had_created?(@organization, "Comptec") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgTec" value="Comptec" name="field_type" />
+      <label for="Comptec">教师</label>
+    </li>
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_show_students.html.erb b/app/views/organizations/_show_students.html.erb
new file mode 100644
index 000000000..7f8d90203
--- /dev/null
+++ b/app/views/organizations/_show_students.html.erb
@@ -0,0 +1,36 @@
+<div class="resources mt10">
+  <div class="function-row">
+    <input type="text" placeholder="搜索" class="teacher-list-search fl" />
+    <a href="javascript:void(0);" class="teacher-search-icon fl"></a>
+    <select class="teacher-search-type fr">
+      <option>课程数</option>
+      <option>学生数</option>
+      <option>资源数</option>
+    </select>
+    <div class="cl"></div>
+  </div>
+  <div class="teacher-list-row">
+    <div>
+      <div class="teacher-avatar"><img src="images/homepageImage.jpg" width="90" height="90" /></div>
+      <div class="fl">
+        <div class="ml25 mb20"><span class="teacher-name">尹刚</span><span class="f12 fontGrey2 mr15">国防科学技术大学</span><span class="f12 fontGrey2">教授</span></div>
+        <div class="teacher-social-block">
+          <div class="block-num">6000</div>
+          <div class="block-title">课程数</div>
+        </div>
+        <div class="block-slice"></div>
+        <div class="teacher-social-block">
+          <div class="block-num">500</div>
+          <div class="block-title">学生数</div>
+        </div>
+        <div class="block-slice"></div>
+        <div class="teacher-social-block">
+          <div class="block-num">8000</div>
+          <div class="block-title">资源数</div>
+        </div>
+      </div>
+      <a href="javascript:void(0);" class="fr teacher-select">添加</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_show_teachers.html.erb b/app/views/organizations/_show_teachers.html.erb
new file mode 100644
index 000000000..355e5a731
--- /dev/null
+++ b/app/views/organizations/_show_teachers.html.erb
@@ -0,0 +1,22 @@
+<div class="resources mt10">
+  <div class="function-row">
+    <%= form_tag( url_for(:controller => 'organizations', :action => 'teacher_search'),
+                        :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+        <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
+        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :style => 'border-style:none', :class => "teacher-search-icon fl" %>
+        <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+    <% end %>
+    <!--<a href="javascript:" class="f_l" onclick="$('#search_student').submit();">搜索</a>-->
+    <!--<input type="text" placeholder="搜索" class="teacher-list-search fl" />-->
+    <!--<a href="javascript:void(0);" class="teacher-search-icon fl"></a>-->
+    <select class="teacher-search-type fr" onclick="chooseTeacherType();">
+      <option value="1">课程数</option>
+      <option value="2">学生数</option>
+      <option value="3">资源数</option>
+    </select>
+    <div class="cl"></div>
+  </div>
+  <div id="org_teachers_list">
+    <%=render 'organizations/org_teachers_list' %>
+  </div>
+</div>
\ 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 5f605f6d9..f16e53b0e 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -1,82 +1,79 @@
-<ul class="orgListRow">
+<ul class="orgListRow borderBottomNone orgListBg">
   <li class="orgOrder fb">顺序</li>
   <li class="orgListUser fb">已有栏目</li>
   <li class="orgListStatus fb">状态</li>
   <li class="orgListStatusList fb fb">排列</li>
-  <li class="orgListStatus fb">类型</li>
-  <li class="orgListUser fb">域名目录</li>
+  <li class="orgListType fb">类型</li>
+  <li class="orgListCatalog fb">域名目录</li>
+  <li class="orgListOperation fb"><span class="mr10">操作</span></li>
   <div class="cl"></div>
 </ul>
-
 <% subfields.each do |field| %>
     <% 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="双击可编辑">
+            <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; width:30px; margin-left:20px;" title="双击可编辑">
               <%= field.priority %>
             </div>
-            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px; margin-left:20px;">
               <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"><%= name %></li>
+          <li class="orgListUser" title="<%= name %>"><%= name %></li>
           <li class="orgListStatus">默认</li>
           <li class="orgListStatusList">
             <% if field.name == "activity" %>
                 默认
             <% else %>
                 <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                    <div class="update_status_class"><span  class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
+                    <div class="update_status_class"><span  class="hidden"><%= subfield_list_type(field.status) %></span>
                       <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
                     </div>
-                    <%= select( :name,:group_id, subfield_status_option,
-                                { :include_blank => false,:selected => field.status},
-                                {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
+                    <%= select( :name,:group_id, subfield_status_option_default, { :include_blank => false,:selected => field.status},
+                           { :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
                 <% end %>
             <% end %>
-
           </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>
+          <li class="orgListType">默认</li>
+          <a href="javascript:void(0);" class="linkGrey 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="双击可编辑">
+            <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; width:30px; margin-left:20px;" title="双击可编辑">
               <%= field.priority %>
             </div>
-            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px; margin-left:20px;">
               <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_show_<%= field.id %>" class="hidden" title="<%= field.name %>"><%= 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="orgListStatusList">
-            <% if field.field_type == "Resource" %>
-                列表
+            <% if field.field_type == "Resource" || field.field_type == "Comptec" %>
+                默认
             <% else %>
                 <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                    <div class="update_status_class"><span class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
+                    <div class="update_status_class"><span class="hidden"><%= subfield_list_type(field.status) %></span>
                       <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
                     </div>
                     <%= select( :name,:group_id, subfield_status_option,
-                                { :include_blank => false,:selected => field.status},
-                                {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
+                           { :include_blank => false,:selected => field.status},
+                           { :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
                 <% end %>
-
             <% end %>
           </li>
-          <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-          <li class="orgListUser hidden">
+          <li class="orgListType"><%= org_subfield_type field %></li>
+          <li class="orgListCatalog 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="双击可编辑">
+                <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;  width:30px; margin-left:20px;" title="双击可编辑">
                   <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
                 </div>
             <% else %>
@@ -89,16 +86,41 @@
             </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 class="orgListOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+            <% unless field.field_type == "Resource" || field.field_type == "Comptec" %>
+                <span class="fr">|</span>
+                <!--escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)-->
+                <!--<a href="javascript:void(0);" class="linkGrey fr mr5" onclick="org_submain_new('<%#= escape_javascript new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field) %>');">添加二级目录</a>-->
+                <%= link_to("添加二级目录", new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field), :class => "linkGrey fr mr5", :remote => true) %>
+            <% end%>
+          </li>
           <div class="cl"></div>
+          <%= render :partial => 'organizations/subfield_sub_domains_list', :locals => {:field => field} %>
         </ul>
     <% end %>
 <% end %>
 
 <script>
+    function org_submain_new(url) {
+        alert(url);
+        $.post(
+                url,
+                function (data) {
+                }
+        );
+    }
+    //二级子目录样式处理
+    $(".orgListRow").each(function(){
+        $(this).children(".orgSubList:first").css({"border-top":"1px solid #e4e4e4","marginTop":"5px"});
+        $(this).children(".orgSubList:last").css("marginBottom","-5px");
+        $(this).children(".orgSubList:last").children("li:first").addClass("orgSubTree2");
+    });
+
     $(document).ready(function(){
         $(".pic_edit2").click(function(){
             $(this).parent().hide();
diff --git a/app/views/organizations/_subfield_sub_domains_list.html.erb b/app/views/organizations/_subfield_sub_domains_list.html.erb
new file mode 100644
index 000000000..89d88237f
--- /dev/null
+++ b/app/views/organizations/_subfield_sub_domains_list.html.erb
@@ -0,0 +1,84 @@
+<% sub_domains = field.sub_domains.order("priority") %>
+<% if sub_domains %>
+    <% sub_domains.each do |subdomain| %>
+        <ul class="orgSubList">
+          <li class="orgSubTree"></li>
+          <li class="orgSubNum ml5 mr5">
+            <div id="show_domain_priority_<%= subdomain.id %>" ondblclick="edit_priority('#show_domain_priority_<%= subdomain.id %>','#edit_domain_priority_<%= subdomain.id %>');"  class="subNumBlock" title="双击可编辑">
+              <%= subdomain.priority %>
+            </div>
+            <div id="edit_domain_priority_<%= subdomain.id %>" style="display:none; width:30px;">
+              <input type="text" onblur="domain_update_priority('#show_domain_priority_<%= subdomain.id %>','#edit_domain_priority_<%= subdomain.id %>','<%= subdomain.org_subfield.id %>','<%= subdomain.id %>',$(this).val());" style="width:20px;" value="<%= subdomain.priority %>"/>
+            </div>
+          </li>
+          <li class="orgSubColumn">
+            <div id="subsubdomain_show_<%= subdomain.id %>" class="subColumnControl" title="<%= subdomain.name %>"><%= subdomain.name %></div>
+            <div id="subsubdomain_edit_<%= subdomain.id %>" style="display:none;">
+              <input type="text" name="name" onblur="update_subfield_subdomain('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>','<%= subdomain.org_subfield.id %>','<%= subdomain.id %>',$(this).val());" value="<%= subdomain.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <li class="orgSubStatus">新增</li>
+          <li class="orgSubOrder">
+            默认
+          </li>
+          <li class="orgSubType"><%= subdomain.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgListCatalog hidden"> -- </li>
+          <%#= link_to "隐藏", hide_org_subsubdomain_organizations_path(subdomain), :method => 'post', :remote => true, :id => "hide_#{subdomain.id}", :class => "linkBlue fr mr5" %>
+          <li class="orgSubOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide_domain($(this),'<%= subdomain.org_subfield.id %>','<%= subdomain.id %>');" id="hide_<%= subdomain.id %>"><%= subdomain.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_sub_domain_path(subdomain, :org_subfield_id => subdomain.org_subfield.id), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>');">编辑</a>
+          </li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+<% end %>
+
+<script>
+    function update_subfield_subdomain(show_id, edit_id, field_id, domain_id, input_value) {
+        if ($(show_id).html().trim() != input_value.trim()) {
+            if (confirm('确定修改为' + input_value + "?"))
+                $.ajax({
+                    url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "?name=" + input_value,
+                    type: 'put'
+                });
+            else{
+                $(edit_id).children("input").val($(show_id).html().trim());
+            }
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+//       $(edit_id).focus();
+    }
+
+
+    function domain_update_priority(show_id, edit_id, field_id, domain_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() != ''){
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/domain_update_priority?priority=" + input_value,
+                type: 'put'
+            });
+        }
+        else{
+            $(edit_id).children("input").val($(show_id).html().trim());
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+    }
+
+    function hide_domain(content, field_id, domain_id){
+        if (content.text() == '隐藏')
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/hide_sub_domain",
+                type: "post"
+            });
+        else
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/show_sub_domain",
+                type: "post"
+            });
+    }
+</script>
diff --git a/app/views/organizations/org_subfield_rightT_default.html.erb b/app/views/organizations/org_subfield_rightT_default.html.erb
index ecdc7fba0..5708da1da 100644
--- a/app/views/organizations/org_subfield_rightT_default.html.erb
+++ b/app/views/organizations/org_subfield_rightT_default.html.erb
@@ -1,7 +1,7 @@
-<div class="sn-index-active">
-  <div class="sn-index-active">
-    <a href="javascript:void()" target="_blank" class="sn-activeimg"><img src="images/active/img-active01.jpg" width="330" height="210" alt=""/></a>
-    <h3><a href="javascript:void()" target="_blank" class="active-title"></a></h3>
-    <span class="txt-grey "></span>
-  </div>
+<div class="sn-index-active">
+  <div class="sn-index-active">
+    <a href="javascript:void()" target="_blank" class="sn-activeimg"><img src="images/active/img-active01.jpg" width="330" height="210" alt=""/></a>
+    <h3><a href="javascript:void()" target="_blank" class="active-title"></a></h3>
+    <span class="txt-grey "></span>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/views/organizations/reset_excellent_teacher.js.erb b/app/views/organizations/reset_excellent_teacher.js.erb
new file mode 100644
index 000000000..fdf160bc4
--- /dev/null
+++ b/app/views/organizations/reset_excellent_teacher.js.erb
@@ -0,0 +1 @@
+$("#hide_<%= @ex_teacher.id %>").text("设为名师");
\ No newline at end of file
diff --git a/app/views/organizations/set_excellent_teacher.js.erb b/app/views/organizations/set_excellent_teacher.js.erb
new file mode 100644
index 000000000..32dc53689
--- /dev/null
+++ b/app/views/organizations/set_excellent_teacher.js.erb
@@ -0,0 +1 @@
+$("#hide_<%= @ex_teacher.id %>").text("取消设置");
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 39848d192..2caeee726 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -87,6 +87,11 @@
           &nbsp;<span>允许游客下载</span>
           <span class="c_green f12" id="allow_down_hint"><%= @organization.is_public? ? "" : "（私有组织不允许游客下载资源）" %></span>
         </div>
+        <% if User.current.admin? %>
+                <div class="orgRow mb10 mt5"><span style="margin-left:10px;">允许设置名师榜&nbsp;: </span>
+                  <input id="allow_set_excellent_teachers" type="checkbox" style="margin-top:5px;" name="organization[allow_teacher]" <%= @organization.allow_teacher==1 ? 'checked': ''%> class="ml3" />
+                </div>
+        <% end %>
         <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org('<%=@organization.id %>','<%= @organization.name %>', $('#organization_name'));">保存</a>
         <% end %>
       </div>
@@ -128,41 +133,42 @@
         <div class="cl"></div>
       </div>
       <div class="undis ml15 mr15" id="orgContent_3">
-        <div class="orgMemberList" id="org_subfield_list">
+<!--新增二级栏目-->
+      <div>
+        <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
+            <span class="fontGrey3 fb mb5 mr10" >新增一级栏目</span>
+            <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
+            <div class="mb10">
+              <span class="fontGrey3 fb mr10 ml24">域名目录</span>
+              <% if domain %>
+                  <span><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
+              <% else %>
+                  <span class="fontGrey2">(用户自定义url，可选) 您还没有子域名，请先在左侧信息栏申请子域名</span>
+              <% end %>
+              <div class="cl"></div>
+            </div>
+            <ul class="orgAddRole mb10">
+              <li class="fontGrey3 fb ml24 mr10 fl">栏目类型</li>
+              <li class="fl mr15">
+                <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
+                <label for="orgMng">帖子</label>
+              </li>
+              <li class="fl mr15">
+                <input type="radio" id="orgMeb" value="Resource" name="field_type" />
+                <label for="orgMeb">资源</label>
+              </li>
+              <div id="org_excellent_teachers">
+                <%= render :partial => 'organizations/setting_excellent_teachers' %>
+              </div>
+              <li class="fr"><a href="javascript:void(0);" class="saveBtn db" onclick="add_org_subfield();">新增</a></li>
+              <li class="cl"></li>
+            </ul>
+        <% end %>
+      </div>
+<!--over-->
+        <div class="orgColumnList" id="org_subfield_list">
           <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")} %>
         </div>
-        <div class="fr orgMemContainer">
-          <div class="fr">
-            <p class="fontBlue fb mb5">新增栏目</p>
-            <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
-                <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
-                <div class="mb5">
-                  <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
-                  <% if domain %>
-                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
-                  <% else %>
-                      <span class="fl" style="width:195px;">您还没有子域名，请先在左侧信息栏申请子域名</span>
-                  <% end %>
-                  <div class="cl"></div>
-                </div>
-                <ul class="orgAddRole">
-                  <li class="fontGrey3 fb mb10">栏目类型</li>
-                  <li class="fl mr15">
-                    <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
-                    <label for="orgMng">帖子</label>
-                  </li>
-                  <li class="fl">
-                    <input type="radio" id="orgMeb" value="Resource" name="field_type" />
-                    <label for="orgMeb">资源</label>
-                  </li>
-                  <li class="cl"></li>
-                </ul>
-                <div class="cl"></div>
-                <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
-            <% end %>
-          </div>
-        </div>
-        <div class="cl"></div>
     </div>
 </div>
 <script>
@@ -170,6 +176,11 @@
       if ($("#subfield_name").val().trim() != "")
         $("#add_subfield_form").submit();
   }
+  function add_org_subfield_subdomain(){
+      if ($("#subfield_name_subdomain").val().trim() != "")
+      $("#add_subfield_form_subdomain").submit();
+      $("#org_subfield_list").html('<%= escape_javascript(render(:partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")}  )) %>');
+  }
   var $is_exist = false;
   function apply_subdomain(id, domain){
       var reg = new RegExp("^[a-zA-Z0-9_]{1,}$");
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index f217f006e..d93ead84b 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -5,46 +5,46 @@
 <% end %>
 
 <% if params[:show_homepage].nil? and User.current.logged? %>
-<div class="homepageRightBanner">
-  <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
-  <% if params[:org_subfield_id].nil? %>
-      <ul class="resourcesSelect">
-        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-          <ul class="homepagePostType">
-            <li>
-              <ul class="homepagePostTypeHomework fl">
-                <li class="f14">课程动态</li>
-                <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-                  <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-                <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-                <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-                <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-              </ul>
-            </li>
-            <li>
-              <ul class="homepagePostTypeProject fl">
-                <li class="f14">项目动态</li>
-                <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
-                <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
-                  <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-              </ul>
-            </li>
-            <li>
-              <ul class="homepagePostTypeProject fl">
-                <li class="f14">更多</li>
-                <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-                <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+    <div class="homepageRightBanner">
+      <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
+      <% if params[:org_subfield_id].nil? %>
+          <ul class="resourcesSelect">
+            <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+              <ul class="homepagePostType">
+                <li>
+                  <ul class="homepagePostTypeHomework fl">
+                    <li class="f14">课程动态</li>
+                    <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+                      <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+                    <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+                    <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                    <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+                  </ul>
+                </li>
+                <li>
+                  <ul class="homepagePostTypeProject fl">
+                    <li class="f14">项目动态</li>
+                    <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+                    <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+                      <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                  </ul>
+                </li>
+                <li>
+                  <ul class="homepagePostTypeProject fl">
+                    <li class="f14">更多</li>
+                    <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
+                    <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+                  </ul>
+                </li>
               </ul>
             </li>
           </ul>
-        </li>
-      </ul>
-  <% end %>
-</div>
+      <% end %>
+    </div>
 <% end %>
 <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
     <script>
@@ -53,7 +53,7 @@
         });
     </script>
     <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
-        <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
+    <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
 <% end  %>
 <% if @org_activities %>
     <%= render :partial =>  'organizations/org_activities',
@@ -67,3 +67,6 @@
 
 
 
+
+
+
diff --git a/app/views/organizations/teacher_search.js.erb b/app/views/organizations/teacher_search.js.erb
new file mode 100644
index 000000000..6b27f0998
--- /dev/null
+++ b/app/views/organizations/teacher_search.js.erb
@@ -0,0 +1 @@
+$("#org_teachers_list").html('<%= escape_javascript( render :partial => 'organizations/org_teachers_list')%>');
diff --git a/app/views/organizations/teachers.html.erb b/app/views/organizations/teachers.html.erb
new file mode 100644
index 000000000..c368adef7
--- /dev/null
+++ b/app/views/organizations/teachers.html.erb
@@ -0,0 +1,39 @@
+<div class="homepageRightBanner">
+  <div class="f16 fontGrey3">
+    <% if @type == "famous" %>
+      名师列表
+    <% else %>
+      <%= @field.name %>
+    <% end %>
+  </div>
+</div>
+<div class="resources mt10">
+  <div class="function-row" id="org_teacher_search">
+    <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers', :type => @type),
+                  :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+        <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
+        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
+        <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+    <% end %>
+    <!--<a href="javascript:" class="f_l" onclick="$('#search_student').submit();">搜索</a>-->
+    <!--<input type="text" placeholder="搜索" class="teacher-list-search fl" />-->
+    <!--<a href="javascript:void(0);" class="teacher-search-icon fl"></a>-->
+    <!--<select id="teacher_type_select" class="teacher-search-type fr" onclick="chooseTeacherType('<%#= @organization.id %>');">-->
+      <!--<option value="1">课程数</option>-->
+      <!--<option value="2">学生数</option>-->
+      <!--<option value="3">资源数</option>-->
+    <!--</select>-->
+    <div class="sn-font-grey fr">
+      <%= link_to "名师列表", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div id="org_teachers_list">
+    <%=render 'organizations/org_teachers_list', :org_teachers => @org_teachers %>
+  </div>
+  <div>
+    <ul class="wlist" id="pages" style="margin-top: 15px;">
+      <%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :flag => true %>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/teachers.js.erb b/app/views/organizations/teachers.js.erb
new file mode 100644
index 000000000..cd7323a4a
--- /dev/null
+++ b/app/views/organizations/teachers.js.erb
@@ -0,0 +1,3 @@
+$("#org_teachers_list").html('<%= escape_javascript( render :partial => 'organizations/org_teachers_list', :locals => {:org_teachers => @org_teachers})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#org_teacher_search").attr('href','<%= teachers_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index e5f2a6b82..268ce18b1 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -5,7 +5,7 @@
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="1"/>
-        <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入单选题标题"/>
+        <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_new" placeholder="请输入单选题标题"/>
         <input type="checkbox" name="is_necessary" value="true" checked/>
         <label>必答</label>
       </div>
@@ -35,7 +35,7 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question_new">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
@@ -45,4 +45,11 @@
       <div class="cl"></div>
     </div>
     <!--编辑单选 end-->
-<% end%>
\ No newline at end of file
+<% end%>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question_new").one('click', function(){
+            add_poll_question_new($(this));
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index 43b41f95d..0fbb588c5 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -3,7 +3,7 @@
     <div class="ur_editor_title">
       <label>问题：&nbsp;&nbsp;</label>
       <input type="hidden" name="question_type" value="2"/>
-      <input maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题标题"/>
+      <input maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_new" placeholder="请输入多选题标题"/>
       <input type="checkbox" name="is_necessary" value="true" checked/>
       <label>必答</label>
     </div>
@@ -33,7 +33,7 @@
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
+      <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question_new">
         <%= l(:label_button_ok)%>
       </a>
       <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
@@ -42,4 +42,11 @@
     </div>
     <div class="cl"></div>
   </div>
-<% end%><!--编辑多选 end-->
\ No newline at end of file
+<% end%><!--编辑多选 end-->
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question_new").one('click', function(){
+            add_poll_question_new($(this));
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index 8a2205760..d25d34542 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -3,7 +3,7 @@
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="4"/>
-    <input maxlength="250" id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观标题"/>
+    <input maxlength="250" id="poll_questions_title_new" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观标题"/>
     <input type="checkbox" name="is_necessary" value="true" checked/>
     <label>必答</label>
   </div>
@@ -13,7 +13,7 @@
     <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
+    <a class="btn_submit c_white" data-button="ok" id="add_new_question_new">
       <%= l(:label_button_ok)%>
     </a>
     <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
@@ -22,4 +22,11 @@
   </div>
   <div class="cl"></div>
 </div><!--编辑多行文字end-->
-<% end%>
\ No newline at end of file
+<% end%>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question_new").one('click', function(){
+            add_poll_question_new($(this));
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index 7588bf3b4..fe8e7b604 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -3,12 +3,12 @@
       <div class="ur_editor_title">
         <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="3"/>
-        <input maxlength="250" id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观标题"/>
+        <input maxlength="250" id="poll_questions_title_new" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观标题"/>
         <input type="checkbox" name="is_necessary" value="true" checked/>
         <label for="ur_question_require">必答</label>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
+        <a class="btn_submit c_white" data-button="ok" id="add_new_question_new">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
@@ -17,4 +17,11 @@
       </div>
       <div class="cl"></div>
     </div><!--编辑单行文字end-->
-<% end%>
\ No newline at end of file
+<% end%>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question_new").one('click', function(){
+            add_poll_question_new($(this));
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index e08b13033..73c783794 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -51,8 +51,8 @@ function chooseQuestionType(quest_type,quest_id){
 }
 
 function add_MC(){
-      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC') %>");
-      $("#poll_questions_title").focus();
+      $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_MC') %>");
+      $("#poll_questions_title_new").focus();
 }
 
   function insert_MC(quest_type,quest_num,quest_id){
@@ -94,7 +94,7 @@ function add_MC(){
                       '</ul>'+
                       '</div>'+
                       '<div class="ur_editor_footer">'+
-                      '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">'+
+                      '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                       '<%= l(:label_button_ok)%>'+
                       '</a>'+
                       '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -106,11 +106,14 @@ function add_MC(){
                       '<% end%>'
       );
       $("#poll_questions_title").focus();
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this));
+      });
 }
 
 function add_MCQ(){
-      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ') %>");
-      $("#poll_questions_title").focus();
+      $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_MCQ') %>");
+      $("#poll_questions_title_new").focus();
 }
 
 function insert_MCQ(quest_type,quest_num,quest_id){
@@ -152,7 +155,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
         '</ul>'+
         '</div>'+
         '<div class="ur_editor_footer">'+
-                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">'+
+                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                 '<%= l(:label_button_ok)%>'+
                 '</a>'+
         '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -164,11 +167,14 @@ function insert_MCQ(quest_type,quest_num,quest_id){
         '<% end%>'
     );
     $("#poll_questions_title").focus();
+    $("#add_new_question").one('click', function(){
+        add_poll_question($(this));
+    });
   }
 
   function add_single(){
-      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single') %>");
-      $("#poll_questions_title").focus();
+      $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_single') %>");
+      $("#poll_questions_title_new").focus();
   }
 
   function insert_SINGLE(quest_type,quest_num,quest_id){
@@ -185,7 +191,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       '<label for="ur_question_require">必答</label>'+
       '</div>'+
       '<div class="ur_editor_footer">'+
-              '<a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">'+
+              '<a class="btn_submit c_white" data-button="ok" id="add_new_question">'+
               '<%= l(:label_button_ok)%>'+
               '</a>'+
       '<a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -197,10 +203,13 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       '<% end%>'
       );
       $("#poll_questions_title").focus();
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this));
+      });
   }
   function add_mulit(){
-      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_mulit') %>");
-      $("#poll_questions_title").focus();
+      $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_mulit') %>");
+      $("#poll_questions_title_new").focus();
   }
 
   function insert_MULIT(quest_type,quest_num,quest_id){
@@ -219,7 +228,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       '<div class="ur_editor_toolbar">'+
       '</div>'+
       '<div class="ur_editor_footer">'+
-              '<a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">'+
+              '<a class="btn_submit c_white" data-button="ok" id="add_new_question">'+
               '<%= l(:label_button_ok)%>'+
               '</a>'+
       '<a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -231,6 +240,9 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       '<% end%>'
       );
       $("#poll_questions_title").focus();
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this));
+      });
   }
 
   //选择导入调查问卷
@@ -262,8 +274,28 @@ function insert_MCQ(quest_type,quest_num,quest_id){
   function add_poll_question(doc)
   {
       var title = $.trim($("#poll_questions_title").val());
-      if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
+      if(title.length == 0){
+          alert("标题不能为空");
+          doc.one('click', function(){
+              add_poll_question($(this));
+          });
+      }else{
+          doc.parent().parent().parent().submit();
+      }
   }
+
+    function add_poll_question_new(doc)
+    {
+        var title = $.trim($("#poll_questions_title_new").val());
+        if(title.length == 0){
+            alert("标题不能为空");
+            doc.one('click', function(){
+                add_poll_question($(this));
+            });
+        }else{
+            doc.parent().parent().parent().submit();
+        }
+    }
   //修改标题时确定按钮
   function edit_poll_question(doc,id)
   {
@@ -373,7 +405,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
   </div><!--选项 end-->
 
   <!-- 新增问题 -->
-  <div id="new_poll_question">
+  <div id="new_poll_question_new">
   </div>
 
   <div class="ur_buttons">
diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb
index 8a597514e..cbb9da3da 100644
--- a/app/views/poll/create_poll_question.js.erb
+++ b/app/views/poll/create_poll_question.js.erb
@@ -1,7 +1,7 @@
 <% if @is_insert %>
     $("#poll_content").html('<%=  escape_javascript(render :partial => 'poll_content', :locals => {:poll => @poll})%>');
 <% else %>
-$("#new_poll_question").html("");
+$("#new_poll_question_new").html("");
 
 $("#poll_content").append("<div id='poll_questions_<%= @poll_questions.id%>'>" +
         "<div id='show_poll_questions_<%= @poll_questions.id %>'>" +
diff --git a/app/views/projects/_rep_static.html.erb b/app/views/projects/_rep_static.html.erb
index 9ebf68d0c..d687c8f7e 100644
--- a/app/views/projects/_rep_static.html.erb
+++ b/app/views/projects/_rep_static.html.erb
@@ -20,6 +20,11 @@
 //                    text: 'Source: WorldClimate.com'
             },
             xAxis: {
+                title: {
+                    text: '作者',
+                    x: -23, //center设置标题的位置
+                    y: 6
+                },
 //                   categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
                 categories: <%= raw(@a_uname_code) %>
             },
@@ -70,7 +75,7 @@
                     lineWidth: 1.5
                 },
                 {
-                name: '<b style="font-weight:normal ">改动或增加</b>',
+                name: '<b style="font-weight:normal;text-align: center ">改动或增加</b>',
                 color: '#5b6b76',
                 data: <%= @a_commits_add %>,
                 dataLabels: {
@@ -122,6 +127,11 @@
 //                    text: 'Source: WorldClimate.com'
             },
             xAxis: {
+                title: {
+                    text: '作者',
+                    x: -20, //center设置标题的位置
+                    y: 6
+                },
 //                   categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
                 categories: <%= raw(@a_uname) %>
             },
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 60c4aa3bf..4dee108ee 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -43,7 +43,7 @@
           </div>
         </td>
         <td class="tree-age c_grey">
-          <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>">
+          <div class="hidden" title="<%= format_time(latest_changes.time) %>">
             <%# 为了转换UTC时间，时差8小时 %>
             <%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>
             <%#= latest_changes.time if latest_changes && latest_changes.time %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 82e6f871f..276283e97 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,6 +1,8 @@
 <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+  <!--<a href="javascript:void(0);" class="btn_zipdown fr" onclick="">ZIP下载</a>-->
+
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>
diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb
index 9d747790f..e051a4d99 100644
--- a/app/views/student_work/_add_score.html.erb
+++ b/app/views/student_work/_add_score.html.erb
@@ -7,8 +7,9 @@
     <p id="hint_message_<%=work.id %>" style="margin-left: 65px;"></p>
     <li >
       <span class="tit_fb mt2"> 评分：</span>
-      <input type="number" name="score" id="score_<%= work.id%>" value="<%= score.nil? ? 60 : score.score%>" min="0" max="100" size="4" data-units="dollars" />
-      <span class=" ml5">分</span>
+      <input type="number" name="score" id="score_<%= work.id%>" value="<%= (score.nil? || score.score.nil?) ? -1 : score.score%>" min="-1" max="100" size="4" data-units="dollars" />
+      <span class="ml5">分</span>
+      <span id="score_notice_span_<%= work.id%>" class="ml5 c_red" style="display: none;">未评分</span>
       <div class="cl"></div></li>
     <li >
       <% if @is_teacher%> <!-- 老师才可以上传批阅结果 -->
@@ -16,24 +17,54 @@
           <div>
             <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
           </div>
+          <div class="cl"></div>
+          <span class="c_red ml5" style="display: none;" id="none_notice_<%= work.id%>">评语、评分、批阅结果至少有一个不为空。</span>
       <%end%>
       <a href="javascript:void(0);" id="work_submit_<%= work.id %>" class="blue_n_btn fr evaluation_submit" onclick="score_submit('<%=work.id %>');">提交</a>
       <div class="cl"></div>
     </li>
 <% end%>
 <script type="text/javascript">
+  var first_click_score = true;
     function score_submit(id){
         <% if !@is_teacher %>
             if ($.trim($('#score_comment_'+id).val()) == "") {
                 $('#hint_message_'+id).html("为了对其他学生的作品负责，请您务必填写评语");
                 $("#hint_message_"+id).css('color','#ff0000');
                 $("#score_comment_"+id).focus();
-            } else {
+            } else if (parseFloat($("#score_"+id).val()) == -1) {
+                $('#score_notice_span_'+id).html("请先评分");
+                $('#score_notice_span_'+id).show();
+                $("#score_"+id).focus();
+            }
+            else if(first_click_score) {
+                first_click_score = false;
                 $("#work_submit_"+id).parent().parent().submit();
                 $('#about_hwork_'+id).html('');
             }
         <% else %>
-            $("#work_submit_"+id).parent().parent().submit();
+            if($.trim($('#score_comment_'+id).val()) == "" && parseFloat($("#score_"+id).val()) == -1 && $("#attachments_fields"+id).children().length == 0){
+                $("#none_notice_"+id).show();
+            } else if(parseFloat($("#score_"+id).val()) == -1) {
+                $.ajax({
+                    type: "GET",
+                    url: "/student_work/"+id+"/add_comments_to_work",
+                    data: 'text',
+                    success: function (data) {
+                    }
+                });
+            }
+            else if(first_click_score) {
+                first_click_score = false;
+                $("#work_submit_" + id).parent().parent().submit();
+            }
         <% end %>
     }
+    function submit_teacher_score(id){
+        if (first_click_score) {
+            first_click_score = false;
+            $("#work_submit_"+id).parent().parent().submit();
+            hideModal();
+        }
+    }
 </script>
\ No newline at end of file
diff --git a/app/views/student_work/_add_score_reply.html.erb b/app/views/student_work/_add_score_reply.html.erb
index 417d3d2c1..a6f9ba13f 100644
--- a/app/views/student_work/_add_score_reply.html.erb
+++ b/app/views/student_work/_add_score_reply.html.erb
@@ -1,5 +1,14 @@
 <%= form_for('', :remote => true, :method => :post,:url => add_score_reply_student_work_index_path(:score_id => score.id)) do |f|%>
     <%= f.text_area 'message', :class => 'ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
     <input type="hidden" value="<%= is_last%>" name="is_last">
-    <a href="javascript:void(0);" class="fr blue_n_btn" onclick="$('#add_score_reply_<%= score.id%>').find('form').submit();">回复</a>
-<% end%>
\ No newline at end of file
+    <a href="javascript:void(0);" class="fr blue_n_btn" onclick="add_score_Reply_submit('<%=score.id %>');">回复</a>
+    <script type="text/javascript">
+        var first_click = true;
+        function add_score_Reply_submit(id){
+            if(first_click) {
+                first_click = false;
+                $('#add_score_reply_'+id).find('form').submit();
+            }
+        }
+    </script>
+<% end%>
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 2ef5ee9af..257fcb94a 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,13 +1,15 @@
 <ul class="hworkUl">
-  <li class="hworkList340 hworkH30 w455">
-    <span class="HomeworkNameTitle f14 fb fl w235">作品名称</span>
+  <li class="hworkList30 hworkH30 ml5 mr5"><span class="c_dark f14 fb fl">序号</span></li>
+  <li class="hworkList50 hworkH30">&nbsp;</li>
+  <li class="hworkList260 hworkH30">
+    <span class="f14 fb fl">作品名称</span>
+  </li>
     <% if @homework.homework_type != 3 %>
-        <span class="HomeworkStuTitle f14 fb fl">姓名</span>
-        <span class="HomeworkStuTitle f14 fb fl">学号</span>
+    <li class="hworkList80 hworkH30"><span class="HomeworkStuTitle f14 fb fl">姓名</span></li>
+    <li class="hworkList80 hworkH30"><span class="HomeworkStuTitle f14 fb fl">学号</span></li>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
+        <li class="hworkList160 hworkH30"><span class="HomeworkStuTitle f14 fb fl">关联项目</span></li>
     <% end %>
-  </li>
 
   <li class="hworkList130 hworkH30 fb ml10">
     时间
@@ -19,7 +21,7 @@
       </li>
   <% end%>
 
-  <li class="hworkList50 hworkH30 fb mr10 ml10" style="float: right;">
+  <li class="hworkList50 hworkH30 fb mr10 ml10">
     我的评分
   </li>
 </ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index aee833b70..0721c9ff5 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,21 +1,29 @@
 <ul class="hworkUl">
-  <li class="hworkList340 hworkH30 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
-    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr150 ml50'%>">作品名称</span>
+  <li class="hworkList30 hworkH30 ml5 mr5"><span class="c_dark f14 fb fl">序号</span></li>
+  <li class="hworkList50">&nbsp;</li>
+  <li class="<%= @homework.homework_type == 2 ? 'hworkList80 mr10' : 'hworkList130 mr10'%> hworkH30">
+    <span class="c_dark f14 fb fl <%#= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr150 ml50'%>">作品名称</span>
+  </li>
     <% if @homework.homework_type != 3 %>
         <!--<span class="c_dark f14 fb fl mr50">姓名</span>-->
-        <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl" ,:remote => true%>
+    <li class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> hworkH30 mr10">
+        <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%>
         <% if @show_all && @order == "lastname"%>
             <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
         <% end%>
+    </li>
+    <li class="<%=@homework.anonymous_comment == 1 ? 'hworkList90' : 'hworkList80'%> hworkH30 mr10">
         <!--<span class="c_dark f14 fb fl">学号</span>-->
-        <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+        <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%>
         <% if @show_all && @order == "student_id"%>
             <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
         <% end%>
+    </li>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <span class="c_dark f14 fb fl">关联项目</span>
+      <li class="hworkList160 hworkH30">
+      <span class="c_dark f14 fb">关联项目</span>
+      </li>
     <% end %>
-  </li>
 
   <li class="hworkList130 hworkH30">
     <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 8e1c16264..de54585b3 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -1,44 +1,36 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
+<a name="<%= student_work.id%>"></a>
 <ul class="hworkListRow" id="student_work_<%= student_work.id%>">
-  <li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
-    <ul>
-      <li class="hworkPortrait mt15 mr10">
-        <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
-      </li>
-      <div class="student_work_<%= student_work.id%>">
-        <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
-          <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-          <div>
-            <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
-          </div>
+  <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
+  <li class="hworkPortrait mt15 mr10">
+    <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
+  </li>
+  <div class="student_work_<%= student_work.id%>">
+    <li class="hworkName mt12 pr10 <%= @homework.homework_type == 2 ? '' : 'width130'%>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+      <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+      <div>
+        <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+      </div>
+    </li>
+      <% if @homework.homework_type != 3 %>
+        <li class="<%=@homework.anonymous_comment == 1 ? 'hworkStName100' : 'hworkStName'%> pr10" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+          <%= student_work.user.show_name%>
         </li>
-        <li>
-          <% if @homework.homework_type != 3 %>
-              <ul class="mt10 fl" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
-                <li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
-                  <%= student_work.user.show_name%>
-                </li>
-                <li class="hworkStID mt16" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>">
-                  <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-                </li>
-              </ul>
-          <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-              <ul class="mt10 fl">
-                <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
-                    <li  class="hworkPrName mr10 mt12" title="项目名称">
-                      <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
-                    </li>
-                <% else %>
-                    <li class="hworkPrName mr10 mt12" title="该项目是私有的">
-                      <%= student_work.project.name %>
-                    </li>
-                <% end %>
-              </ul>
-          <% end %>
+        <li class="<%=@homework.anonymous_comment == 1 ? 'hworkStID90' : 'hworkStID'%> pr10" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;">
+          <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
         </li>
-      </div>
-    </ul>
-  </li>
+      <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+            <li  class="hworkPrName" title="项目名称">
+              <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+            </li>
+        <% else %>
+            <li class="hworkPrName" title="该项目是私有的">
+              <%= student_work.project.name %>
+            </li>
+        <% end %>
+      <% end %>
+  </div>
   <li class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <% if student_work.created_at && @homework.end_time%>
         <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
@@ -70,11 +62,11 @@
       <% end %>
     <% unless student_work.student_score.nil?%>
         <span class="linkBlue">
-          (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>)
         </span>
         <div class="infoNi none">
           现共有
-          <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>&nbsp;</span>
+          <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>&nbsp;</span>
           名学生进行了匿评，平均分为
           <span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
         </div>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 67338384b..47ce6e0ab 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -6,74 +6,63 @@
       <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
       <% is_my_work = pro && pro.student_work_id == student_work.id%>
   <% end %>
-  <li class="hworkList340 w465">
-    <ul>
-      <% if is_my_work%>
-          <li class="hworkPortrait mt15 mr10">
-            <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
-          </li>
-          <li class="hworkName mt15 mr15 w230 student_work_<%= student_work.id%>">
-            <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-            <div>
-              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
-            </div>
+
+  <% if is_my_work%>
+      <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
+      <li class="hworkPortrait mt15 mr10">
+        <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40", style: "display:block;") %>
+      </li>
+      <li class="hworkName mt12 pr10 w250 student_work_<%= student_work.id%>">
+        <div>
+          <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+          <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+        </div>
+      </li>
+      <div class="student_work_<%= student_work.id%>">
+        <% if @homework.homework_type != 3 %>
+          <li class="hworkStName w80" title="<%= student_work.user.show_name%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            <%= student_work.user.show_name%>
           </li>
-          <li class="student_work_<%= student_work.id%>">
-            <% if @homework.homework_type != 3 %>
-                <ul class="mt10 fl" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-                  <li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
-                    <%= student_work.user.show_name%>
-                  </li>
-                  <li class="hworkStID mt16" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>">
-                    <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-                  </li>
-                </ul>
-            <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-                <ul class="mt10 fl">
-                  <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
-                      <li  class="hworkPrName mr10 mt12" title="项目名称">
-                        <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
-                      </li>
-                  <% else %>
-                      <li class="hworkPrName mr10 mt12" title="该项目是私有的">
-                        <%= student_work.project.name %>
-                      </li>
-                  <% end %>
-                </ul>
-            <% end %>
+          <li class="hworkStID" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
           </li>
-      <% else%>
-          <li class="hworkPortrait mt15 mr10">
-            <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
+        <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+          <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+              <li  class="hworkPrName mr10 mt12" title="项目名称">
+                <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+              </li>
+          <% else %>
+              <li class="hworkPrName mr10 mt12" title="该项目是私有的">
+                <%= student_work.project.name %>
+              </li>
+          <% end %>
+        <% end %>
+      </div>
+  <% else%>
+      <li class="hworkList30 ml5 mr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></li>
+      <li class="hworkPortrait mt15 mr10">
+        <%= image_tag(url_to_avatar(""),width:"40", height: "40", style: "display:block;") %>
+      </li>
+      <li class="hworkName mt12 pr10 w250 student_work_<%= student_work.id%>">
+        <div>
+          <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
+        </div>
+      </li>
+        <% if @homework.homework_type != 3 %>
+          <li class="hworkStName w80" title="姓名" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            匿名
           </li>
-          <li class="hworkName mt15 mr15 w230 student_work_<%= student_work.id%>">
-            <div>
-              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
-            </div>
+          <li class="hworkStID" title="学号">
+            --
           </li>
-          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
-            <% if @homework.homework_type != 3 %>
-                <ul class="mt10 fl">
-                  <li class="hworkStName mr10 mt16" title="姓名">
-                    匿名
-                  </li>
-                  <li class="hworkStID mt16" title="学号">
-                    --
-                  </li>
-                </ul>
-            <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-                <ul class="mt10 fl">
-                  <li class="hworkPrName mr10 mt12" title="项目名称">
-                    匿名
-                  </li>
-                </ul>
-            <% end %>
+        <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+          <li class="hworkPrName mr10" title="项目名称" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+            匿名
           </li>
-      <% end%>
+        <% end %>
+  <% end%>
 
-    </ul>
-  </li>
-  <li class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+  <li class="hworkList130 pl10 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
     <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
         <span class="c_red">[迟交]</span>
@@ -89,7 +78,7 @@
   <% end%>
 
   <% my_score = student_work_score(student_work,User.current) %>
-  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10" style="float:right; ">
+  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </li>
   <li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
diff --git a/app/views/student_work/_no_teacher_score_notice.html.erb b/app/views/student_work/_no_teacher_score_notice.html.erb
new file mode 100644
index 000000000..5a8c768cc
--- /dev/null
+++ b/app/views/student_work/_no_teacher_score_notice.html.erb
@@ -0,0 +1,15 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <p>
+      当前作品未进行评分，是否确定提交？
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="submit_teacher_score(<%=work.id %>);" style="margin-bottom: 20px;" >
+        确&nbsp;&nbsp;定
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index ca76b0f2a..8fc98c6ca 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -37,11 +37,11 @@
 </div>
 <div class="cl"></div>
 
-<% @stundet_works.each do |student_work|%>
+<% @stundet_works.each_with_index do |student_work, i|%>
     <% if @is_evaluation%>
-        <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%>
+        <%= render :partial => "evaluation_work", :locals => {:student_work => student_work, :index => i}%>
     <% else%>
-        <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%>
+        <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work, :index => i}%>
     <% end%>
     <div class="cl"></div>
     <div id="about_hwork_<%= student_work.id%>">
@@ -49,7 +49,6 @@
     <div class="cl"></div>
 <% end%>
 <script type="text/javascript">
-
   $(function(){
       <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) || @message_student_work_id %>
           <% if @message_student_work_id %>
@@ -58,6 +57,7 @@
             <% work= params[:show_work_id].nil? ? @homework.student_works.where("user_id = ?",User.current.id).first : StudentWork.find(params[:show_work_id]) %>
           <% end %>
           <% unless work.nil? %>
+              location.hash = "<%=work.id %>";
               <% if @homework.homework_type == 2 %>
                   $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc"),:is_focus => @is_focus}) %>");
 
diff --git a/app/views/student_work/_student_work_score.html.erb b/app/views/student_work/_student_work_score.html.erb
index c800ae8d0..64e5ffa01 100644
--- a/app/views/student_work/_student_work_score.html.erb
+++ b/app/views/student_work/_student_work_score.html.erb
@@ -6,10 +6,12 @@
     <span class="ml5 fl">
       （<%= student_work_score_role score%>）
     </span>
-    <span class="ml20 fl">评分：</span>
-    <a href="javascript:void(0);" class="c_orange fl" >
-      <%= score.score%>分
-    </a>
+    <% unless score.score.nil? %>
+        <span class="ml20 fl">评分：</span>
+        <a href="javascript:void(0);" class="c_orange fl" >
+          <%= score.score%>分
+        </a>
+    <% end %>
     <a href="javascript:void(0);" class="fr linkBlue mr5" onclick="$('#add_score_reply_<%= score.id%>').slideToggle();">回复</a>
     <span class=" fr c_grey mr20">
       <%=format_time score.updated_at %>
diff --git a/app/views/student_work/add_comments_to_work.js.erb b/app/views/student_work/add_comments_to_work.js.erb
new file mode 100644
index 000000000..c14986c81
--- /dev/null
+++ b/app/views/student_work/add_comments_to_work.js.erb
@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/no_teacher_score_notice', :locals => {:work => @work}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
\ No newline at end of file
diff --git a/app/views/student_work/add_score.js.erb b/app/views/student_work/add_score.js.erb
index 762aa4a8a..dec068b9e 100644
--- a/app/views/student_work/add_score.js.erb
+++ b/app/views/student_work/add_score.js.erb
@@ -1,16 +1,19 @@
-$("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'add_score',:locals => {:work => @work,:score => @score}) %>");
+$("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'add_score',:locals => {:work => @work,:score => @new_score}) %>");
 $('#score_<%= @work.id%>').peSlider({range: 'min'});
 
 <% if @is_new%>
-    $("#score_list_<%= @work.id%>").prepend("<div id='work_score_<%= @score.id%>'><%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => @is_last_a}) %></div>");
+    $("#score_list_<%= @work.id%>").prepend("<div id='work_score_<%= @new_score.id%>'><%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @new_score,:is_last => @is_last_a}) %></div>");
 <% else %>
-    $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => @is_last}) %>");
+    $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @new_score,:is_last => @is_last}) %>");
 <% end%>
 
+var num = $("#work_num_<%= @work.id%>").html();
 $("#score_list_<%= @work.id%>").removeAttr("style");
 
 <% if @is_teacher %>
-    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_work',:locals => {:student_work => @work}) %>");
+    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_work',:locals => {:student_work => @work, :index => 1}) %>");
+    $("#work_num_<%= @work.id%>").html(num);
 <% else %>
-    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work}) %>");
+    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work, :index => 1}) %>");
+    $("#work_num_<%= @work.id%>").html(num);
 <% end%>
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index a7e223ac1..453f717c9 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -5,7 +5,7 @@
 <% end %>
 
 <script type="text/javascript">
-  <%if @homework.homework_detail_manual.comment_status != 1%>
+  <%if @homework.anonymous_comment == 0 && @homework.homework_detail_manual.comment_status != 1%>
     $(function(){
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
         showModal('ajax-modal', '360px');
diff --git a/app/views/sub_document_comments/_attachment.html.erb b/app/views/sub_document_comments/_attachment.html.erb
new file mode 100644
index 000000000..9acdc2dc8
--- /dev/null
+++ b/app/views/sub_document_comments/_attachment.html.erb
@@ -0,0 +1,79 @@
+<style type="text/css">
+    input.is_public,input.is_public_checkbox{height:12px;}
+    input.is_public_checkbox{margin-left:4px;margin-right:4px;}
+</style>
+<div class="fl">
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+    <div class="cl"></div>
+  <% end %>
+      <% container.saved_attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
+      <span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+    <div class="cl"></div>
+  <% end %>
+<% end %>
+</span>
+  <div class="cl"></div>
+  <span class="add_attachment" style="font-weight:normal;">
+    <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+    <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+    <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+    <a href="javascript:void(0);" onclick="_file.click();" class="AnnexBtn fl mr15">上传附件</a>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :style => ie8? ? '' : 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
+    <span id="upload_file_count">
+      <%= l(:label_no_file_uploaded) %>
+    </span>
+    (<%= l(:label_max_size) %>:
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+</span>
+
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
diff --git a/app/views/sub_document_comments/_new.html.erb b/app/views/sub_document_comments/_new.html.erb
new file mode 100644
index 000000000..c6cc13164
--- /dev/null
+++ b/app/views/sub_document_comments/_new.html.erb
@@ -0,0 +1,70 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor"  %>
+<% end %>
+
+<script>
+    $(function(){
+        init_des_data(150);
+    });
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+    function create_org_document()
+    {
+        if(check_org_title() == true)
+        {
+            org_document_description_editor.sync();
+            $('#new_sub_document_form').submit();
+        }
+    }
+    function cancel_create_org_document(){
+        $("#document_title").val("");
+        //org_document_description_editor.html("");
+        //org_document_description_editor.sync();
+        $('#sub_document_editor').hide();
+        $('#doc_title_hint').hide();
+    }
+</script>
+<div class="resources" nhname="new_topic_form">
+  <%= form_tag org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id), :id => 'new_sub_document_form' do |f| %>
+      <div>
+        <input class="postDetailInput fl" maxlength="250" name="sub_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#sub_document_editor').show();" placeholder="请输入文章标题" />
+      </div>
+      <div id="doc_title_hint"></div>
+      <div class="cl"></div>
+      <div id="sub_document_editor" class="mt10" style="display: none">
+        <div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="sub_document_comment[content]"></textarea>
+          <%#= kindeditor_tag 'sub_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+        </div>
+        <div class="cl"></div>
+        <p id="homework_course_id_span" class="c_red mt5"></p>
+        <p id="e_tip" class="c_grey"></p>
+        <p id="e_tips" class="c_grey"></p>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%#= render :partial => 'sub_document_comments/attachment', :locals => {:container => nil} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <a href="javascript:void(0);" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
+          <div class="cl"></div>
+        </div>
+      </div>
+  <% end %>
+</div>
diff --git a/app/views/sub_document_comments/_show_newstyle.html.erb b/app/views/sub_document_comments/_show_newstyle.html.erb
new file mode 100644
index 000000000..8b0f8c533
--- /dev/null
+++ b/app/views/sub_document_comments/_show_newstyle.html.erb
@@ -0,0 +1,111 @@
+<div class="sn-innner-content">
+  <div class="sn-row sn-bg-white">
+    <div class="sn-content-position sn-hidden"> 您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+      <%=link_to  @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %> &gt;
+      <%= link_to @subdomain.name, org_subfield_sub_domain_sub_document_comments_path(:sub_domain_id => @subdomain.id, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %> &gt;
+      <a  class = "sn-link-grey2"><%= @document.title  %></a></div>
+  </div>
+  <div class="sn-inner-newslist">
+    <h2 class="sn-inner-newsh2 sn-hidden"><%= @document.title %></h2>
+    <div class="sn-inner-newscon">
+      <p class=" sn-inner-psmall">来源：<%= @organization.name %> 发布时间：<%= format_date(@document.created_at) %></p>
+      <p class=" sn-inner-pcon"><%= @document.content.html_safe %></p>
+    </div>
+  </div>
+  <!--回复-->
+  <% if User.current.logged? %>
+      <% comments_for_doc = @document.children.reorder("created_at desc") %>
+      <% count = @document.children.count() %>
+      <div class="sn-replybox">
+        <h2 class="sn-reply-h2">留言板<span class="sn-fr sn-f14 sn-font-grey3 sn-mt10"><%= count %>条留言</span></h2>
+        <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc',:controller => 'sub_document_comments', :id => @document.id, :flag => true}, :html => {:multipart => true, :id => 'message_form', :class => "sn-reply-form", } do |f| %>
+            <textarea class="sn-reply-text" name="sub_content" id="text_submain"></textarea>
+            <%#= f.kindeditor :sub_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor', :class => "sn-reply-text" %>
+            <div class="sn-reply-btnbox">
+              <a href="javascript:void(0)" onclick = "org_new_files_upload()" class = "submit-btn">发表</a>
+            </div>
+            <p id="sub_domain_reply" style="display: none;color: #ff0000">内容不能为空</p>
+            <%#= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
+        <% end %>
+
+        <div class="sn-reply-comment">
+          <h2 class="sn-comment-h2">全部评论</h2>
+
+            <div id="newstyle_reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
+              <% comments_for_doc.each_with_index  do |reply,i| %>
+                  <div class="sn-comment-listbox">
+                    <a href="javascript:void(0)"  class="sn-reply-userpic fl"><img  src="images/img-news-con.jpg" width="824" height="522" alt="" /></a>
+                    <%= link_to User.find(reply.creator_id).realname, user_url_in_org(reply.creator_id), :class => "sn-reply-username fl" %><span class="fl"><%= time_from_now(reply.created_at) %></span>
+                    <div class="fl sn-reply-usertxt ">
+                      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => reply.id, :content=> reply.content} %>
+                      <%#= reply.content.html_safe unless reply.content.nil? %>
+                    </div>
+                    <!--<a href="javascript:void(0)" target="_blank" class="sn-reply-zan fl">（100）</a>-->
+                    <div class="cl"></div>
+                  </div>
+              <% end %>
+            </div>
+            <% if count > 3 %>
+                <div class="sn-reply-more">
+                  <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#newstyle_reply_div_<%= document.id %>','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" href="javascript:void(0)" value="show_help">
+                    展开更多
+                  </a>
+                </div>
+            <% end %>
+          </div>
+      </div>
+  <% end %>
+</div>
+
+<script>
+    $(document).ready(function(){
+        var replyCount = $(".sn-comment-listbox").size();
+        if (replyCount >3){
+            for(var i= 3; i < replyCount+1; i++){
+                $(".sn-comment-listbox").eq(i).hide();
+            }
+        }
+    });
+    function expand_reply(container, btnid) {
+        var target = $(container).children();
+        var btn = $(btnid);
+        if (btn.data('init') == '0') {
+            btn.data('init', 1);
+            btn.html('收起回复');
+            target.show();
+        } else {
+            btn.data('init', 0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+
+    //验证搜索时输入字
+    function regexName_submain(content) {
+        var name = $.trim($("#name").val());
+        if (name.length == 0) {
+            $("#project_name_span").text(content);
+            $("#project_name_span").css('color', '#ff0000');
+            $("#project_name_span").focus();
+            return false;
+        }
+        else {
+            $("#project_name_span").text("");
+            return true;
+        }
+    }
+
+    function org_new_files_upload(){
+        var name = $.trim($("#text_submain").val());
+//        content = $("#text_submain").val();
+        if (name.length == 0) {
+            $("#sub_domain_reply").show();
+        }
+        else {
+            $("#message_form").submit();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/sub_document_comments/_show_sub_document.html.erb b/app/views/sub_document_comments/_show_sub_document.html.erb
new file mode 100644
index 000000000..135a48268
--- /dev/null
+++ b/app/views/sub_document_comments/_show_sub_document.html.erb
@@ -0,0 +1,161 @@
+<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 @organization.name, organization_path(@organization), :class => "newsBlue" %>
+        |
+        <span style="color:#269ac9;"><%=link_to @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "newsBlue" %></span>
+        |
+        <span style="color:#269ac9;"><%=link_to @subdomain.name, org_subfield_sub_domain_sub_document_comments_path(:sub_domain_id => @subdomain.id, :org_subfield_id => @org_subfield.id), :class => "newsBlue"  %></span>
+
+        <%# if document.organization.home_id == document.id %>
+            <!--<span class="red_homework_btn_cir ml5">已设为首页</span>-->
+        <%# end %>
+      </div>
+      <div class="homepagePostTitle postGrey"><a><%= link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> @org_subfield.id, :sub_domain_id => document.sub_domain.id) %></a></div>
+      <div class="homepagePostDate fl">
+        发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
+      </div>
+      <div class="homepagePostDate fl ml15" id="sub_document_update_time_<%= document.id %>">
+        更新时间：<%= 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) || 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_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :class => "postOptionLink" %>
+                  </li>
+                  <li>
+                    <%= link_to "删除文章", org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'delete',
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :remote => true, :class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <div class="cl"></div>
+      <% end %>
+      <!--over-->
+
+    </div>
+  </div>
+  <!--回复暂时不提供-->
+  <% comments_for_doc = document.children.reorder("created_at desc") %>
+  <% count = document.children.count() %>
+
+  <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="sub_document_comment_reply_<%= 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_subfield_sub_domain_sub_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="sub_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/sub_document_comments/_show_sub_document_newstyle.html.erb b/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
new file mode 100644
index 000000000..a82e24ad4
--- /dev/null
+++ b/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
@@ -0,0 +1,32 @@
+<div class="sn-inner-body">
+  <div class="sn-innner-content">
+    <div class="sn-row sn-bg-white">
+      <div class="sn-content-position">
+        您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
+        <%=link_to  @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %> &gt;
+        <%= link_to @subdomain.name, org_subfield_sub_domain_sub_document_comments_path(:sub_domain_id => @subdomain.id, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey2" %>
+      </div>
+    </div>
+    <div class="sn-inner-newslist">
+      <h2 class="sn-inner-newsh2"><%= @subdomain.name %></h2>
+      <ul>
+        <% documents.each do |document| %>
+            <li>
+              <div class="sn-circle fl"></div><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %>
+              <span class=" txt-grey fr"><%= format_date(document.created_at) %></span>
+              <span class="sn-newslist-reply fr mr10 txt-grey">回复（<%= document.children.count %>）</span>
+              <!--<a href="javascript:void(0)" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>-->
+              <div class="cl"></div>
+            </li>
+        <% end %>
+      </ul>
+
+      <div>
+        <ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">
+          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>
+          <div class="cl"></div>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/sub_document_comments/add_reply.js.erb b/app/views/sub_document_comments/add_reply.js.erb
new file mode 100644
index 000000000..06919628b
--- /dev/null
+++ b/app/views/sub_document_comments/add_reply.js.erb
@@ -0,0 +1,2 @@
+$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => @document,:flag => params[:flag], :act => @act, :organization => @organization}) %>");
+sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");
diff --git a/app/views/sub_document_comments/destroy.js.erb b/app/views/sub_document_comments/destroy.js.erb
new file mode 100644
index 000000000..4a45e48dd
--- /dev/null
+++ b/app/views/sub_document_comments/destroy.js.erb
@@ -0,0 +1,6 @@
+//location.reload();
+<% if params[:detail_page] %>
+window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)%>';
+<% else %>
+window.location.reload();
+<% end %>
\ No newline at end of file
diff --git a/app/views/sub_document_comments/edit.html.erb b/app/views/sub_document_comments/edit.html.erb
new file mode 100644
index 000000000..7fe93d79b
--- /dev/null
+++ b/app/views/sub_document_comments/edit.html.erb
@@ -0,0 +1,63 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor" %>
+<% end %>
+
+<script>
+    $(function(){
+        init_des_data(150);
+    });
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+</script>
+<div class="homepageRightBanner mb5" style="margin-bottom:5px;">
+  <div class="NewsBannerName">编辑文章</div>
+</div>
+<div class="cl"></div>
+<div>
+  <div class="resources" nhname="new_topic_form">
+    <%= form_tag url_for(:controller => 'sub_document_comments',:action => 'update', :id => @sub_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id], :sub_domain_id => params[:sub_domain_id]), :method => 'put', :id => 'new_org_document_form' do |f| %>
+        <div>
+          <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="sub_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @sub_document.title %>" />
+        </div>
+        <div id="doc_title_hint"></div>
+        <div class="cl"></div>
+        <div>
+          <div class="mt10">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="sub_document_comment[content]"><%=@sub_document.content.html_safe %></textarea>
+            <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+          </div>
+          <div class="cl"></div>
+
+          <p id="homework_course_id_span" class="c_red mt5"></p>
+          <p id="e_tip" class="c_grey"></p>
+          <p id="e_tips" class="c_grey"></p>
+          <div class="cl"></div>
+
+          <!--<div class="mt10">-->
+            <!--<div class="fl" id="topic_attachments">-->
+              <!--<%#= render :partial => 'org_document_comments/attachment', :locals => {:container => @sub_document} %>-->
+            <!--</div>-->
+          <!--</div>-->
+          <div class="cl"></div>
+          <div class="mt5">
+            <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
+            <span class="fr mr10 mt3">或</span>
+            <a href="javascript:void(0);" id="new_topic_cancel_btn" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/sub_document_comments/index.html.erb b/app/views/sub_document_comments/index.html.erb
new file mode 100644
index 000000000..7e56b0242
--- /dev/null
+++ b/app/views/sub_document_comments/index.html.erb
@@ -0,0 +1,20 @@
+<% if @organization.switch_type %>
+    <% unless @documents.nil? %>
+        <%= render :partial => 'sub_document_comments/show_sub_document_newstyle', :locals => {:documents => @documents} %>
+    <% end %>
+<% else %>
+    <%= content_for(:header_tags) do %>
+        <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <% end %>
+    <%= render :partial => 'new' %>
+    <% unless @documents.nil? %>
+        <% @documents.each do |document| %>
+            <script>
+                        $(function() {
+                            sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "OrgActivity");
+                        });
+            </script>
+            <%= render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
+        <% end %>
+    <% end %>
+<% end %>
diff --git a/app/views/sub_document_comments/new.html.erb b/app/views/sub_document_comments/new.html.erb
new file mode 100644
index 000000000..de8436f7c
--- /dev/null
+++ b/app/views/sub_document_comments/new.html.erb
@@ -0,0 +1,71 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor"  %>
+<% end %>
+
+<script>
+    $(function(){
+        init_des_data(150);
+    });
+    function check_org_title()
+    {
+        if($("#document_title").val().trim() == "")
+        {
+            $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
+        }
+        else
+        {
+            $("#doc_title_hint").hide();
+            return true;
+        }
+    }
+    function create_org_document()
+    {
+        if(check_org_title() == true)
+        {
+            org_document_description_editor.sync();
+            $('#new_sub_document_form').submit();
+        }
+    }
+    function cancel_create_org_document(){
+        location.href = document.referrer;
+    }
+</script>
+<div class="homepageRightBanner" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>; margin-bottom:10px;">
+  <div class="NewsBannerName"><%= OrgSubfield.try(:find, params[:field_id]).try(:name) %></div>
+</div>
+<div class="resources" nhname="new_topic_form" >
+  <%= form_tag org_subfield_sub_domain_sub_document_comment_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id), :id => 'new_sub_document_form' do |f| %>
+      <div>
+        <input class="postDetailInput fl mr15"  name="sub_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#sub_document_editor').show();" placeholder="请输入文章标题"></input>
+      </div>
+      <div id="doc_title_hint">
+      </div>
+      <div class="cl"></div>
+      <div class="" >
+        <div class="mt10">
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
+          <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+        </div>
+        <div class="cl"></div>
+        <p id="homework_course_id_span" class="c_red mt5"></p>
+        <p id="e_tip" class="c_grey"></p>
+        <p id="e_tips" class="c_grey"></p>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="topic_attachments">
+            <%#= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <a href="javascript:void(0);" onclick="cancel_create_org_document();" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
+          <div class="cl"></div>
+        </div>
+      </div>
+  <% end %>
+</div>
diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb
new file mode 100644
index 000000000..3155c178b
--- /dev/null
+++ b/app/views/sub_document_comments/show.html.erb
@@ -0,0 +1,191 @@
+<% if @organization.switch_type %>
+    <%= render :partial => 'sub_document_comments/show_newstyle', :locals => {:document => @document} %>
+<% else %>
+    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %>
+    <script>
+        $(function() {
+            sd_create_editor_from_data(<%= @document.id%>,null,"100%", "<%=@document.class.to_s%>");
+            showNormalImage('message_description_<%= @document.id %>');
+        });
+    </script>
+    <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_url_in_org(@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 @organization.name, organization_path(@organization), :class => "newsBlue" %>
+            |
+            <span style="color:#269ac9;"><%=link_to @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "newsBlue" %></span>
+            |
+            <span style="color:#269ac9;"><%=link_to @subdomain.name, org_subfield_sub_domain_sub_document_comments_path(:sub_domain_id => @subdomain.id, :org_subfield_id => @org_subfield.id), :class => "newsBlue"  %></span>
+            <%# if @organization.home_id == @document.id %>
+                <!--<span style="color:#269ac9;">首页</span>-->
+            <%# else %>
+                <!--<span style="color:#269ac9;">组织文章</span>-->
+            <%# end %>
+          </div>
+          <div class="homepagePostTitle postGrey"><%= link_to @document.title %></div>
+          <div class="homepagePostDate">
+            发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
+          <% unless @document.content.blank? %>
+              <div class="homepagePostIntro" style="width:640px;" id="intro_content_<%= @document.id%>">
+                <%= @document.content.html_safe %>
+              </div>
+          <% end %>
+          <div class=" fl">
+            <%#= render :partial=>"attachments/activity_attach", :locals=>{:activity => @document} %>
+            <%#= link_to_attachments_course @document, :author => false %>
+          </div>
+          <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+          <% if User.current.admin? || User.current.admin_of_org?(@organization) || User.current.id == @document.creator_id %>
+              <div class="homepagePostSetting">
+                <ul>
+                  <li class="homepagePostSettingIcon">
+                    <ul class="homepagePostSettiongText">
+                      <!--<li>-->
+                        <!--&lt;!&ndash;<%#= form_for('new_form', :url => {:controller => 'sub_document_comments', :action => 'set_homepage', :id => @organization.id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<%# end %>&ndash;&gt;-->
+                      <!--</li>-->
+                      <li>
+                        <%= link_to "编辑文章", edit_org_subfield_sub_domain_sub_document_comment_path(@document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => @document.sub_domain.id, :flag => 1), :class => "postOptionLink" %>
+                      </li>
+                      <li>
+                        <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @organization.id, :detail_page => 1), :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 %>">
+        <%# if count > 0 %>
+        <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 %>','#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="" id="reply_div_<%=  @document.id %>">
+          <% comments_for_doc.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <% 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_url_in_org(user.id) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <%= 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>
+                  <div style="margin-top: -7px; margin-bottom: 5px">
+                    <%= format_time(reply.created_at) %>
+                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <%#= link_to(
+                                  l(:button_reply),
+                                  {:controller => 'org_document_comments',:action => 'quote',:user_id=>reply.creator_id, :id => reply.id},
+                                  :remote => true,
+                                  :method => 'get',
+                                  :class => 'fr newsBlue mr10',
+                                  :title => l(:button_reply)) if User.current.logged? %>
+                      <%#= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'org_document_comments',:action => 'delete_reply', :id => reply.id},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey mr10',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) if reply.creator_id == User.current.id %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id %>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+        <%# end %>
+        <% if User.current.logged?%>
+            <div class="talkWrapMsg" nhname="about_talk_reply">
+              <em class="talkWrapArrow"></em>
+              <div class="cl"></div>
+              <div class="talkConIpt ml5 mb10" id="reply<%= @document.id %>">
+                <%= form_for :org_comment, :url => {:action => 'add_reply_in_doc', :controller => 'sub_document_comments', :id => @document.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+                    <%= f.kindeditor :sub_content,:width=>'99%',:height => '100px;',:editor_id=>'message_content_editor' %>
+                    <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %>
+                    <%= link_to l(:button_reply), "javascript:void(0)", :onclick => "message_content_editor.sync();$('#message_form').submit();", :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %>
+                <% end %>
+                <div class="cl"></div>
+              </div>
+            </div>
+        <% end %>
+      </div>
+    </div>
+
+    <script type="text/javascript">
+        $(function(){
+            $("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
+                var postContent = $(this).html();
+                postContent = postContent.replace(/&nbsp;/g," ");
+                postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+                postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+                postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                $(this).html(postContent);
+            });
+            var replyCount = $(".homepagePostReplyContainer").size();
+            if (replyCount >3){
+                for(var i= 3; i < replyCount+1; i++){
+                    $(".homepagePostReplyContainer").eq(i).hide();
+                }
+            }
+        });
+        function expand_reply(container, btnid) {
+            var target = $(container).children(".homepagePostReplyContainer");
+            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>
+<% end %>
diff --git a/app/views/sub_document_comments/update.js.erb b/app/views/sub_document_comments/update.js.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/sub_domains/_new.html.erb b/app/views/sub_domains/_new.html.erb
new file mode 100644
index 000000000..25b660750
--- /dev/null
+++ b/app/views/sub_domains/_new.html.erb
@@ -0,0 +1,27 @@
+<div class="org-popup-wrap sn-w300"> <a href="javascript:void(0);" class="org-popup-close"></a>
+  <div class="f16 fb fontBlue mb10">添加二级目录</div>
+  <%= form_tag url_for(:controller => 'sub_domains', :action => 'create', :org_subfield_id => field.id), :id=> 'add_subfield_form_subdomain',:remote => true do %>
+      <span class="fontGrey3 fb mb5 mr10">二级栏目名称</span>
+      <input type="text" id="subfield_name_subdomain" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
+      <ul class="orgAddRole mb10">
+        <li class="fontGrey3 fb ml24 mr10 fl">栏目类型</li>
+        <li class="fl mr15">
+          <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
+          <label for="orgMng">帖子</label>
+        </li>
+        <!--<li class="fl mr15">-->
+          <!--<input type="radio" id="orgMeb" value="Resource" name="field_type" />-->
+          <!--<label for="orgMeb">资源</label>-->
+        <!--</li>-->
+        <li class="cl"></li>
+      </ul>
+      <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="add_org_subfield_subdomain();hideModal()">确定</a></div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
+  <% end %>
+  <div class="cl"></div>
+</div>
+
+
+<script type="javascript">
+
+</script>
\ No newline at end of file
diff --git a/app/views/sub_domains/create.js.erb b/app/views/sub_domains/create.js.erb
new file mode 100644
index 000000000..0990e35de
--- /dev/null
+++ b/app/views/sub_domains/create.js.erb
@@ -0,0 +1,8 @@
+<% if @res %>
+$("#org_subfield_list").html("");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :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}) %>");
+<% end %>
+$("#subfield_name").val("");
+$("#sub_dir").val("");
\ No newline at end of file
diff --git a/app/views/sub_domains/destroy.js.erb b/app/views/sub_domains/destroy.js.erb
new file mode 100644
index 000000000..913c400f7
--- /dev/null
+++ b/app/views/sub_domains/destroy.js.erb
@@ -0,0 +1,4 @@
+$("#org_subfield_list").html("");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', :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/sub_domains/domain_update_priority.js.erb b/app/views/sub_domains/domain_update_priority.js.erb
new file mode 100644
index 000000000..475649aac
--- /dev/null
+++ b/app/views/sub_domains/domain_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/sub_domains/hide_sub_domain.js.erb b/app/views/sub_domains/hide_sub_domain.js.erb
new file mode 100644
index 000000000..eec025b97
--- /dev/null
+++ b/app/views/sub_domains/hide_sub_domain.js.erb
@@ -0,0 +1,3 @@
+$("#hide_<%= @subdomain.id %>").text("可见");
+$("#sub_domain_hide_<%= @subdomain.id %>").css("display", "none");
+$("#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/sub_domains/new.html.erb b/app/views/sub_domains/new.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/sub_domains/new.js.erb b/app/views/sub_domains/new.js.erb
new file mode 100644
index 000000000..3f7f1ad47
--- /dev/null
+++ b/app/views/sub_domains/new.js.erb
@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'sub_domains/new',:locals => {:field => @org_subfield}) %>');
+showModal('ajax-modal', '513px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
diff --git a/app/views/sub_domains/show.html.erb b/app/views/sub_domains/show.html.erb
new file mode 100644
index 000000000..522be5ab8
--- /dev/null
+++ b/app/views/sub_domains/show.html.erb
@@ -0,0 +1,141 @@
+<div class="sn-inner-body">
+  <div class="sn-innner-content">
+    <div class="sn-row sn-bg-white">
+      <div class="sn-content-position sn-hidden">
+        您的位置：<%= link_to "首页", organizations_path(@organization), :class => "sn-link-grey2" %> > 数据资源 > 仿真数据
+      </div>
+    </div>
+    <div class="sn-inner-newslist">
+      <h2 class="sn-inner-newsh2">最新资讯</h2>
+      <ul>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</a>
+          <span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0);" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+          <div class="cl"></div>
+        </li>
+      </ul>
+    </div>
+    <ul class="sn-inner-pages">
+      <li><a href="javascript:void(0);" class="sn-inner-pages-big" >上一页</a></li>
+      <li><a href="javascript:void(0);" class="sn-pages-active " >1</a></li>
+      <li><a href="javascript:void(0);" >2</a></li>
+      <li><a href="javascript:void(0);" >3</a></li>
+      <li><a href="javascript:void(0);" >...</a></li>
+      <li><a href="javascript:void(0);" >31</a></li>
+      <li><a href="javascript:void(0);" class="sn-inner-pages-big" >下一页</a></li>
+      <div class="cl"></div>
+    </ul>
+  </div>
+
+  <footer>
+    <!--footer-->
+    <div class="sn-row sn-bg-grey2">
+      <div class="sn-footer">
+        <ul class="sn-footer-link">
+          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">关于我们</a></li>
+          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">服务协议</a></li>
+          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">帮助中心</a></li>
+          <li><a href="javascript:void(0);" class="sn-link-white sn-f18">在线报名</a></li>
+        </ul>
+        <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+        <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
+          卫星导航仿真与测试开放实验室</div>
+      </div>
+    </div>
+  </footer>
+</div>
\ No newline at end of file
diff --git a/app/views/sub_domains/show_sub_domain.js.erb b/app/views/sub_domains/show_sub_domain.js.erb
new file mode 100644
index 000000000..c74413c6c
--- /dev/null
+++ b/app/views/sub_domains/show_sub_domain.js.erb
@@ -0,0 +1,3 @@
+$("#hide_<%= @subdomain.id %>").text("隐藏");
+$("#sub_domain_hide_<%= @subdomain.id %>").css("display", "block");
+$("#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/sub_domains/update.js.erb b/app/views/sub_domains/update.js.erb
new file mode 100644
index 000000000..02810eee7
--- /dev/null
+++ b/app/views/sub_domains/update.js.erb
@@ -0,0 +1,3 @@
+$("#subsubdomain_show_<%= @subdomain.id %>").html("<%= @subdomain.name %>");
+$("#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/tags/_tag_list.html.erb b/app/views/tags/_tag_list.html.erb
index c8e91c1a2..c0b4176c3 100644
--- a/app/views/tags/_tag_list.html.erb
+++ b/app/views/tags/_tag_list.html.erb
@@ -12,7 +12,7 @@
                                                :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 			<% end %>
           <% when '6' %>
-          <% if obj.author_id == User.current.id || User.current.admin?%>
+          <% if obj.author_id == User.current.id || User.current.admin? || (obj.container_type == 'Course' && User.current.allowed_to?(:as_teacher,obj.course)) %>
               <% select_tag_name ||= ""%>
 		        <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag_new", :remote => true, :tag_name => tag,
                                                :taggable_id => obj.id, :taggable_type => object_flag, :select_tag_name => select_tag_name %> </span>
diff --git a/app/views/users/_apply_for_homework.html.erb b/app/views/users/_apply_for_homework.html.erb
new file mode 100644
index 000000000..250cc5810
--- /dev/null
+++ b/app/views/users/_apply_for_homework.html.erb
@@ -0,0 +1,16 @@
+<div>
+  <div class="ni_con">
+    <p class="mt30">
+      <% if state == 2 %>
+        请求已发送至<%=homework.user.show_name %>老师，希望他同意与你分享：）
+      <% elsif state == 3 %>
+        您已发送过分享请求，请勿重复发送。
+      <% end %>
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="hideModal();" style="margin-bottom: 10px; margin-left: 60px; color: #fff;" >
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_apply_homework.html.erb b/app/views/users/_apply_homework.html.erb
new file mode 100644
index 000000000..ddfac69cc
--- /dev/null
+++ b/app/views/users/_apply_homework.html.erb
@@ -0,0 +1,28 @@
+<div>
+  <div class="ni_con">
+    <%= form_tag(apply_for_homework_user_path(:id=>User.current.id,:homework_id=>homework.id), :multipart => true,:remote => true,:name=>"apply_for_homework_form",:id=>'apply_for_homework_form') do %>
+        <h2>申请分享</h2>
+        <p style="color: #000;">
+          申请说明（必选）：
+          <textarea type="text" name="content" id="apply_content" placeholder="请附言，以增加分享的成功机率。" class="apply_content mt10" style="outline:none;"></textarea>
+        </p>
+        <span class="c_red ml5 f12" style="display: none" id="apply_content_notice">为增加分享的成功机率，请务必填写申请说明。</span>
+        <div class="ni_btn">
+          <a href="javascript:" class="tijiao" onclick="submit_apply_homework();" style="margin-bottom: 20px; margin-left: 60px; color: #fff">
+            确&nbsp;&nbsp;定
+          </a>
+        </div>
+    <% end %>
+  </div>
+</div>
+<script type="application/javascript">
+  var first_click_apply = true;
+  function submit_apply_homework(){
+      if($.trim($("#apply_content").val()) == ""){
+          $("#apply_content_notice").show();
+      } else if(first_click_apply) {
+          first_click_apply = false;
+          $('#apply_for_homework_form').submit();
+      }
+  }
+</script>
\ No newline at end of file
diff --git a/app/views/users/_apply_homework_course_message.html.erb b/app/views/users/_apply_homework_course_message.html.erb
new file mode 100644
index 000000000..cf048bcd6
--- /dev/null
+++ b/app/views/users/_apply_homework_course_message.html.erb
@@ -0,0 +1,27 @@
+<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)) %></div></a></li>
+<li class="homepageNewsPubType fl">
+  <%= link_to User.find(ma.apply_user_id).show_name,
+              user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher" %>
+  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">申请引用作业：</span>
+</li>
+<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
+  <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
+  <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <!--:onmouseover => "message_titile_show($(this),event)",-->
+  <!--:onmouseout => "message_titile_hide($(this))" %>-->
+</li>
+
+<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
+            <span id="deal_info_<%=ma.id%>">
+              <% if ma.apply_result == 0 || ma.apply_result.nil?%>
+                <%= link_to '同意',dealwith_apply_homework_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
+                  |
+                  <%= link_to '拒绝',dealwith_apply_homework_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
+             <% elsif ma.apply_result == 1%> <!-- 同意 -->
+                 您已经同意了该申请
+             <% elsif ma.apply_result == 2%> <!-- 拒绝 -->
+                 您已经拒绝了该申请
+             <%end %>
+             </span>
+</li>
+<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
\ No newline at end of file
diff --git a/app/views/users/_comment_reply.html.erb b/app/views/users/_comment_reply.html.erb
new file mode 100644
index 000000000..ddc654463
--- /dev/null
+++ b/app/views/users/_comment_reply.html.erb
@@ -0,0 +1,27 @@
+<div class="orig_cont clearfix">
+  <% unless comment.parent.nil? %>
+      <div id="comment_reply_<%=comment.id %>">
+        <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+      </div>
+  <% end %>
+  <!--<span id="reply_praise_count_<%#=comment.id %>" class="orig_index">
+      <%# if comment.user == User.current %>
+        <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+      <%# else %>
+        <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+      <%# end %>
+  </span>-->
+  <div class="orig_user fl">
+    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
+  </div>
+  <div class="orig_right fl">
+    <% if comment.try(:user).try(:realname) == ' ' %>
+        <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
+    <% else %>
+        <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
+    <% end %>
+    <span class="orig_area"><%= time_from_now(comment.created_on) %></span>
+    <div class="orig_content "><%= comment.notes.html_safe %></div>
+  </div>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
new file mode 100644
index 000000000..caac3ee62
--- /dev/null
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -0,0 +1,20 @@
+<!--<span id="reply_praise_count_<%#=comment.id %>" class="orig_index">
+  <%# if comment.user == User.current %>
+    <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+  <%# else %>
+    <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+  <%# end %>
+</span>-->
+<div class="orig_user fl">
+<%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
+</div>
+<div class="orig_right fl">
+<% if comment.try(:user).try(:realname) == ' ' %>
+    <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
+<% else %>
+    <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
+<% end %>
+<span class="orig_area"><%= time_from_now(comment.created_on) %></span>
+<div class="orig_content "><%= comment.notes.html_safe %></div>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index d41d630ce..c92d117ee 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -15,54 +15,58 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
-      <% topics.each do |activity| %>
-          <div class="list-file">
-            <div><span class="item_list fl"></span>
-              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                  <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
-              <% else %>
-                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
-              <% end %>
-              <% if activity.sticky == 1 %>
-                  <span class="fl ml10 red-cir-btn">顶</span>
-              <% end%>
-              <% if activity.locked %>
-                  <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
-              <% end %>
-              <% u = User.where("id=?",activity.author_id).first%>
-              <span class="fr grayTxt">
-                  发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-              </span>
-              <div class="cl"></div>
-            </div>
-            <div class="massages-content ml15">
-              <% if activity.parent_id.nil? %>
-                  <% content = activity.content %>
-              <% else %>
-                  <% content = activity.parent.content %>
-              <% end %>
-              <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54} %></p>
-            </div>
-            <div class="ml15 mt10">
-              <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
-              <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
-              <% count=0 %>
-              <% if activity.parent %>
-                  <% count=activity.parent.children.count%>
-              <% else %>
-                  <% count=activity.children.count%>
-              <% end %>
-              <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
-            </div>
+      <% if topics.any? %>
+          <% topics.each do |activity| %>
+              <div class="list-file">
+                <div><span class="item_list fl"></span>
+                  <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                      <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
+                  <% else %>
+                      <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
+                  <% end %>
+                  <% if activity.sticky == 1 %>
+                      <span class="fl ml10 red-cir-btn">顶</span>
+                  <% end%>
+                  <% if activity.locked %>
+                      <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+                  <% end %>
+                  <% u = User.where("id=?",activity.author_id).first%>
+                  <span class="fr grayTxt">
+                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <div class="cl"></div>
+                </div>
+                <div class="massages-content ml15">
+                  <% if activity.parent_id.nil? %>
+                      <% content = activity.content %>
+                  <% else %>
+                      <% content = activity.parent.content %>
+                  <% end %>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
+                </div>
+                <div class="ml15 mt10">
+                  <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <% count=0 %>
+                  <% if activity.parent %>
+                      <% count=activity.parent.children.count%>
+                  <% else %>
+                      <% count=activity.children.count%>
+                  <% end %>
+                  <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+          <div>
+            <ul class="wlist" id="pages" >
+              <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+            </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
       <% end %>
-      <div>
-        <ul class="wlist" id="pages" >
-          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-        </ul>
-        <div class="cl"></div>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 56ceb1ab6..28f0f99db 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -146,7 +146,8 @@
     <div class="cl"></div>
     <% if activity.student_works.count != 0 %>
         <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %>
-        <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
+        <%# student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
+        <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
             <div>
@@ -166,9 +167,9 @@
               <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 => "学生头像" %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id,:show_work_id => sw.id), :alt => "学生头像" %>
                       <p class="w100 hidden">
-                        <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%>
+                        <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id,:show_work_id => sw.id)%>
                       </p>
                   <% else %>
                       <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
@@ -197,7 +198,8 @@
             <% 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"%>更新了项目，最近更新：
+                <% first_pro = project_sort_first(projects).first %>
+                #&nbsp;<%=time_from_now first_pro.updated_at %><%= link_to User.find(first_pro.user_id).show_name, user_activities_path(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
               </div>
             <div class="cl"></div>
             <% sort_projects.each_with_index do |pro, i| %>
@@ -290,7 +292,8 @@
   <% count=activity.journals_for_messages.count %>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
+      <div class="homepagePostReplyBannerCount"><span>回复</span>
+        <span  class="reply_iconup" > ︿</span>
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
           <% if activity.user == User.current %>
@@ -332,24 +335,60 @@
                       <% else %>
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                          <% if comment.user == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                      <%= time_from_now(comment.created_on) %>
+                    </div>
+                    <% unless comment.m_parent_id.nil? %>
+                        <% parents_rely = [] %>
+                        <% parents_rely = get_reply_parents parents_rely, comment %>
+                        <% length = parents_rely.length %>
+                        <div id="comment_reply_<%=comment.id %>">
+                          <% if length <= 3 %>
+                              <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
                           <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
-                      <div id="message_edit_<%=comment.id %>" style="display: none" class="mr10 fr">
-                          <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                              <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity},
-                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
+                              <div class="orig_cont clearfix">
+                                <div class="orig_cont clearfix">
+                                  <div id="comment_reply_<%=parents_rely[length - 1].id %>">
+                                    <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+                                  </div>
+                                  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+                                </div>
+                                <div class="orig_cont_hide clearfix"><span class="orig_icon" >&darr; </span><span class="orig_icon" style="display:none;" > &uarr;</span><%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %></div>
+                                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                              </div>
                           <% end %>
-                      </div>
-
-                    </div>
+                        </div>
+                    <% end %>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
+                    <div class="orig_reply mb10 mt-10">
+                      <div class="reply">
+                                <span class="reply-right">
+                                    <span id="reply_praise_count_<%=comment.id %>">
+                                      <% if comment.user == User.current %>
+                                          <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                                      <% else %>
+                                          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                                      <% end %>
+                                    </span>
+                                    <span style="position: relative" class="fr mr20">
+                                        <%= link_to(
+                                                    l(:button_reply),
+                                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
+                                                    :remote => true,
+                                                    :method => 'get',
+                                                    :title => l(:button_reply)) %>
+                                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                                    </span>
+                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
+                                  <% if User.current.admin? ||is_teacher || comment.user == User.current%>
+                                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
+                                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                                    <% end %>
+                                </span>
+                        <div class="cl"></div>
+                      </div>
+                    </div>
+                    <p id="reply_message_<%= comment.id%>"></p>
                   </div>
                   <div class="cl"></div>
                 </li>
diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb
index 5df06b16f..ff99e116e 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -15,38 +15,42 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
-      <% topics.each do |activity| %>
-          <div class="list-file">
-            <div><span class="item_list fl"></span>
-              <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %>
-              <% if activity.sticky == 1 %>
-                  <span class="fl ml10 red-cir-btn">顶</span>
-              <% end%>
-              <% u = User.where("id=?",activity.author_id).first%>
-              <span class="fr grayTxt">
-                  发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-              </span>
-              <div class="cl"></div>
-            </div>
-            <div class="massages-content ml15">
-              <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54} %></p>
-            </div>
-            <div class="ml15 mt10">
-              <span class="grayTxt">发布时间：<%= format_time(activity.created_on) %></span>
-              <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
-              <% count=0 %>
-              <% count=activity.comments.count %>
-              <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
-            </div>
+      <% if topics.any? %>
+          <% topics.each do |activity| %>
+              <div class="list-file">
+                <div><span class="item_list fl"></span>
+                  <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %>
+                  <% if activity.sticky == 1 %>
+                      <span class="fl ml10 red-cir-btn">顶</span>
+                  <% end%>
+                  <% u = User.where("id=?",activity.author_id).first%>
+                  <span class="fr grayTxt">
+                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <div class="cl"></div>
+                </div>
+                <div class="massages-content ml15">
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100} %></p>
+                </div>
+                <div class="ml15 mt10">
+                  <span class="grayTxt">发布时间：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <% count=0 %>
+                  <% count=activity.comments.count %>
+                  <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+          <div>
+            <ul class="wlist" id="pages" >
+              <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+            </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
       <% end %>
-      <div>
-        <ul class="wlist" id="pages" >
-          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-        </ul>
-        <div class="cl"></div>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/users/_homework_repository.html.erb b/app/views/users/_homework_repository.html.erb
index fce7cd6c7..463d250f5 100644
--- a/app/views/users/_homework_repository.html.erb
+++ b/app/views/users/_homework_repository.html.erb
@@ -8,7 +8,7 @@
                 function (data) {
                 }
         );
-    }
+    };
 </script>
 
 <div class="h450">
@@ -37,13 +37,13 @@
           <li class="subject-list-publisher fl hidden"><%= homework.user.show_name %></li>
           <li class="subject-list-count fl" id="subject_count_homework_<%=homework.id %>"><%= homework.quotes %></li>
           <li class="fl subject-list-date"><%=format_date homework.publish_time %></li>
-          <% if homework.course && homework.course.is_public == 0 && homework.user_id != User.current.id %>
+          <% if homework.user != User.current && (homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course)) %>
             <li class="fl subject-list-option" id="homework_apply_status_<%=homework.id %>">
               <% ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, homework.id).first %>
               <% if ah.nil? %>
-                <%= link_to("提交申请", apply_for_homework_user_path(User.current.id,:homework_id => homework.id), :remote => true) %>
+                <%= link_to("请求分享", apply_homework_user_path(User.current.id,:homework_id => homework.id), :class => 'green_btn_share c_white', :remote => true) %>
               <% elsif ah.status == 1 %>
-                  待审核
+                  等待回复
               <% elsif ah.status == 2 %>
                   可引用
               <% elsif ah.status == 3 %>
diff --git a/app/views/users/_homework_repository_detail.html.erb b/app/views/users/_homework_repository_detail.html.erb
index efbf24955..cf04e16cb 100644
--- a/app/views/users/_homework_repository_detail.html.erb
+++ b/app/views/users/_homework_repository_detail.html.erb
@@ -1,7 +1,7 @@
 <div class="subjectDetail fl mt10">
   <div class="subjectInfo">题目信息</div>
   <div class="subject-content-wrapper">
-    <% if homework.nil? %>
+    <% if homework.nil? && status == 0 %>
         <span id="homework_notice_span"><span class="center db">本题库遵循创作共用许可证</span><br>
 
 教师给学生出题本质上是一种创作行为，题目的作者通常为此付出大量时间和精力。好的题目不仅能加深学生对知识点的理解，还能激发学生兴趣，提升学习效率。为此，本网站的题库许可证基于创作共用许可证（ Creative Commons License ）建立，其核心条款包括：<br/><br/>
@@ -14,6 +14,14 @@
 
 对此许可证的支持或反对，请在网站中留言，我们不断完善，谢谢！
 </span>
+    <% elsif homework.nil? && status == 1 %>
+        <span class="c_red">您选中的作业目前为私有作业，您的分享请求已发送至老师，请耐心等待老师的同意。</span>
+    <% elsif homework.nil? && status == 2 %>
+        <span class="c_red">您选中的作业目前为私有作业，请点击“请求分享”按钮向题目的作者发送分享请求吧！<br/>
+            祝您成功：）
+        </span>
+    <% elsif homework.nil? && status == 3 %>
+        <span class="c_red">您选中的作业目前为私有作业，您的分享请求已被老师拒绝，暂时不可查看作业详情。</span>
     <% else %>
         <div class="subjectIntro mb15">标题：<%=homework.name %><br />
           来源：<%=homework.course.name %><br />
diff --git a/app/views/users/_intro_content_ex.html.erb b/app/views/users/_intro_content_ex.html.erb
index ae88fc6ac..e3baf3fe2 100644
--- a/app/views/users/_intro_content_ex.html.erb
+++ b/app/views/users/_intro_content_ex.html.erb
@@ -12,6 +12,6 @@
             $("#activity_description_<%= user_activity_id%>").css("max-height", heightType + "px");
         }
 
-        description_showwords_ellipsis(<%=user_activity_id %>);
+        description_showwords_ellipsis(<%=user_activity_id %>,<%= maxwordsnum %>);
     });
 </script>
\ No newline at end of file
diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb
new file mode 100644
index 000000000..28675b7eb
--- /dev/null
+++ b/app/views/users/_join_course_course_message.html.erb
@@ -0,0 +1,37 @@
+<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
+<li class="homepageNewsPubType fl">
+  <span class="newsBlue homepageNewsPublisher">系统提示</span>
+  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span>
+</li>
+<li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
+  <a href="javascript:void(0);" class="newsGrey">
+    <%= 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="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContentWarn2' : '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>
\ No newline at end of file
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index a36020e3d..55f576db1 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -15,54 +15,58 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
-      <% topics.each do |activity| %>
-          <div class="list-file">
-            <div><span class="item_list fl"></span>
-              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                  <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
-              <% else %>
-                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
-              <% end %>
-              <% if activity.sticky == 1 %>
-                  <span class="fl ml10 red-cir-btn">顶</span>
-              <% end%>
-              <% if activity.locked %>
-                  <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
-              <% end %>
-              <% u = User.where("id=?",activity.author_id).first%>
-              <span class="fr grayTxt">
-                  发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-              </span>
-              <div class="cl"></div>
-            </div>
-            <div class="massages-content ml15">
-              <% if activity.parent_id.nil? %>
-                  <% content = activity.content %>
-              <% else %>
-                  <% content = activity.parent.content %>
-              <% end %>
-              <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54 } %></p>
-            </div>
-            <div class="ml15 mt10">
-              <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
-              <span class="grayTxt">更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
-              <% count=0 %>
-              <% if activity.parent %>
-                  <% count=activity.parent.children.count%>
-              <% else %>
-                  <% count=activity.children.count%>
-              <% end %>
-              <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
-            </div>
+      <% if topics.any? %>
+          <% topics.each do |activity| %>
+              <div class="list-file">
+                <div><span class="item_list fl"></span>
+                  <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                      <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
+                  <% else %>
+                      <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
+                  <% end %>
+                  <% if activity.sticky == 1 %>
+                      <span class="fl ml10 red-cir-btn">顶</span>
+                  <% end%>
+                  <% if activity.locked %>
+                      <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+                  <% end %>
+                  <% u = User.where("id=?",activity.author_id).first%>
+                  <span class="fr grayTxt">
+                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <div class="cl"></div>
+                </div>
+                <div class="massages-content ml15">
+                  <% if activity.parent_id.nil? %>
+                      <% content = activity.content %>
+                  <% else %>
+                      <% content = activity.parent.content %>
+                  <% end %>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
+                </div>
+                <div class="ml15 mt10 f12">
+                  <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
+                  <% count=0 %>
+                  <% if activity.parent %>
+                      <% count=activity.parent.children.count%>
+                  <% else %>
+                      <% count=activity.children.count%>
+                  <% end %>
+                  <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+          <div>
+            <ul class="wlist" id="pages" >
+              <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+            </ul>
             <div class="cl"></div>
           </div>
+      <% else %>
+          <p class="nodata"><%= l(:label_no_data) %></p>
       <% end %>
-      <div>
-        <ul class="wlist" id="pages" >
-          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-        </ul>
-        <div class="cl"></div>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
new file mode 100644
index 000000000..30f4e3542
--- /dev/null
+++ b/app/views/users/_reply_to.html.erb
@@ -0,0 +1,20 @@
+<div class="orig_reply_box borderBottomNone" id="reply_to_message_<%= reply.id%>">
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+  <div class="orig_textarea mb10 fl">
+    <div nhname='new_message_<%= reply.id%>'>
+      <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
+          <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
+          <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
+          <input type="hidden" name="course_activity" value=<%=@course_activity %>>
+          <input type="hidden" name="reply[subject]" id="reply_subject">
+          <div nhname='toolbar_container_<%= reply.id%>'></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <div class="cl"></div>
+          <p nhname='contentmsg_<%= reply.id%>'></p>
+      <% end%>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_send_notice.html.erb b/app/views/users/_send_notice.html.erb
new file mode 100644
index 000000000..aede2a33b
--- /dev/null
+++ b/app/views/users/_send_notice.html.erb
@@ -0,0 +1,18 @@
+<div>
+  <div class="ni_con">
+    <p class="mt30">
+      <% if status == 1 %>
+          您的分享请求暂未通过审核，暂时不可发送至课程。
+      <% elsif status == 2 %>
+          您选中的作业目前为私有作业，请点击“请求分享”按钮向题目的作者发送分享请求吧！祝您成功：）
+    <% elsif status == 3 %>
+          您的分享请求已被老师拒绝，不可发送至课程。
+      <% end %>
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="hideModal();" style="margin-bottom: 10px; margin-left: 60px; color: #fff;" >
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index ca9420f7d..8ef0faa9e 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -14,41 +14,46 @@
   </div>
 
   <div class="bloglistbox">
-    <% @courses.each do |course|%>
-        <ul class="list-file">
-          <li>
-            <span class="item_list fl"></span>
-            <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                        :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
-            <% teacher = User.where("id=?",course.tea_id).first%>
-            <span class="fr grayTxt">
-                <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
-            </span>
-          </li>
+    <% if @courses.any? %>
+        <% @courses.each do |course|%>
+            <ul class="list-file">
+              <li>
+                <span class="item_list fl"></span>
+                <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
+                            :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                <% teacher = User.where("id=?",course.tea_id).first%>
+                <span class="fr grayTxt">
+                    <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
+                </span>
+              </li>
+              <div class="cl"></div>
+                <li class="ml15">
+                  <span class="grayTxt">
+                      创建时间：<%= format_time(course.created_at) %>
+                  </span>
+                  <span class="grayTxt">更新时间：<%= format_time(course.updated_on) %></span>
+                  <span class="grayTxt">
+                      开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
+                  </span>
+                  <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
+                      <% homework_num = course.homework_commons.count %>
+                  <% else %>
+                      <% homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
+                  <% end %>
+                  <p class="list-info fr grayTxt"><span><%= homework_num %></span><span>作业</span><span>|</span><span> <%= visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
+                </li>
+              <div class="cl"></div>
+            </ul>
+        <% end %>
+        <div>
+          <ul class="wlist" id="pages" >
+            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+          </ul>
           <div class="cl"></div>
-            <li class="ml15">
-              <span class="grayTxt">
-                  创建时间：<%= format_time(course.created_at) %>
-              </span>
-              <span class="grayTxt">
-                  开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
-              </span>
-              <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
-                  <% homework_num = course.homework_commons.count %>
-              <% else %>
-                  <% homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
-              <% end %>
-              <p class="list-info fr grayTxt"><span><%= homework_num %></span><span>作业</span><span>|</span><span> <%= visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
-            </li>
-          <div class="cl"></div>
-        </ul>
+        </div>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
     <% end %>
-    <div>
-      <ul class="wlist" id="pages" >
-        <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-      </ul>
-      <div class="cl"></div>
-    </div>
   </div>
 </div>
 
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 861a35ed9..b8c5c2017 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -149,8 +149,8 @@
       <div class="cl"></div>
       <% if homework_common.student_works.count != 0 %>
         <% sw_id = "("+homework_common.student_works.map{|sw| sw.id}.join(",")+")" %>
-        <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
-        <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %>
+        <%# student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
+        <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
             <div>
@@ -170,9 +170,9 @@
               <div class="fl mr10 w100" style="text-align:center;">
                 <a href="javascript:void(0);" class="linkBlue">
                   <% if User.current.member_of_course?(homework_common.course) || User.current.admin? || homework_common.is_open == 1 %>
-                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id, :show_work_id => sw.id), :alt => "学生头像" %>
                       <p class="w100 hidden">
-                        <%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%>
+                        <%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id, :show_work_id => sw.id)%>
                       </p>
                   <% else %>
                       <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
@@ -201,7 +201,8 @@
             <% sort_projects = project_sort_update projects %>
             <div class="mt10 relatePWrap" id="relatePWrap_<%=homework_common.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"%>更新了项目，最近更新：
+                <% first_pro = project_sort_first(projects).first %>
+                #&nbsp;<%=time_from_now first_pro.updated_at %><%= link_to User.find(first_pro.user_id).show_name, user_activities_path(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
               </div>
               <div class="cl"></div>
               <% sort_projects.each_with_index do |pro, i| %>
@@ -296,7 +297,8 @@
   <% count=homework_common.journals_for_messages.count %>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
+      <div class="homepagePostReplyBannerCount"><span>回复</span>
+        <span  class="reply_iconup" > ︿</span>
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=homework_common.id %>">
           <% if homework_common.user == User.current %>
@@ -338,22 +340,60 @@
                       <% else %>
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_time(comment.created_on) %><span id="reply_praise_count_<%=comment.id %>">
-                      <% if comment.user == User.current %>
-                          <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-                      <% else %>
-                          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      <% end %>
-                      </span>
-                      <div id="message_edit_<%=comment.id %>" style="display: none" class="mr10 fr">
-                          <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                              <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course,:course_activity=>-1},
-                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
+                      <%= time_from_now(comment.created_on) %>
+                    </div>
+                    <% unless comment.m_parent_id.nil? %>
+                        <% parents_rely = [] %>
+                        <% parents_rely = get_reply_parents parents_rely, comment %>
+                        <% length = parents_rely.length %>
+                        <div id="comment_reply_<%=comment.id %>">
+                          <% if length <= 3 %>
+                            <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+                          <% else %>
+                            <div class="orig_cont clearfix">
+                              <div class="orig_cont clearfix">
+                                <div id="comment_reply_<%=parents_rely[length - 1].id %>">
+                                  <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+                                </div>
+                                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+                              </div>
+                              <div class="orig_cont_hide clearfix"><span class="orig_icon" >&darr; </span><span class="orig_icon" style="display:none;" > &uarr;</span><%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %></div>
+                              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                            </div>
                           <% end %>
+                        </div>
+                    <% end %>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth t_txt" id="reply_content_<%= comment.id %>">
+                      <%= comment.notes.html_safe %></div>
+                    <div class="orig_reply mb10 mt-10">
+                      <div class="reply">
+                                <span class="reply-right">
+                                    <span id="reply_praise_count_<%=comment.id %>">
+                                      <% if comment.user == User.current %>
+                                          <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                                      <% else %>
+                                          <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                                      <% end %>
+                                    </span>
+                                    <span style="position: relative" class="fr mr20">
+                                        <%= link_to(
+                                                  l(:button_reply),
+                                                  {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course, :course_activity => -1},
+                                                  :remote => true,
+                                                  :method => 'get',
+                                                  :title => l(:button_reply)) %>
+                                        <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                                    </span>
+                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
+                                    <% if User.current.admin? ||is_teacher || comment.user == User.current%>
+                                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :course_activity => -1},
+                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                                    <% end %>
+                                </span>
+                        <div class="cl"></div>
                       </div>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
+                    <p id="reply_message_<%= comment.id%>"></p>
                   </div>
                   <div class="cl"></div>
                 </li>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index a6c7236df..3f6836614 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -3,6 +3,7 @@
 
     <%= javascript_include_tag 'homework','baiduTemplate' %>
     <script type="text/javascript">
+      var first_click = true;
       $(function(){
         if($.trim($("#anonymous_comment").val()) == 1) {
             $("#anonymous_comment").attr('checked',true);
@@ -70,10 +71,12 @@
                   contentmsg:params.contentmsg,
                   textarea:params.textarea
               });*/
-              if(is_checked){
+              if(first_click && is_checked){
                   if(flag){
+                      first_click = false;
                       return true;
                   }else{
+                      first_click = false;
                       $(this)[0].submit();
                       return false;
                   }
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index f48e6c8fb..38770421d 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -1,19 +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 %>
+<%= 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 hidden"><%=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_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index c0d7020b7..d278c7d74 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -230,50 +230,24 @@
         </ul>
     <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 5 %>
-        <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">
-            <span title='<%=User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"" %>' class ='#{ma.viewed==0 ? "newsBlack" : "newsGrey"}'><%=User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"" %></span>
-            <!--:onmouseover => "message_titile_show($(this),event)",-->
-            <!--:onmouseout => "message_titile_hide($(this))" %>-->
-          </a>
-          </li>
-
-          <li class="homepageHomeworkContentWarn fl">
-            <span id="deal_info_<%=ma.id%>">
-              <% if ma.apply_result == 0 || ma.apply_result.nil?%>
-                <%= link_to '同意',dealwith_apply_homework_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
-                  |
-                  <%= link_to '拒绝',dealwith_apply_homework_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
-             <% elsif ma.apply_result == 1%> <!-- 同意 -->
-                 您已经同意了该申请
-             <% elsif ma.apply_result == 2%> <!-- 拒绝 -->
-                 您已经拒绝了该申请
-             <%end %>
-             </span>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        <ul class="homepageNewsList fl" id="course_message_homework_<%=ma.id %>">
+          <%= render :partial => 'apply_homework_course_message', :locals => {:ma => ma} %>
         </ul>
     <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %>
         <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="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag(url_to_avatar(User.find(ma.apply_user_id)), 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>
+            <%= link_to ma.course_message.user.show_name,
+                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <span class='#{ma.viewed==0 ? "newsBlack" : "newsGrey"}' title="<%= ma.apply_result == 1 ? '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过' : '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>">
-              <%= ma.apply_result == 1 ?
-                         '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
-                 :
-                         '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
-            </span>
+            <% link_str = ma.apply_result == 1 ?
+                    '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
+            :
+                    '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
+            <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a>
@@ -409,6 +383,26 @@
                   <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                 </ul>
             <% end %>
+            <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
+                <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, homework_common_index_url_in_org( 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>
         <% else %>
             <ul class="homepageNewsList fl">
               <li class="homepageNewsPortrait fl">
@@ -497,6 +491,26 @@
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
+    <!-- 学生追加作品附件 -->
+    <% if ma.course_message_type == "StudentWork" && 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.show_name+ "同学",
+                        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.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id),
+                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+            <!--:onmouseover => "message_titile_show($(this),event)",-->
+            <!--:onmouseout => "message_titile_hide($(this))" %>-->
+          </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">
@@ -534,43 +548,8 @@
         </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 class="homepageNewsList fl" id="course_message_join_<%=ma.id %>">
+          <%= render :partial => 'join_course_course_message', :locals => {:ma => ma} %>
         </ul>
     <% end %>
     <% if ma.course_message_type == "CourseRequestDealResult" %>
diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb
index 11f2981b0..1526da58f 100644
--- a/app/views/users/_user_project_list.html.erb
+++ b/app/views/users/_user_project_list.html.erb
@@ -14,30 +14,35 @@
   </div>
 
   <div class="bloglistbox">
-    <% @projects.each do |project|%>
-        <ul class="list-file">
-          <li>
-            <span class="item_list fl"></span>
-            <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "list-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
-            <% projectUser = User.where("id=?",project.user_id).first%>
-            <span class="fr grayTxt">
-                <%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %>
-            </span>
-          </li>
+    <% if @projects.any? %>
+        <% @projects.each do |project|%>
+            <ul class="list-file">
+              <li>
+                <span class="item_list fl"></span>
+                <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "list-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
+                <% projectUser = User.where("id=?",project.user_id).first%>
+                <span class="fr grayTxt">
+                    <%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %>
+                </span>
+              </li>
+              <div class="cl"></div>
+              <li class="ml15">
+                <span class="grayTxt">创建时间：<%= format_time(project.created_on) %></span>
+                <span class="grayTxt">更新时间：<%= format_time(project.updated_at) %></span>
+                <p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p>
+              </li>
+              <div class="cl"></div>
+            </ul>
+        <% end %>
+        <div>
+          <ul class="wlist" id="pages" >
+            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+          </ul>
           <div class="cl"></div>
-          <li class="ml15">
-            <span class="grayTxt">创建时间：<%= format_time(project.created_on) %></span>
-            <p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p>
-          </li>
-          <div class="cl"></div>
-        </ul>
+        </div>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
     <% end %>
-    <div>
-      <ul class="wlist" id="pages" >
-        <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-      </ul>
-      <div class="cl"></div>
-    </div>
   </div>
 </div>
 
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index a3bc45481..58829386c 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -28,7 +28,7 @@
 
 </form>
 <div>
-  <ul class="wlist" id="pages" style="margin-top: 5px;">
+  <ul class="wlist" id="pages" style="margin-top: 15px;">
     <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
   </ul>
 </div>
@@ -37,7 +37,7 @@
 <!--<div id="upload_box" style="display: none">-->
 <!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
 <!--</div>-->
-<ul class="resource-list">
+<ul>
   <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
     <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
     <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
@@ -228,4 +228,22 @@
             alert('您无法修改此资源！')
         }
     }
+
+        //发送至按钮控制
+    $("input[name='checkbox1[]']").click(function(){
+        if($("input[name='checkbox1[]']:checked").length >= 1){
+            $(".resourcesSelectSendButton").removeClass("inactive-border");
+            $(".resourcesSelectSendButton").mouseover(function(){
+                $(this).css("backgroundColor","#297fb8");
+            });
+            $(".resourcesSelectSendButton").mouseout(function(){
+                $(this).css("backgroundColor","#fff");
+            });
+            $(".sendButtonBlue").removeClass("inactive-text");
+        }else{
+            $(".resourcesSelectSendButton").addClass("inactive-border");
+            $(".sendButtonBlue").addClass("inactive-text");
+            $(".resourcesSelectSendButton").unbind("mouseover").unbind("mouseout");
+        }
+    });
 </script>
\ No newline at end of file
diff --git a/app/views/users/_watch_btn_for_picture.html.erb b/app/views/users/_watch_btn_for_picture.html.erb
index be8673468..50f9b6240 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 "取消关注",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 => "取消关注"%>
+        <%= link_to "取消关注",watch_path(:host=> Setting.host_name,: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 "添加关注",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 => "添加关注"%>
+        <%= link_to "添加关注",watch_path(:host=> Setting.host_name,: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/apply_for_homework.js.erb b/app/views/users/apply_for_homework.js.erb
index 69ad56cf3..7eac2fb5f 100644
--- a/app/views/users/apply_for_homework.js.erb
+++ b/app/views/users/apply_for_homework.js.erb
@@ -1,8 +1,12 @@
 <% if @state == 1 %>
-alert("您还未登录");
-<% elsif @state == 2 %>
-alert("申请成功，请等待审核");
-$("#homework_apply_status_<%=@homework.id %>").html("待审核");
-<% elsif @state == 3 %>
-alert("您已经发送过申请了，请耐心等待");
+    hideModal();
+    alert("您还未登录");
+<% elsif @state == 2 || @state == 3 %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_for_homework', :locals => {:homework => @homework, :state => @state}) %>');
+    showModal('ajax-modal', '500px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+            "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    $('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
+    $("#homework_apply_status_<%=@homework.id %>").html("等待回复");
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/apply_homework.js.erb b/app/views/users/apply_homework.js.erb
new file mode 100644
index 000000000..9e9da1c7e
--- /dev/null
+++ b/app/views/users/apply_homework.js.erb
@@ -0,0 +1,10 @@
+<% if @state == 1 %>
+    alert("您还未登录");
+<% elsif @state == 2 %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_homework', :locals => {:homework => @homework}) %>');
+    showModal('ajax-modal', '500px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+            "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    $('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/choose_user_course.js.erb b/app/views/users/choose_user_course.js.erb
index 51af05782..15926af5c 100644
--- a/app/views/users/choose_user_course.js.erb
+++ b/app/views/users/choose_user_course.js.erb
@@ -1,9 +1,10 @@
-<% if @status == 1 %>
-    alert("您的申请尚未通过审核，暂时不可发送至课程");
-<% elsif @status == 2 %>
-    alert("该作业是私有的，请先提交申请并通过审核后再发送");
-<% elsif @status == 3 %>
-    alert("您的申请已被拒绝，不可发送至课程");
+<% if @status == 1 || @status == 2 || @status == 3 %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/send_notice', :locals => {:status => @status}) %>');
+    showModal('ajax-modal', '500px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+            "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    $('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
 <% else %>
     <% if params[:is_observe].nil? %>
     $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>');
diff --git a/app/views/users/dealwith_apply_homework.js.erb b/app/views/users/dealwith_apply_homework.js.erb
index 0f6f1af61..5cfe83d58 100644
--- a/app/views/users/dealwith_apply_homework.js.erb
+++ b/app/views/users/dealwith_apply_homework.js.erb
@@ -1,11 +1 @@
-$("#deal_info_<%=@msg.id%>").html(
-        <% if @msg.apply_result == 0 || @msg.apply_result.nil?%>
-        <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>@msg.id),:remote=>'true'%>
-        '|'
-<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>@msg.id),:remote=>'true'%>
-<% elsif @msg.apply_result == 1%>
-'您已经同意了该申请'
-<% elsif @msg.apply_result == 2%>
-'您已经拒绝了该申请'
-<%end %>
-);
\ No newline at end of file
+$("#course_message_homework_<%=@msg.id %>").html('<%= escape_javascript(render :partial => 'users/apply_homework_course_message', :locals => {:ma => @msg}) %>');
\ No newline at end of file
diff --git a/app/views/users/dealwith_apply_request.js.erb b/app/views/users/dealwith_apply_request.js.erb
index e31c0be85..c71fd25cb 100644
--- a/app/views/users/dealwith_apply_request.js.erb
+++ b/app/views/users/dealwith_apply_request.js.erb
@@ -1,11 +1 @@
-$("#deal_info_<%=@msg.id%>").html(
-<% if @msg.status == 0 || @msg.status.nil?%>
-<%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>@msg.id),:remote=>'true'%>
-'|'
-<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>@msg.id),:remote=>'true'%>
-<% elsif @msg.status == 1%>
-        '您已经同意了该申请'
-<% elsif @msg.status == 2%>
-        '您已经拒绝了该申请'
-<%end %>
-);
\ No newline at end of file
+$("#course_message_join_<%=@msg.id %>").html('<%= escape_javascript(render :partial => 'users/join_course_course_message', :locals => {:ma => @msg}) %>');
\ No newline at end of file
diff --git a/app/views/users/reply_to.js.erb b/app/views/users/reply_to.js.erb
new file mode 100644
index 000000000..f3408abad
--- /dev/null
+++ b/app/views/users/reply_to.js.erb
@@ -0,0 +1,10 @@
+if($("#reply_message_<%= @reply.id%>").length > 0) {
+    $("#reply_message_<%= @reply.id%>").replaceWith("<%= escape_javascript(render :partial => 'users/reply_to', :locals => {:reply => @reply}) %>");
+    $("#reply_iconup_<%=@reply.id %>").show();
+    $(function(){
+        sd_create_editor_from_data(<%= @reply.id%>,null,"100%", "<%=@reply.class.to_s%>");
+    });
+}else if($("#reply_to_message_<%= @reply.id%>").length >0) {
+    $("#reply_to_message_<%= @reply.id%>").replaceWith("<p id='reply_message_<%= @reply.id%>'></p>");
+    $("#reply_iconup_<%=@reply.id %>").hide();
+}
\ No newline at end of file
diff --git a/app/views/users/show_all_replies.js.erb b/app/views/users/show_all_replies.js.erb
new file mode 100644
index 000000000..99ab73b46
--- /dev/null
+++ b/app/views/users/show_all_replies.js.erb
@@ -0,0 +1,3 @@
+<% unless @comment.parent.nil? %>
+$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/show_homework_detail.js.erb b/app/views/users/show_homework_detail.js.erb
index a5dd82453..c005eabad 100644
--- a/app/views/users/show_homework_detail.js.erb
+++ b/app/views/users/show_homework_detail.js.erb
@@ -1,5 +1,5 @@
 <% if @is_import.to_i == 1 %>
     $("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>@homework}) %>");
 <% else %>
-    $("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>@homework}) %>");
+    $("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>@homework,:status=>@status}) %>");
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/user_homework_type.js.erb b/app/views/users/user_homework_type.js.erb
index 8cfb4dc04..83c1761e3 100644
--- a/app/views/users/user_homework_type.js.erb
+++ b/app/views/users/user_homework_type.js.erb
@@ -6,7 +6,7 @@ $("#homework_search_input").html("<%=escape_javascript(render :partial=>'homewor
 <% else %>
 $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>''})%>');
 $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>");
 $("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_repository_search', :locals=>{:type=>@type,:is_import=>@is_import,:property=>@property}) %>");
 $("#homework_type_all").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 0) %>');
 $("#homework_type_nor").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>');
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 93e385070..86939b510 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -5,13 +5,16 @@
             $(".resource-switch").children().removeClass("resource-tab-active");
             $(this).children().addClass("resource-tab-active");
         });
-        $("input[name='subject-list-name']").click(function(){
-            if($("input[name='subject-list-name']:checked").length >= 1){
+        $("input[name='checkMenu']").click(function(){
+            if($("input[name='checkMenu']:checked").length >= 1){
                 $(".resourcesSelectSendButton").removeClass("inactive-border");
+                $(".resourcesSelectSendButton").mouseover(function(){
+                    $(this).css("backgroundColor","#297fb8");
+                });
+                $(".resourcesSelectSendButton").mouseout(function(){
+                    $(this).css("backgroundColor","#fff");
+                });
                 $(".sendButtonBlue").removeClass("inactive-text");
-            }else {
-                $(".resourcesSelectSendButton").addClass("inactive-border");
-                $(".sendButtonBlue").addClass("inactive-text");
             }
         });
     });
@@ -33,7 +36,7 @@
 
 <div class="homepageContentContainer">
   <div class="homepageContent">
-    <div class="resource-wrapper">
+    <div class="resource-wrapper mb10">
         <ul class="resource-banner">
           <li class="fl resource-switch">
             <a href="<%= user_homework_type_user_path(@user,:is_import => 0) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">题库</a>
@@ -68,7 +71,7 @@
           <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>@type,:is_import => 0,:property => @property,:search=>''} %>
         </div>
         <div id="homework_repository_detail">
-          <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil} %>
+          <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil, :status => 0} %>
         </div>
         <div class="cl"></div>
         <div>
diff --git a/app/views/users/user_homeworks.js.erb b/app/views/users/user_homeworks.js.erb
index ce1bb65e2..5579d8a92 100644
--- a/app/views/users/user_homeworks.js.erb
+++ b/app/views/users/user_homeworks.js.erb
@@ -1,4 +1,4 @@
 /*$("#homework_repository").html('<%#= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');*/
 $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => 0,:property => @property,:search=>''})%>');
 $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>");
diff --git a/app/views/users/user_search_homeworks.js.erb b/app/views/users/user_search_homeworks.js.erb
index 29d490960..807dcc7d0 100644
--- a/app/views/users/user_search_homeworks.js.erb
+++ b/app/views/users/user_search_homeworks.js.erb
@@ -5,5 +5,5 @@ $("#homework_detail_information").html("<%=escape_javascript(render :partial =>
 <% else %>
 $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>@search})%>');
 $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>");
 <% end %>
\ No newline at end of file
diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb
index 99c119a0c..3be435b15 100644
--- a/app/views/words/_new_respond_course.html.erb
+++ b/app/views/words/_new_respond_course.html.erb
@@ -12,6 +12,7 @@
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
 
     <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
+    <!--<input nhname="submit_btn" type="button" class="reply_btn" value="<%#=l(:button_feedback_respond) %>"/>-->
     <%= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "reply_btn"%>
     <input nhname="cancel_btn" type="button" style="display:none;"/>
diff --git a/app/views/words/reply_to_homework.js.erb b/app/views/words/reply_to_homework.js.erb
new file mode 100644
index 000000000..7da72fa54
--- /dev/null
+++ b/app/views/words/reply_to_homework.js.erb
@@ -0,0 +1,7 @@
+<% if @user_activity_id != -1 %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
+<% else %>
+$("#homework_common_<%= @homework_common.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
+sd_create_editor_from_data(<%= @homework_common.id%>,"","100%", "HomeworkCommon");
+<% end %>
\ No newline at end of file
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 63931fa33..b3c783be8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -17,7 +17,7 @@ RedmineApp::Application.configure do
   # config.logger.level = Logger::INFO
 
   # Full error reports are disabled and caching is turned on
-  config.logger = Logger.new('log/production.log', 'daily',1048576) # daily, weekly or monthly
+  # config.logger = Logger.new('log/production.log', 'daily',1048576) # daily, weekly or monthly
   config.action_controller.perform_caching = true
 
   # to additional_environment.rb
diff --git a/config/initializers/logger.rb b/config/initializers/logger.rb
index e9b61ce06..2f707182a 100644
--- a/config/initializers/logger.rb
+++ b/config/initializers/logger.rb
@@ -194,36 +194,36 @@ require 'fileutils'
 #   end
 #   # e.g. "Thu Sep 22 08:51:08 GMT+9:00 2005: hello world"
 #
-class Logger
-  #具体内容请看https://bugs.ruby-lang.org/issues/7303
-  # Device used for logging messages.
-  class LogDevice
-    def shift_log_period(period_end)
-      postfix = period_end.strftime("%Y%m%d") # YYYYMMDD
-      age_file = "#{@filename}.#{postfix}"
-      if FileTest.exist?(age_file)
-        # try to avoid filename crash caused by Timestamp change.
-        idx = 0
-        # .99 can be overridden; avoid too much file search with 'loop do'
-        while idx < 100
-          idx += 1
-          age_file = "#{@filename}.#{postfix}.#{idx}"
-          break unless FileTest.exist?(age_file)
-        end
-      end
-      # @dev.close rescue nil
-      # File.rename("#{@filename}", age_file)
-      # @dev = create_logfile(@filename)
-      #覆盖原来lib库的方法，将上边三行删除，增加下边两行
-      FileUtils.cp(@filename, age_file)
-      reset_logfile(@dev) # see below for this new method return true
-      return true
-    end
-    #打开原来lib库，新增一个方法
-    def reset_logfile(logdev)
-      logdev.truncate( 0 )
-      logdev.sync = true
-      add_log_header(logdev)
-    end
-  end
-end
+# class Logger
+#   #具体内容请看https://bugs.ruby-lang.org/issues/7303
+#   # Device used for logging messages.
+#   class LogDevice
+#     def shift_log_period(period_end)
+#       postfix = period_end.strftime("%Y%m%d") # YYYYMMDD
+#       age_file = "#{@filename}.#{postfix}"
+#       if FileTest.exist?(age_file)
+#         # try to avoid filename crash caused by Timestamp change.
+#         idx = 0
+#         # .99 can be overridden; avoid too much file search with 'loop do'
+#         while idx < 100
+#           idx += 1
+#           age_file = "#{@filename}.#{postfix}.#{idx}"
+#           break unless FileTest.exist?(age_file)
+#         end
+#       end
+#       # @dev.close rescue nil
+#       # File.rename("#{@filename}", age_file)
+#       # @dev = create_logfile(@filename)
+#       #覆盖原来lib库的方法，将上边三行删除，增加下边两行
+#       FileUtils.cp(@filename, age_file)
+#       reset_logfile(@dev) # see below for this new method return true
+#       return true
+#     end
+#     #打开原来lib库，新增一个方法
+#     def reset_logfile(logdev)
+#       logdev.truncate( 0 )
+#       logdev.sync = true
+#       add_log_header(logdev)
+#     end
+#   end
+# end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 10d0af25b..18f027dce 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -419,6 +419,7 @@ zh:
   label_project_all: 所有的项目
   label_project_latest: 最近的项目
   label_issue: 问题
+  label_apply_homework: 分享作业申请
 
   label_issue_view_all: 查看所有问题
   label_issues_by: "按 %{value} 分组显示问题"
@@ -1864,6 +1865,7 @@ zh:
   excel_student_id: 学号
   excel_mail: 电子邮箱
   excel_homework_name: 作品名
+  excel_homework_des: 作品描述
   excel_t_score: 教师评分
   excel_ta_score: 教辅评分
   excel_n_score: 匿名评分
@@ -2139,7 +2141,7 @@ zh:
   label_journals_comment_template: 您的留言有新回复了
   label_blog_comment_template: 您的博客有新回复了
   label_new_blog_template: 有新博客了
-  label_new_issue_template: 有新缺陷了
+  label_new_issue_template: 有新的问题动态了
   label_new_notice_template: 您的课程有新通知了
 #edit yk
   label_code_work_tests: 代码测试列表
diff --git a/config/routes.rb b/config/routes.rb
index e1c969b0f..6554d1779 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -76,6 +76,7 @@ RedmineApp::Application.routes.draw do
       get 'more_org_projects'
       get 'more_org_courses'
       get 'search_courses'
+      get 'teachers'
       post 'join_course_menu'
       post 'join_courses'
       get 'search_projects'
@@ -92,6 +93,8 @@ RedmineApp::Application.routes.draw do
       get 'autocomplete_search'
       post 'hide_org_subfield'
       post 'show_org_subfield'
+      post 'set_excellent_teacher'
+      post 'reset_excellent_teacher'
       post 'agree_apply_subdomain'
     end
   end
@@ -121,6 +124,32 @@ RedmineApp::Application.routes.draw do
         match "quote_resource_show_org_subfield", :via => [:get]
       end
     end
+
+    resources :sub_domains, :only => [:index, :new, :create, :show, :update, :destroy] do
+      resources :sub_document_comments, :only => [:index, :new, :create, :show, :update, :destroy, :edit] do
+        member do
+          post 'add_reply'
+          get 'quote'
+          post 'reply'
+          post 'add_reply_in_doc'
+          delete 'delete_reply'
+          match 'edit'
+        end
+        collection do
+        end
+      end
+
+      collection do
+      end
+      member do
+        match 'domain_update_sub_dir', :via => [:put]
+        match 'domain_update_priority', :via => [:put]
+        match 'domain_update_status', :via => [:post]
+        post 'hide_sub_domain'
+        post 'show_sub_domain'
+      end
+    end
+
     member do
       match 'update_sub_dir', :via => [:put]
       match 'update_priority', :via => [:put]
@@ -270,6 +299,7 @@ RedmineApp::Application.routes.draw do
       post 'add_score'
       post 'revise_attachment'
       get 'retry_work'
+      get 'add_comments_to_work'
       get 'praise_student_work'
       get 'forbidden_anonymous_comment'
     end
@@ -496,12 +526,18 @@ RedmineApp::Application.routes.draw do
   match 'courses/:course_id/news/index', :to => 'news#index', :via => [:get, :post], :as => 'new_course_news'
   match 'courses/:course_id/news/new', :to => 'news#new', :via => [:get, :post]
 
+  scope ":username" do
+    resources :posts
+  end
+
   #added by young
   resources :users do
     collection do
       match "tag_saveEx" , :via =>  [:get, :post]
       post "user_new_homework"
       get  'new_user_commit_homework'
+      get 'reply_to'
+      get 'show_all_replies'
       post "user_commit_homework"
       post 'user_select_homework'
     end
@@ -521,7 +557,8 @@ RedmineApp::Application.routes.draw do
       match 'user_project_activities', :to => 'users#user_project_activities', :via => :get
       match 'user_feedback4show', :to => 'users#user_feedback4show', :via => :get
       match 'user_visitorlist', :to => 'users#user_visitorlist', :via => :get
-      match 'apply_for_homework', :to => 'users#apply_for_homework', :via => :get
+      match 'apply_for_homework', :to => 'users#apply_for_homework', :via => :post
+      match 'apply_homework', :to => 'users#apply_homework', :via => :get
       match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
       match 'student_homeworks', :to => 'users#student_homeworks', :via => :get
       get 'user_import_homeworks'
@@ -592,6 +629,7 @@ RedmineApp::Application.routes.draw do
       get 'user_homework_type'
       get 'user_ref_homework_search'
       get 'show_homework_detail'
+      post 'apply_for_homework'
       # end
     end
     #resources :blogs
@@ -874,6 +912,7 @@ RedmineApp::Application.routes.draw do
   get 'projects/:id/repository/changes(/*path(.:ext))', :to => 'repositories#changes'
 
   get 'projects/:id/repository/forked', :to => 'repositories#forked'
+  get 'projects/:id/repository/project_archive', :to => 'repositories#project_archive', :as => 'project_archive'
   get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
   get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
   get 'projects/:id/repository/revision', :to => 'repositories#revision'
@@ -993,6 +1032,7 @@ RedmineApp::Application.routes.draw do
   match 'admin/latest_login_users', as: :latest_login_users
   match 'admin/latest_login_teachers', as: :latest_login_teachers
   get 'admin/homework'
+  get 'admin/apply_for_homework'
   get 'admin/code_work_tests'
 
   resources :auth_sources do
@@ -1123,6 +1163,7 @@ RedmineApp::Application.routes.draw do
   match 'project/:id/share', :to => 'projects#share', :as => 'share_show' #share
   post 'words/:id/leave_user_message', :to => 'words#leave_user_message', :as => "leave_user_message"
   post 'words/:id/leave_homework_message', :to => 'words#leave_homework_message', :as => "leave_homework_message"
+  post 'words/:id/reply_to_homework', :to => 'words#reply_to_homework', :as => "reply_to_homework"
 
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'
diff --git a/db/migrate/20160427070237_create_sub_domains.rb b/db/migrate/20160427070237_create_sub_domains.rb
new file mode 100644
index 000000000..ec37074cc
--- /dev/null
+++ b/db/migrate/20160427070237_create_sub_domains.rb
@@ -0,0 +1,14 @@
+class CreateSubDomains < ActiveRecord::Migration
+  def change
+    create_table :sub_domains do |t|
+      t.integer :org_subfield_id
+      t.integer :priority, :default => false
+      t.string :name
+      t.string :field_type
+      t.integer :hide, :default => false
+      t.integer :status, :default => false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20160428065243_create_sub_document_comments.rb b/db/migrate/20160428065243_create_sub_document_comments.rb
new file mode 100644
index 000000000..8dcd202f3
--- /dev/null
+++ b/db/migrate/20160428065243_create_sub_document_comments.rb
@@ -0,0 +1,17 @@
+class CreateSubDocumentComments < ActiveRecord::Migration
+  def change
+    create_table :sub_document_comments do |t|
+      t.text :content
+      t.text :title
+      t.integer :sub_domain_id
+      t.integer :creator_id
+      t.integer :parent_id
+      t.integer :reply_id
+      t.integer :locked
+      t.integer :sticky
+      t.integer :org_subfield_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20160506085852_update_org_hide.rb b/db/migrate/20160506085852_update_org_hide.rb
new file mode 100644
index 000000000..31dc22be5
--- /dev/null
+++ b/db/migrate/20160506085852_update_org_hide.rb
@@ -0,0 +1,10 @@
+class UpdateOrgHide < ActiveRecord::Migration
+  def up
+    Organization.all.each do |org|
+      org.update_column(:show_mode, false)
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160506104128_change_course_messages_cloumn.rb b/db/migrate/20160506104128_change_course_messages_cloumn.rb
new file mode 100644
index 000000000..39e882b39
--- /dev/null
+++ b/db/migrate/20160506104128_change_course_messages_cloumn.rb
@@ -0,0 +1,8 @@
+class ChangeCourseMessagesCloumn < ActiveRecord::Migration
+  def up
+    change_column :course_messages, :content, :text
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160509025404_update_activity.rb b/db/migrate/20160509025404_update_activity.rb
new file mode 100644
index 000000000..2a959f5a2
--- /dev/null
+++ b/db/migrate/20160509025404_update_activity.rb
@@ -0,0 +1,24 @@
+class UpdateActivity < ActiveRecord::Migration
+  def up
+    homeworks = HomeworkCommon.where("course_id = 342")
+    unless homeworks.nil?
+      homeworks.each do |h|
+        course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first
+        user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first
+        org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first
+        if course_activity && h.updated_at > course_activity.updated_at
+          course_activity.update_column('updated_at', h.updated_at)
+        end
+        if user_activity && h.updated_at > user_activity.updated_at
+          user_activity.update_column('updated_at', h.updated_at)
+        end
+        if org_activity && h.updated_at > org_activity.updated_at
+          org_activity.update_column('updated_at', h.updated_at)
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160511055221_merge_two_homeworks.rb b/db/migrate/20160511055221_merge_two_homeworks.rb
new file mode 100644
index 000000000..a30bc983b
--- /dev/null
+++ b/db/migrate/20160511055221_merge_two_homeworks.rb
@@ -0,0 +1,20 @@
+class MergeTwoHomeworks < ActiveRecord::Migration
+  def up
+    student_works = StudentWork.where("homework_common_id = 3387 and user_id in (11256, 11259, 11252, 11499)")
+    unless student_works.nil?
+      student_works.each do |work|
+        work.update_column('homework_common_id', 3463)
+      end
+    end
+    homework = HomeworkCommon.find 3387
+    homework.destroy if homework
+    stu_works = StudentWork.where("homework_common_id = 3387")
+    stu_work_ids = stu_works.empty? ? "(-1)" : "(" + stu_works.map{|work| work.id}.join(',') + ")"
+    stu_work_tests = StudentWorkTest.where("student_work_id in #{stu_work_ids}")
+    stu_work_tests.destroy_all if stu_work_tests
+    stu_works.destroy_all if stu_works
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160513012705_add_excellent_teacher_to_user.rb b/db/migrate/20160513012705_add_excellent_teacher_to_user.rb
new file mode 100644
index 000000000..88a79ec26
--- /dev/null
+++ b/db/migrate/20160513012705_add_excellent_teacher_to_user.rb
@@ -0,0 +1,5 @@
+class AddExcellentTeacherToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :excellent_teacher, :integer, :default => false
+  end
+end
diff --git a/db/migrate/20160513021204_add_allow_teacher_to_organization.rb b/db/migrate/20160513021204_add_allow_teacher_to_organization.rb
new file mode 100644
index 000000000..07b39c9a0
--- /dev/null
+++ b/db/migrate/20160513021204_add_allow_teacher_to_organization.rb
@@ -0,0 +1,5 @@
+class AddAllowTeacherToOrganization < ActiveRecord::Migration
+  def change
+    add_column :organizations, :allow_teacher, :integer, :default => false
+  end
+end
diff --git a/db/migrate/20160513120002_delete_empty_apply_homework.rb b/db/migrate/20160513120002_delete_empty_apply_homework.rb
new file mode 100644
index 000000000..f265521b9
--- /dev/null
+++ b/db/migrate/20160513120002_delete_empty_apply_homework.rb
@@ -0,0 +1,18 @@
+class DeleteEmptyApplyHomework < ActiveRecord::Migration
+  def up
+    count = ApplyHomework.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        ApplyHomework.page(i).per(30).each do |ah|
+          homework = HomeworkCommon.where("id = ?",ah.homework_common_id)
+          if homework.empty?
+            ah.destroy
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 677b030df..092252062 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160504060751) do
+ActiveRecord::Schema.define(:version => 20160513120002) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -485,7 +485,7 @@ ActiveRecord::Schema.define(:version => 20160504060751) do
     t.integer  "viewed"
     t.datetime "created_at",          :null => false
     t.datetime "updated_at",          :null => false
-    t.string   "content"
+    t.text     "content"
     t.integer  "status"
     t.integer  "apply_user_id"
     t.integer  "apply_result"
@@ -1107,6 +1107,23 @@ ActiveRecord::Schema.define(:version => 20160504060751) do
     t.integer  "viewed_count",  :default => 0
   end
 
+  create_table "mess", :id => false, :force => true do |t|
+    t.string   "课程名"
+    t.integer  "课程ID",                    :default => 0,  :null => false
+    t.string   "教师姓",                     :default => "", :null => false
+    t.string   "教师名",       :limit => 30, :default => "", :null => false
+    t.string   "主贴名",                     :default => "", :null => false
+    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
+    t.integer  "回帖对应主贴ID"
+    t.integer  "帖子点赞数"
+    t.integer  "主贴回复数",                   :default => 0,  :null => false
+    t.text     "主贴或回帖内容"
+    t.datetime "发帖时间",                                    :null => false
+    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
+    t.string   "发帖或回帖用户姓",                :default => "", :null => false
+    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
+  end
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1328,6 +1345,7 @@ ActiveRecord::Schema.define(:version => 20160504060751) do
     t.boolean  "allow_guest_download", :default => true
     t.integer  "visits",               :default => 0
     t.integer  "show_mode",            :default => 0
+    t.integer  "allow_teacher",        :default => 0
   end
 
   create_table "phone_app_versions", :force => true do |t|
@@ -1779,6 +1797,31 @@ ActiveRecord::Schema.define(:version => 20160504060751) do
   add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
   add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
 
+  create_table "sub_document_comments", :force => true do |t|
+    t.text     "content"
+    t.text     "title"
+    t.integer  "sub_domain_id"
+    t.integer  "creator_id"
+    t.integer  "parent_id"
+    t.integer  "reply_id"
+    t.integer  "locked"
+    t.integer  "sticky"
+    t.integer  "org_subfield_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "sub_domains", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "priority",        :default => 0
+    t.string   "name"
+    t.string   "field_type"
+    t.integer  "hide",            :default => 0
+    t.integer  "status",          :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
   create_table "subfield_subdomain_dirs", :force => true do |t|
     t.integer  "org_subfield_id"
     t.string   "name"
@@ -2018,6 +2061,7 @@ ActiveRecord::Schema.define(:version => 20160504060751) do
     t.string   "salt",              :limit => 64
     t.integer  "gid"
     t.integer  "visits",                          :default => 0
+    t.integer  "excellent_teacher",               :default => 0
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
diff --git a/lib/gitlab-cli/lib/gitlab/client/repositories.rb b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
index 990300b31..34915967c 100644
--- a/lib/gitlab-cli/lib/gitlab/client/repositories.rb
+++ b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
@@ -137,11 +137,20 @@ class Gitlab::Client
     end
     alias_method :repo_commit_diff, :commit_diff
 
-    #Get the commits count of each contributor in a project
-    #@param [Integer] project the ID fo a project.
+    # Get the commits count of each contributor in a project
+    # @param [Integer] project the ID fo a project.
     # @return [Gitlab::ObjectifiedHash]
     def contributors(project)
       get("/projects/#{project}/repository/contributors")
     end
+
+    # Get an archive of the repository
+    # @param [Integer] project the ID fo a project.
+    # sha (optional) - The commit SHA to download defaults to the tip of the default branch
+    # @return [Gitlab::ObjectifiedHash]
+    def project_archive(project, sha)
+      get("/projects/#{project}/repository/archive?sha=#{sha}")
+    end
+    alias_method :repo_project_archive, :project_archive
   end
 end
diff --git a/lib/grack/Gemfile.lock b/lib/grack/Gemfile.lock
index 68fa71a2b..8ae4dcc6c 100644
--- a/lib/grack/Gemfile.lock
+++ b/lib/grack/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       rack (~> 1.5.1)
 
 GEM
-  remote: https://ruby.taobao.org/
+  remote: https://rubygems.org/
   specs:
     byebug (4.0.5)
       columnize (= 0.9.0)
diff --git a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
index 0e1177563..e47bdc048 100644
--- a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
+++ b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
@@ -118,6 +118,59 @@ class Kindeditor::AssetsController < ApplicationController
     @result[:file_list] = @file_list
     render :text => @result.to_json
   end
+
+  #在KE里面复制粘贴的时候 把图片下载到服务器上
+  def uploadpic
+    picStr = params["pic"]
+    picArry = picStr.split("|")
+
+    #图片存放目录
+    dirPath = "public/files/uploads/image/"
+    dirDate = Time.now.strftime('%Y%m')
+
+    unless Dir.exist?("public")
+      Dir.mkdir("public")
+    end
+    unless Dir.exist?("public/files")
+      Dir.mkdir("public/files")
+    end
+    unless Dir.exist?("public/files/uploads")
+      Dir.mkdir("public/files/uploads")
+    end
+    unless Dir.exist?("public/files/uploads/image")
+      Dir.mkdir("public/files/uploads/image")
+    end
+
+    unless Dir.exist?(dirPath+dirDate)
+       Dir.mkdir(dirPath+dirDate)
+    end
+
+    fileStr = ""
+
+    picArry.each_with_index do |picUrl,index|
+      imgBaseName = File.basename(picUrl)
+      tmpImgType = imgBaseName.split(".").last.split("?")[0]
+      # 仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF
+
+      fileType = tmpImgType.match("gif|jpg|jpeg|png|bmp|BMP|JPEG|JPG|PNG|GIF")
+
+      fileName = fileType.nil? ? Time.now.to_i.to_s+index.to_s : Time.now.to_i.to_s+index.to_s+"."+fileType[0]
+
+      # fileType = File.basename(picurl).split(".").last[0..2]
+      # fileName = Time.now.to_i.to_s+index.to_s
+      fileDir = dirPath + dirDate + "/"+fileName
+
+      #重点!!
+      begin
+        File.open(fileDir,'wb'){ |f| f.write(open(picUrl).read) }
+        fileDir = fileDir.split("public")[1]
+      rescue
+        fileDir = picUrl
+      end
+      fileStr = fileStr+fileDir + "|"
+    end
+    render :text =>fileStr
+  end
   
   private
   def show_error(msg)
diff --git a/lib/rails_kindeditor/config/routes.rb b/lib/rails_kindeditor/config/routes.rb
index 7ebb0b748..86b888ad3 100644
--- a/lib/rails_kindeditor/config/routes.rb
+++ b/lib/rails_kindeditor/config/routes.rb
@@ -2,5 +2,6 @@ Rails.application.routes.draw do
   namespace :kindeditor do
     post "/upload" => "assets#create"
     get  "/filemanager" => "assets#list"
+    get  "/uploadpic" => "assets#uploadpic"
   end
 end
\ No newline at end of file
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 7f598a74a..c0aa658ae 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -396,7 +396,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :project_resource_list, {:controller => 'admin', :action => 'project_resource_list'}, :caption => :label_project_resource_list
   menu.push :homework, {:controller => 'admin', :action => 'homework'}, :caption => :label_user_homework
   menu.push :code_work_tests, {:controller => 'admin', :action => 'code_work_tests'}, :caption => :label_code_work_tests
-
+  menu.push :apply_for_homework, {:controller => 'admin', :action => 'apply_for_homework'}, :caption => :label_apply_homework
 end
 #Modified by young
 Redmine::MenuManager.map :project_menu do |menu|
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index f9ce21987..6d1bb2fcb 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -193,6 +193,8 @@ module Redmine
             title = h(caption) + "(#{Course.all.count})"
           when '用户列表'
             title = h(caption) + "(#{User.all.count})"
+          when '分享作业申请'
+            title = h(caption) + "(#{ApplyHomework.where("user_id != 0").count})"
         end
           link_to(title, url, item.html_options(:selected => selected))
 
diff --git a/lib/tasks/update_homework.rake b/lib/tasks/update_homework.rake
new file mode 100644
index 000000000..229337dc5
--- /dev/null
+++ b/lib/tasks/update_homework.rake
@@ -0,0 +1,65 @@
+#coding=utf-8
+
+namespace :update_homework do
+  desc "update homework project time"
+  def update_homework_time homeworks
+    unless homeworks.nil?
+      homeworks.each do |h|
+        if h.homework_type == 3
+          student_works = h.student_work_projects.where("is_leader = 1 && project_id != -1")
+          time = h.updated_at
+          unless student_works.nil?
+            student_works.each do |s|
+              project = Project.find s.project_id
+              unless project.nil? && project.gpid.nil?
+                project_time=project.updated_on
+                project_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last
+                if time.strftime('%Y-%m-%d %H:%M:%S') < project_time.strftime('%Y-%m-%d %H:%M:%S')
+                  time = project_time
+                end
+                begin
+                  # gitlab端获取默认分支
+                  g = Gitlab.client
+                  default_branch = g.project(project.gpid).default_branch
+                  changesets = g.commits(project.gpid, :ref_name => default_branch)
+                  changesets_latest_coimmit = changesets[0]
+                  unless changesets[0].blank?
+                    if time.strftime('%Y-%m-%d %H:%M:%S') <changesets_latest_coimmit.created_at.strftime('%Y-%m-%d %H:%M:%S')
+                      time = changesets_latest_coimmit.created_at
+                    end
+                  end
+                rescue
+                end
+              end
+            end
+          end
+          s_time = time
+          if time.strftime('%Y-%m-%d %H:%M:%S') > h.updated_at.strftime('%Y-%m-%d %H:%M:%S')
+            h.update_column('updated_at', s_time)
+            course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first
+            if course_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > course_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              course_activity.update_column('updated_at', s_time)
+            end
+            user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first
+            if user_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > user_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              user_activity.update_column('updated_at', s_time)
+            end
+            org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first
+            if org_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > org_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              org_activity.update_column('updated_at', s_time)
+            end
+          end
+        end
+      end
+    end
+  end
+  task :update_homework => :environment do
+    year = Time.now.year
+    courses = Course.where("time > ? and is_delete = 0", (year.to_i - 2))
+    course_ids = courses.nil? ? '(-1)' : '(' + courses.map{|c| c.id}.join(',') + ')'
+    homeworks = HomeworkCommon.where("course_id in #{course_ids} and homework_type = 3")
+    unless homeworks.nil?
+      update_homework_time homeworks
+    end
+  end
+end
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 74013be54..9ae1300e7 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -3,8 +3,7 @@
 //    for (var property in myObject) {
 //        s = s + "\n "+property +": " + myObject[property] ;
 //    }
-//    alert(s);
-//}
+//    alert(s)
 /*******************************************************************************
 * KindEditor - WYSIWYG HTML Editor for Internet
 * Copyright (C) 2006-2013 kindsoft.net
@@ -291,14 +290,14 @@ K.options = {
 		],
 		table: [
 			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
-			'.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
+			'.padding', '.margin', '.border','.border-color', 'bgcolor', '.text-align', '.color', '.background-color',
 			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
-			'.width', '.height', '.border-collapse'
+			'.width', '.height', '.border-collapse','.table-layout'
 		],
 		'td,th': [
 			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
 			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
-			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border', '.text-overflow','.overflow','.white-space'
 		],
 		a : ['id', 'class', 'href', 'target', 'name'],
 		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
@@ -737,6 +736,8 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
 	html = html.replace(/\u200B/g, '');
 	html = html.replace(/\u00A9/g, '&copy;');
 	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/\u2003/g, '&emsp;');
+	html = html.replace(/\u3000/g, '&emsp;');
 	html = html.replace(/<[^>]+/g, function($0) {
 		return $0.replace(/\s+/g, ' ');
 	});
@@ -3788,6 +3789,7 @@ _extend(KEdit, KWidget, {
 				} else {
 					val = body.innerHTML;
 				}
+                //yk
 				if (self.beforeGetHtml) {
 					val = self.beforeGetHtml(val);
 				}
@@ -5994,7 +5996,24 @@ _plugin('core', function(K) {
 					html = html.replace(/\n/g, '<br />$&');
 				}
 			}
-			self.insertHtml(html, true);
+
+//            var kePasteContainer = document.getElementById("ke_paste");
+//            if (kePasteContainer == null) {
+//                kePasteContainer = document.createElement("div");
+//                kePasteContainer.id = "ke_paste";
+//                var last=document.body.lastChild;//得到页面的最后个元素
+//                document.body.insertBefore(kePasteContainer,last);//在得到的最后元素之前插入
+//            }
+//            kePasteContainer.innerHTML = html;
+//            $("#ke_paste").hide();
+//
+//            var imglist = $("#ke_paste").find("img");
+//
+//            if (imglist.length > 0){
+//                df(self);
+//            }
+            self.insertHtml(html, true);
+            df(self);
 		}
 		K(doc.body).bind('paste', function(e){
 			if (self.pasteType === 0) {
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index f08a768aa..8831ba300 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -1,8 +1,8 @@
 // Generated by CoffeeScript 1.9.0
 
 /* 
-paste.js is an interface to read data ( text / image ) from clipboard in different browsers. It also contains several hacks.
-https://github.com/layerssss/paste.js
+ paste.js is an interface to read data ( text / image ) from clipboard in different browsers. It also contains several hacks.
+ https://github.com/layerssss/paste.js
  */
 
 (function() {
@@ -279,7 +279,7 @@ https://github.com/layerssss/paste.js
                         }
                         //firefox问题处理，因为采用了 pastableContenteditable 模式，故只需要删除默认的粘贴
                         if ($(img).attr('src').startsWith('data:image/')) {
-                           _results.push($(img).remove()); 
+                            _results.push($(img).remove());
                         };
                     }
                     return _results;
@@ -307,23 +307,23 @@ function enablePasteImg(_editor) {
     $(nodeBody).pastableContenteditable();
 
     dataURItoBlob = function(dataURI) {
-      // convert base64/URLEncoded data component to raw binary data held in a string
-      var byteString;
-      if (dataURI.split(',')[0].indexOf('base64') >= 0)
-        byteString = atob(dataURI.split(',')[1]);
-      else
-        byteString = unescape(dataURI.split(',')[1]);
-
-      // separate out the mime component
-      var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
-
-      // write the bytes of the string to a typed array
-      var ia = new Uint8Array(byteString.length);
-      for (var i = 0; i < byteString.length; i++) {
-        ia[i] = byteString.charCodeAt(i);
-      }
-
-      return new Blob([ia], {type:mimeString});
+        // convert base64/URLEncoded data component to raw binary data held in a string
+        var byteString;
+        if (dataURI.split(',')[0].indexOf('base64') >= 0)
+            byteString = atob(dataURI.split(',')[1]);
+        else
+            byteString = unescape(dataURI.split(',')[1]);
+
+        // separate out the mime component
+        var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
+
+        // write the bytes of the string to a typed array
+        var ia = new Uint8Array(byteString.length);
+        for (var i = 0; i < byteString.length; i++) {
+            ia[i] = byteString.charCodeAt(i);
+        }
+
+        return new Blob([ia], {type:mimeString});
     };
 
     $(nodeBody).on('pasteImage', function(ev, data) {
@@ -337,18 +337,103 @@ function enablePasteImg(_editor) {
             data.append("imgFile",blob, "imageFilename.png");
             console.log(data);
             $.ajax({
-              url: '/kindeditor/upload?dir=image',
-              contentType: false,
-              type: 'POST',
-              data: data,
-              processData: false,
-              success: function(data) {
-                console.log(data);
-                editor.exec('insertimage', JSON.parse(data).url);
-              }
+                url: '/kindeditor/upload?dir=image',
+                contentType: false,
+                type: 'POST',
+                data: data,
+                processData: false,
+                success: function(data) {
+                    console.log(data);
+                    editor.exec('insertimage', JSON.parse(data).url);
+                }
             });
         }
 
     });
     return;
 };
+
+//复制粘贴时把远程图片上传到服务器
+function df(myself) {
+//    var img = $("#ke_paste").find("img");
+    var currele = document.activeElement;
+    var img = $(currele).contents().find("img");
+    var piccount = 0;
+    var sstr = "";
+    $(img).each(function (i) {
+        var that = $(this);
+        if(that.attr("src")) {
+            if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) {
+                piccount++;
+                if (i == $(img).length - 1)
+                    sstr += that.attr("src");
+                else
+                    sstr += that.attr("src") + "|";
+            }
+        }
+    });
+    uploadpic(sstr,myself);
+}
+
+function keShadow(myself)
+{
+    var keShadowContainer = document.getElementById("ke_shadow");
+    if (keShadowContainer == null) {
+        keShadowContainer = document.createElement("div");
+        keShadowContainer.id = "ke_shadow";
+        keShadowContainer.innerHTML = "<div class='ui-widget-overlay'  z-index: 1001;'></div>";
+        $("#ajax-modal").after(keShadowContainer);
+    }
+    var tWidth = document.body.scrollWidth;
+    var tHeight = document.body.scrollHeight;
+    $(".ui-widget-overlay").css("width", tWidth);
+    $(".ui-widget-overlay").css("height", tHeight);
+    $("#ke_shadow").show();
+    myself.readonly();
+}
+
+function uploadpic(piclist,myself) {
+    if (piclist.length == 0) return false;
+    $.ajax({
+        url: "/kindeditor/uploadpic",
+        data:{"pic":piclist},
+        type: "GET",
+        beforeSend: function () {
+//            $("#ajax-indicator span").text("图片上传中请稍等...");
+            keShadow(myself);
+        },
+        success: function (msg) {
+            if (msg !== "") {
+                var str = new Array();
+                str = msg.split('|');
+                var currele = document.activeElement;
+                var img = $(currele).contents().find("img");
+                var tIndex = 0;
+                $(img).each(function (i) {
+                    var that = $(this);
+                    if(that.attr("src")){
+                        if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) {
+                            that.attr("src",  str[tIndex]);
+                            that.attr("data-ke-src", str[tIndex]);
+
+                            that.removeAttr("class");
+                            that.parent().removeAttr("class");
+                            that.parent().removeAttr("href");
+                            that.parent().removeAttr("data-ke-src");
+                            tIndex = tIndex + 1;
+                        }
+                    }
+                });
+            }
+            //                $("#ajax-indicator span").text("载入中...");
+            $("#ke_shadow").hide();
+            myself.readonly(false);
+        }
+    }).fail(function(xhr, status){
+//        $("#ajax-indicator span").text("载入中...");
+        $("#ke_shadow").hide();
+        myself.readonly(false);
+        return;
+    });
+}
+
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index c2adf3a35..b9c8252e8 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -1,7 +1,7 @@
 .ke-content {
     font-size: 12px;
-    font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢���ź�, ����;
-    font-family:Tahoma;
+    font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢���ź�, ����;
+    font-family:Tahoma;
 }
 .ke-content pre {
     font-size:9pt;
@@ -48,4 +48,8 @@
 
 .ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
 span.at {color:#269ac9;}
-span.at a{color:#269ac9;text-decoration: none;}
\ No newline at end of file
+span.at a{color:#269ac9;text-decoration: none;}
+
+/*yk*/
+.ke-content ol li{list-style-type: decimal;margin-left: 20px;}
+.ke-content ul li{list-style-type: disc;margin-left: 20px;}
\ No newline at end of file
diff --git a/public/assets/kindeditor/plugins/paste/paste.js b/public/assets/kindeditor/plugins/paste/paste.js
index 767cefb09..abf777398 100644
--- a/public/assets/kindeditor/plugins/paste/paste.js
+++ b/public/assets/kindeditor/plugins/paste/paste.js
@@ -353,3 +353,4 @@ KindEditor.plugin('paste', function(K) {
     return;
     
 });
+
diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index 08a1fbcc5..be386f7cc 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -283,7 +283,7 @@ KindEditor.plugin('table', function(K) {
 						for (var i = 0; i < rows; i++) {
 							html += '<tr>';
 							for (var j = 0; j < cols; j++) {
-								html += '<td style="border:solid windowtext 1.0px;text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 3f095ab62..e36fb3e27 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -3,7 +3,7 @@
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
+                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><span ng-if="discussion.locked" class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div>
                 <table class="post-detail-info"><tr>
                     <td class="text-nowrap v-top">发布者：</td>
                     <td>{{discussion.user.realname}}</td>
@@ -38,7 +38,7 @@
                 </div>
             </div>
             </div>
-            <div class="post-input-wrap">
+            <div ng-if="!discussion.locked" class="post-input-wrap">
                 <div class="post-reply-row">
                     <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 890b47a73..24ed8c9fc 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -3,7 +3,7 @@
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
+                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><span ng-if="discussion.locked" class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div>
                 <table class="post-detail-info"><tr>
                     <td class="text-nowrap v-top">发布者：</td>
                     <td>{{discussion.user.realname}}</td>
@@ -38,7 +38,7 @@
                     </div>
                 </div>
             </div>
-            <div class="post-input-wrap">
+            <div ng-if="!discussion.locked" class="post-input-wrap">
                 <div class="post-reply-row">
                     <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
diff --git a/public/images/default_blank/ad-default.jpg b/public/images/default_blank/ad-default.jpg
deleted file mode 100644
index 7707775d6..000000000
Binary files a/public/images/default_blank/ad-default.jpg and /dev/null differ
diff --git a/public/images/default_blank/banner-default.jpg b/public/images/default_blank/banner-default.jpg
deleted file mode 100644
index 1debf41a8..000000000
Binary files a/public/images/default_blank/banner-default.jpg and /dev/null differ
diff --git a/public/images/default_blank/default-img2.jpg b/public/images/default_blank/default-img2.jpg
deleted file mode 100644
index 8d194d605..000000000
Binary files a/public/images/default_blank/default-img2.jpg and /dev/null differ
diff --git a/public/images/default_blank/files-default.jpg b/public/images/default_blank/files-default.jpg
deleted file mode 100644
index 5da308927..000000000
Binary files a/public/images/default_blank/files-default.jpg and /dev/null differ
diff --git a/public/images/default_blank/icons-add.png b/public/images/default_blank/icons-add.png
new file mode 100644
index 000000000..059585a0d
Binary files /dev/null and b/public/images/default_blank/icons-add.png differ
diff --git a/public/images/default_blank/inner-01.jpg b/public/images/default_blank/inner-01.jpg
new file mode 100644
index 000000000..8c79ee009
Binary files /dev/null and b/public/images/default_blank/inner-01.jpg differ
diff --git a/public/images/default_blank/left-02.jpg b/public/images/default_blank/left-02.jpg
new file mode 100644
index 000000000..aee126ad3
Binary files /dev/null and b/public/images/default_blank/left-02.jpg differ
diff --git a/public/images/default_blank/left-03.jpg b/public/images/default_blank/left-03.jpg
new file mode 100644
index 000000000..4ff9bfa05
Binary files /dev/null and b/public/images/default_blank/left-03.jpg differ
diff --git a/public/images/default_blank/left-04.jpg b/public/images/default_blank/left-04.jpg
new file mode 100644
index 000000000..bdfcd485c
Binary files /dev/null and b/public/images/default_blank/left-04.jpg differ
diff --git a/public/images/default_blank/left-05.jpg b/public/images/default_blank/left-05.jpg
new file mode 100644
index 000000000..240780a62
Binary files /dev/null and b/public/images/default_blank/left-05.jpg differ
diff --git a/public/images/default_blank/left-act.jpg b/public/images/default_blank/left-act.jpg
deleted file mode 100644
index 19259035d..000000000
Binary files a/public/images/default_blank/left-act.jpg and /dev/null differ
diff --git a/public/images/default_blank/left-act2.jpg b/public/images/default_blank/left-act2.jpg
deleted file mode 100644
index 7f105cb1c..000000000
Binary files a/public/images/default_blank/left-act2.jpg and /dev/null differ
diff --git a/public/images/default_blank/left_01.jpg b/public/images/default_blank/left_01.jpg
new file mode 100644
index 000000000..9bbb96afc
Binary files /dev/null and b/public/images/default_blank/left_01.jpg differ
diff --git a/public/images/default_blank/right-01.jpg b/public/images/default_blank/right-01.jpg
new file mode 100644
index 000000000..8b71c8ae4
Binary files /dev/null and b/public/images/default_blank/right-01.jpg differ
diff --git a/public/images/default_blank/right-02.jpg b/public/images/default_blank/right-02.jpg
new file mode 100644
index 000000000..a28f9a41d
Binary files /dev/null and b/public/images/default_blank/right-02.jpg differ
diff --git a/public/images/default_blank/right-03.jpg b/public/images/default_blank/right-03.jpg
new file mode 100644
index 000000000..746de9eb9
Binary files /dev/null and b/public/images/default_blank/right-03.jpg differ
diff --git a/public/images/default_blank/right-top.jpg b/public/images/default_blank/right-top.jpg
deleted file mode 100644
index 591819248..000000000
Binary files a/public/images/default_blank/right-top.jpg and /dev/null differ
diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png
index 1a928ff33..4c05fce91 100644
Binary files a/public/images/homepage_icon.png and b/public/images/homepage_icon.png differ
diff --git a/public/images/org_tree.png b/public/images/org_tree.png
new file mode 100644
index 000000000..03b1e8cc9
Binary files /dev/null and b/public/images/org_tree.png differ
diff --git a/public/images/search.png b/public/images/search.png
new file mode 100644
index 000000000..97ce7bf5d
Binary files /dev/null and b/public/images/search.png differ
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index e7be7acbd..b09a8a811 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1039,15 +1039,18 @@ function showNormalImage(id) {
             var image=$(description_images[i]);
             var _path = getRootPath();
             //如果图片是视频图片，不处理。
+
             if($(image).hasClass("mediaIco")){
                 var _src = _path+"/"+$(image).attr('src');
                 $(image).attr('src',_src);
                 return;
             }
-
-            var element=$("<a></a>").attr("href",image.attr('src'));
-            image.wrap(element);
-            $(image).parent().colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
+            var tmpsrc = image.attr('src');
+            if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) {
+                var element = $("<a></a>").attr("href", image.attr('src'));
+                image.wrap(element);
+                $(image).parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false});
+            }
         }
         //$('#'+id+' a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); //有图片才将链接变为弹出框
     }
@@ -1266,7 +1269,7 @@ function expand_reply(container,btnid){
 }
 
 //by yk 列表描述将文字和起来去掉空格多于100就显示省略号
-function description_showwords_ellipsis(id){
+function description_showwords_ellipsis(id,num){
     var str = "";
     $("#intro_content_"+id).each(function () {
         str = str + $(this).text();
@@ -1275,8 +1278,8 @@ function description_showwords_ellipsis(id){
     //去掉空格
     str = str.replace(/\s/gi,'');
 
-    if(str.length > 100){
-        str = str.substring(0,100)+"...";
+    if(str.length > num){
+        str = str.substring(0,num)+"...";
     }
 
     $("#intro_content_"+id).html(str);
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 46b8b0e54..0bba3264b 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -76,7 +76,7 @@ function hidden_homework_score_form()
 function regex_course_name()
 {
     var name = $.trim($("#course_name").val());
-    if(name.length == 0)
+    if(name.length < 2)
     {
         $("#course_name_notice").show();
         return false;
@@ -380,6 +380,9 @@ function newsReplyVerify() {
     if(comment_editor.isEmpty()) {
         $("#add_reply_news").text("评论不能为空");
         $("#add_reply_news").css('color', '#ff0000');
+        $("#news_submit_comment").one('click',function(){
+            submitComment();
+        });
         return false;
     } else {
         $("#add_reply_news").text("填写正确");
@@ -1057,10 +1060,26 @@ $.fn.peSlider = function(settings){
                 max: parseFloat(input.attr('max')),
                 value: parseFloat(input.val())
             });
+            if(parseFloat(input.val()) == -1){
+                input.css("color", "#fff");
+                input.next().next().html("未评分");
+                input.next().next().show();
+            } else{
+                input.css("color", "#000");
+                input.next().next().hide();
+            }
             slider
                 .insertBefore(input)
                 .slider(sliderOptions)
                 .bind('slide', function(e, ui){
+                    if(ui.value == -1){
+                        input.css("color", "#fff");
+                        input.next().next().html("未评分");
+                        input.next().next().show();
+                    } else {
+                        input.css("color", "#000");
+                        input.next().next().hide();
+                    }
                     input.val(ui.value);
                     friendlyVal = input.val() + ' ' + thisUnits;
                     slider.find('a').attr({
@@ -1081,6 +1100,14 @@ $.fn.peSlider = function(settings){
                 .keyup(function(){
                     var inVal = parseFloat(input.val());
                     if( !isNaN(inVal) ){
+                        if(inVal == -1){
+                            input.css("color", "#fff");
+                            input.next().next().html("未评分");
+                            input.next().next().show();
+                        } else {
+                            input.css("color", "#000");
+                            input.next().next().hide();
+                        }
                         slider.slider('value', inVal);
                         input.val(slider.slider('value'));
                     }
@@ -1088,6 +1115,14 @@ $.fn.peSlider = function(settings){
                 .change(function(){
                     var inVal = parseFloat(input.val());
                     if( !isNaN(inVal) ){
+                        if(inVal == -1){
+                            input.css("color", "#fff");
+                            input.next().next().html("未评分");
+                            input.next().next().show();
+                        } else {
+                            input.css("color", "#000");
+                            input.next().next().hide();
+                        }
                         slider.slider('value', inVal);
                         input.val(slider.slider('value'));
                     }
@@ -1095,7 +1130,15 @@ $.fn.peSlider = function(settings){
                 .blur(function(){
                     var inVal = parseFloat(input.val());
                     if( isNaN(inVal) ){
-                        input.val(0);
+                        input.val(-1);
+                    }
+                    if(input.val() == -1){
+                        input.css("color", "#fff");
+                        input.next().next().html("未评分");
+                        input.next().next().show();
+                    } else {
+                        input.css("color", "#000");
+                        input.next().next().hide();
                     }
                 });
             if( !settings.step ){
@@ -1431,4 +1474,4 @@ function submit_course_feedback() {
 
 function show_more_tool(){
     $('#navContentCourse').css('display', 'block');
-}
+}
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index 8989f8716..2ff5336e1 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -31,7 +31,7 @@ function sd_create_editor(params){
             //params.toolbar_container.hide();
             sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
             if(this.isEmpty()) {
-                this.edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
+                this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
             }
             //params.toolbar_container.hide();
             $('#reply_image_' + id).addClass('imageFuzzy');
@@ -78,7 +78,7 @@ function sd_create_editor(params){
             //reset height
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
-            edit.html("<span id='hint' style='color: #999999; font-size: 12px'>我要回复</span>");
+            edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
             this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
             // params.toolbar_container.hide();
             if(typeof enableAt === 'function'){
diff --git a/public/javascripts/org.js b/public/javascripts/org.js
index d1cd30a3a..5b18372ed 100644
--- a/public/javascripts/org.js
+++ b/public/javascripts/org.js
@@ -74,4 +74,38 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
         );
     }
 
+}
+
+// 教师选项
+var sendType = '1';
+var lastSendType ;//初始为发送到我的课程
+function chooseTeacherType(org_id){
+    sendType = $("#teacher_type_select").val();
+    if (sendType === lastSendType) {
+        alert("666");
+        return;
+    } else if(lastSendType != null) { //不是第一次点击的时候
+        if (sendType == '1') {
+            alert("te");
+            $.ajax({
+                type: 'get',
+                url: '/organizations/' + org_id + '/teachers',
+                data:{type:"teachers"}
+            });
+        } else if(sendType == '2') {
+            alert(org_id);
+            $.ajax({
+                type: 'get',
+                url: '/organizations/' + org_id + '/teachers',
+                data:{type:"students"}
+            });
+        }else if(sendType == '3'){
+            $.ajax({
+                type: 'get',
+                url: '/organizations/' + org_id + '/teachers',
+                data:{type:"resources"}
+            });
+        }
+    }
+    lastSendType = sendType;
 }
\ No newline at end of file
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 75f6bb84e..fa5648ffa 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -286,6 +286,9 @@ function newsReplyVerify() {
     if(comment_editor.isEmpty()) {
         $("#add_reply_news").text("评论不能为空");
         $("#add_reply_news").css('color', '#ff0000');
+        $("#news_submit_comment").one('click',function(){
+            submitComment();
+        });
         return false;
     } else {
         $("#add_reply_news").text("填写正确");
diff --git a/public/plugin_assets/redmine_code_review/javascripts/code_review.js b/public/plugin_assets/redmine_code_review/javascripts/code_review.js
index 625f376c9..4f4d81691 100644
--- a/public/plugin_assets/redmine_code_review/javascripts/code_review.js
+++ b/public/plugin_assets/redmine_code_review/javascripts/code_review.js
@@ -1,354 +1,354 @@
-/*
-# Code Review plugin for Redmine
-# Copyright (C) 2009-2013  Haruyuki Iida
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-var topZindex = 1000;
-var action_type = '';
-var rev = '';
-var rev_to = '';
-var path = '';
-var urlprefix = '';
-var review_form_dialog = null;
-var add_form_title = null;
-var review_dialog_title = null;
-var repository_id = null;
-var filenames = [];
-
-var ReviewCount = function(total, open, progress){
-    this.total = total;
-    this.open = open;
-    this.closed = total - open;
-    this.progress = progress
-};
-
-var CodeReview = function(id) {
-    this.id = id;
-    this.path = '';
-    this.line = 0;
-    this.url = '';
-    this.is_closed = false;
-};
-
-var review_counts = new Array();
-var code_reviews_map = new Array();
-var code_reviews_dialog_map = new Array();
-
-function UpdateRepositoryView(title) {
-    var header = $("table.changesets thead tr:first");
-    var th = $('<th></th>');
-    th.html(title);
-    header.append(th);
-    $('tr.changeset td.id a').each(function(i){
-        var revision = this.getAttribute("href");
-        revision = revision.substr(revision.lastIndexOf("/") + 1);        
-        var review = review_counts['revision_' + revision];
-        var td = $('<td/>',{
-            'class':'progress'
-        });
-        td.html(review.progress);
-        $(this.parentNode.parentNode).append(td);
-    });
-    }
-//add function $.down
-if(! $.fn.down)
-(function($) {
-    $.fn.down = function() {
-        var el = this[0] && this[0].firstChild;
-        while (el && el.nodeType != 1)
-            el = el.nextSibling;
-        return $(el);
-    };
-})(jQuery);
-
-function UpdateRevisionView() {
-    $('li.change').each(function(){
-        var li = $(this);
-        if (li.hasClass('folder')) return;
-
-        var a = li.down('a');
-        if (a.size() == 0) return;
-        var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, '');
-
-        var reviewlist = code_reviews_map[path];
-        if (reviewlist == null) return;
-
-        var ul = $('<ul></ul>');
-        for (var j = 0; j < reviewlist.length; j++) {
-            var review = reviewlist[j];
-            var icon = review.is_closed? 'icon-closed-review': 'icon-review';
-            var item = $('<li></li>', {
-                'class': 'icon ' + icon + ' code_review_summary'
-                });
-            item.html(review.url);
-            ul.append(item);
-        }
-        li.append(ul);
-    });
-}
-
-function setAddReviewButton(url, change_id, image_tag, is_readonly, is_diff, attachment_id){
-    var filetables = [];
-    var j = 0;
-    $('table').each(function(){
-        if($(this).hasClass('filecontent')){
-            filetables[j++] = this;
-        }
-    });
-    j = 0;
-    $('table.filecontent th.filename').each(function(){
-        filenames[j] = $.trim($(this).text());
-        j++;
-    });
-    addReviewUrl = url + '?change_id=' + change_id + '&action_type=' + action_type +
-        '&rev=' + rev + '&rev_to=' + rev_to +
-        '&attachment_id=' + attachment_id + '&repository_id=' + encodeURIComponent(repository_id);
-    if (path != null && path.length > 0) {
-        addReviewUrl = addReviewUrl + '&path=' + encodeURIComponent(path);
-    }
-    var num = 0;
-    if (is_diff) {
-        num = 1;
-    }
-    var i, l, tl;
-    for (i = 0, tl = filetables.length; i < tl; i++) {
-        var table = filetables[i];
-        var trs = table.getElementsByTagName('tr');
-
-        for (j = 0,l = trs.length; j < l; j++) {
-            var tr = trs[j];
-            var ths = tr.getElementsByTagName('th');
-
-            var th = ths[num];
-            if (th == null) {
-                continue;
-            }
-
-            var th_html = th.innerHTML;
-
-            var line = th_html.match(/[0-9]+/);
-            if (line == null) {
-                continue;
-            }
-
-            var span_html = '<span white-space="nowrap" id="review_span_' + line + '_' + i + '">';
-
-            if (!is_readonly) {
-                span_html += image_tag;
-            }
-            span_html += '</span>';
-            th.innerHTML = th_html + span_html;
-
-            var img = th.getElementsByTagName('img')[0];
-            if (img != null ) {
-                img.id = 'add_revew_img_' + line + '_' + i;
-                $(img).click(clickPencil);
-            }
-        }
-    }
-
-
-}
-
-function clickPencil(e)
-{
-//    alert('$(e.target).attr("id") = ' + $(e.target).attr("id"));
-    var result = $(e.target).attr("id").match(/([0-9]+)_([0-9]+)/);
-    var line = result[1];
-    var file_count = eval(result[2]);
-    var url = addReviewUrl + '&line=' + line + '&file_count=' + file_count;
-
-    if (path == null || path.length == 0) {
-        url = url + '&path=' + encodeURIComponent(filenames[file_count]) + '&diff_all=true';
-    }
-    addReview(url);
-    formPopup(e.pageX, e.pageY);
-    e.preventDefault();
-}
-var addReviewUrl = null;
-var showReviewUrl = null;
-var showReviewImageTag = null;
-var showClosedReviewImageTag = null;
-
-function setShowReviewButton(line, review_id, is_closed, file_count) {
-    //alert('file_count = ' + file_count);
-    var span = $('#review_span_' + line + '_' + file_count);
-    if (span.size() == 0) {
-        return;
-    }
-    var innerSpan = $('<span></span>',{id: 'review_' + review_id});
-    span.append(innerSpan);
-    innerSpan.html(is_closed? showClosedReviewImageTag : showReviewImageTag);
-    var div = $('<div></div>', {
-        'class':'draggable',
-        id: 'show_review_' + review_id
-    });
-    $('#code_review').append(div);
-    innerSpan.down('img').click(function(e) {
-        var review_id = $(e.target).parent().attr('id').match(/[0-9]+/)[0];
-        var span   = $('#review_' + review_id); // span element of view review button
-    var pos = span.offset();
-        showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top + 25);
-    });
-}
-
-function popupReview(review_id) {
-    var span   = $('#review_' + review_id); // span element of view review button
-    var pos = span.offset();
-    $('html,body').animate({ scrollTop: pos.top },
-        {duration: 'fast',
-        complete: function(){showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top)}});
-    // position and show popup dialog
-    // create popup dialog
-    //var win = showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top);
-//    win.toFront();
-}
-
-function showReview(url, review_id, x, y) {
-    if (code_reviews_dialog_map[review_id] != null) {
-        var cur_win = code_reviews_dialog_map[review_id];
-        cur_win.hide();
-        code_reviews_dialog_map[review_id] = null;
-    }
-    $('#show_review_' + review_id).load(url, {review_id: review_id});
-    var review = getReviewObjById(review_id);
-
-    var win = $('#show_review_' + review_id).dialog({
-        show: {effect:'scale'},// ? 'top-left'
-        //position: [x, y + 5],
-        width:640,
-        zIndex: topZindex,
-        title: review_dialog_title
-    });
-//    win.getContent().style.color = "#484848";
-//    win.getContent().style.background = "#ffffff";
-    topZindex++;
-    code_reviews_dialog_map[review_id] = win;
-    return win
-}
-
-function getReviewObjById(review_id) {
-    for (var reviewlist in code_reviews_map) {
-        for (var i = 0; i < reviewlist.length; i++) {
-            var review = reviewlist[i];
-            if (review.id == review_id) {
-                return review;
-            }
-        }
-    }
-    return null;
-}
-
-function formPopup(x, y){
-    //@see http://docs.jquery.com/UI/Effects/Scale
-    var win = $('#review-form-frame').dialog({
-        show: {effect:'scale', direction: 'both'},// ? 'top-left'
-//        position: [x, y + 5],
-        width:640,
-        zIndex: topZindex,
-        title: add_form_title
-    });
-//    win.getContent().style.background = "#ffffff";
-    if (review_form_dialog != null) {
-        review_form_dialog.destroy();
-        review_form_dialog = null;
-    }
-    review_form_dialog = win;
-    topZindex += 10;
-    return false;
-}
-
-function hideForm() {
-    if (review_form_dialog == null) {
-        return;
-    }
-    review_form_dialog.dialog('close');
-    review_form_dialog = null;
-    $('#review-form').html('');
-}
-function addReview(url) {
-    $('#review-form').load(url);
-}
-
-function deleteReview(review_id) {
-    $('show_review_' + review_id).remove();
-    $('review_' + review_id).remove();
-    
-}
-
-function changeImage(review_id, is_closed) {
-    var span = $('review_' + review_id);
-    var new_image = null;
-    var dummy = new Element('span');
-    if (is_closed) {
-        dummy.insert(showClosedReviewImageTag);
-    }
-    else {
-        dummy.insert(showReviewImageTag);
-    }
-    new_image = dummy.down().getAttribute('src');
-    //alert(new_image);
-    span.down('img').setAttribute('src', new_image);
-
-}
-
-function make_addreview_link(project, link) {
-    var alist = $('#content p a');
-    if (alist == null) {
-        return;
-    }
-    var a = alist[0];
-    var p = a.parentNode;
-    p.innerHTML = p.innerHTML + " | " + link;
-}
-
-function call_update_revisions(url) {
-    var changeset_ids = '';
-    var links = $$('table.changesets tbody tr.changeset td.id a');
-    for (var i = 0; i < links.length; i++) {
-        var link = links[i];
-        var href = link.getAttribute('href');
-        var id = href.replace(/^.*\/revisions\//, '');
-        if (i > 0) {
-            changeset_ids += ',';
-        }
-        changeset_ids += id;
-    }
-    new Ajax.Updater('code_review_revisions', url,
-    {
-        evalScripts:true,
-        method:'get',
-        parameters: 'changeset_ids=' + encodeURI(changeset_ids)
-    });
-}
-
-$.fn.serialize2json = function()
-{
-   var o = {};
-   var a = this.serializeArray();
-   $.each(a, function() {
-       if (o[this.name]) {
-           if (!o[this.name].push) {
-               o[this.name] = [o[this.name]];
-           }
-           o[this.name].push(this.value || '');
-       } else {
-           o[this.name] = this.value || '';
-       }
-   });
-   return o;
+/*
+# Code Review plugin for Redmine
+# Copyright (C) 2009-2013  Haruyuki Iida
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+var topZindex = 1000;
+var action_type = '';
+var rev = '';
+var rev_to = '';
+var path = '';
+var urlprefix = '';
+var review_form_dialog = null;
+var add_form_title = null;
+var review_dialog_title = null;
+var repository_id = null;
+var filenames = [];
+
+var ReviewCount = function(total, open, progress){
+    this.total = total;
+    this.open = open;
+    this.closed = total - open;
+    this.progress = progress
+};
+
+var CodeReview = function(id) {
+    this.id = id;
+    this.path = '';
+    this.line = 0;
+    this.url = '';
+    this.is_closed = false;
+};
+
+var review_counts = new Array();
+var code_reviews_map = new Array();
+var code_reviews_dialog_map = new Array();
+
+function UpdateRepositoryView(title) {
+    var header = $("table.changesets thead tr:first");
+    var th = $('<th></th>');
+    th.html(title);
+    header.append(th);
+    $('tr.changeset td.id a').each(function(i){
+        var revision = this.getAttribute("href");
+        revision = revision.substr(revision.lastIndexOf("/") + 1);        
+        var review = review_counts['revision_' + revision];
+        var td = $('<td/>',{
+            'class':'progress'
+        });
+        td.html(review.progress);
+        $(this.parentNode.parentNode).append(td);
+    });
+    }
+//add function $.down
+if(! $.fn.down)
+(function($) {
+    $.fn.down = function() {
+        var el = this[0] && this[0].firstChild;
+        while (el && el.nodeType != 1)
+            el = el.nextSibling;
+        return $(el);
+    };
+})(jQuery);
+
+function UpdateRevisionView() {
+    $('li.change').each(function(){
+        var li = $(this);
+        if (li.hasClass('folder')) return;
+
+        var a = li.down('a');
+        if (a.size() == 0) return;
+        var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, '');
+
+        var reviewlist = code_reviews_map[path];
+        if (reviewlist == null) return;
+
+        var ul = $('<ul></ul>');
+        for (var j = 0; j < reviewlist.length; j++) {
+            var review = reviewlist[j];
+            var icon = review.is_closed? 'icon-closed-review': 'icon-review';
+            var item = $('<li></li>', {
+                'class': 'icon ' + icon + ' code_review_summary'
+                });
+            item.html(review.url);
+            ul.append(item);
+        }
+        li.append(ul);
+    });
+}
+
+function setAddReviewButton(url, change_id, image_tag, is_readonly, is_diff, attachment_id){
+    var filetables = [];
+    var j = 0;
+    $('table').each(function(){
+        if($(this).hasClass('filecontent')){
+            filetables[j++] = this;
+        }
+    });
+    j = 0;
+    $('table.filecontent th.filename').each(function(){
+        filenames[j] = $.trim($(this).text());
+        j++;
+    });
+    addReviewUrl = url + '?change_id=' + change_id + '&action_type=' + action_type +
+        '&rev=' + rev + '&rev_to=' + rev_to +
+        '&attachment_id=' + attachment_id + '&repository_id=' + encodeURIComponent(repository_id);
+    if (path != null && path.length > 0) {
+        addReviewUrl = addReviewUrl + '&path=' + encodeURIComponent(path);
+    }
+    var num = 0;
+    if (is_diff) {
+        num = 1;
+    }
+    var i, l, tl;
+    for (i = 0, tl = filetables.length; i < tl; i++) {
+        var table = filetables[i];
+        var trs = table.getElementsByTagName('tr');
+
+        for (j = 0,l = trs.length; j < l; j++) {
+            var tr = trs[j];
+            var ths = tr.getElementsByTagName('th');
+
+            var th = ths[num];
+            if (th == null) {
+                continue;
+            }
+
+            var th_html = th.innerHTML;
+
+            var line = th_html.match(/[0-9]+/);
+            if (line == null) {
+                continue;
+            }
+
+            var span_html = '<span white-space="nowrap" id="review_span_' + line + '_' + i + '">';
+
+            if (!is_readonly) {
+                span_html += image_tag;
+            }
+            span_html += '</span>';
+            th.innerHTML = th_html + span_html;
+
+            var img = th.getElementsByTagName('img')[0];
+            if (img != null ) {
+                img.id = 'add_revew_img_' + line + '_' + i;
+                $(img).click(clickPencil);
+            }
+        }
+    }
+
+
+}
+
+function clickPencil(e)
+{
+//    alert('$(e.target).attr("id") = ' + $(e.target).attr("id"));
+    var result = $(e.target).attr("id").match(/([0-9]+)_([0-9]+)/);
+    var line = result[1];
+    var file_count = eval(result[2]);
+    var url = addReviewUrl + '&line=' + line + '&file_count=' + file_count;
+
+    if (path == null || path.length == 0) {
+        url = url + '&path=' + encodeURIComponent(filenames[file_count]) + '&diff_all=true';
+    }
+    addReview(url);
+    formPopup(e.pageX, e.pageY);
+    e.preventDefault();
+}
+var addReviewUrl = null;
+var showReviewUrl = null;
+var showReviewImageTag = null;
+var showClosedReviewImageTag = null;
+
+function setShowReviewButton(line, review_id, is_closed, file_count) {
+    //alert('file_count = ' + file_count);
+    var span = $('#review_span_' + line + '_' + file_count);
+    if (span.size() == 0) {
+        return;
+    }
+    var innerSpan = $('<span></span>',{id: 'review_' + review_id});
+    span.append(innerSpan);
+    innerSpan.html(is_closed? showClosedReviewImageTag : showReviewImageTag);
+    var div = $('<div></div>', {
+        'class':'draggable',
+        id: 'show_review_' + review_id
+    });
+    $('#code_review').append(div);
+    innerSpan.down('img').click(function(e) {
+        var review_id = $(e.target).parent().attr('id').match(/[0-9]+/)[0];
+        var span   = $('#review_' + review_id); // span element of view review button
+    var pos = span.offset();
+        showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top + 25);
+    });
+}
+
+function popupReview(review_id) {
+    var span   = $('#review_' + review_id); // span element of view review button
+    var pos = span.offset();
+    $('html,body').animate({ scrollTop: pos.top },
+        {duration: 'fast',
+        complete: function(){showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top)}});
+    // position and show popup dialog
+    // create popup dialog
+    //var win = showReview(showReviewUrl, review_id, pos.left + 10 + 5, pos.top);
+//    win.toFront();
+}
+
+function showReview(url, review_id, x, y) {
+    if (code_reviews_dialog_map[review_id] != null) {
+        var cur_win = code_reviews_dialog_map[review_id];
+        cur_win.hide();
+        code_reviews_dialog_map[review_id] = null;
+    }
+    $('#show_review_' + review_id).load(url, {review_id: review_id});
+    var review = getReviewObjById(review_id);
+
+    var win = $('#show_review_' + review_id).dialog({
+        show: {effect:'scale'},// ? 'top-left'
+        //position: [x, y + 5],
+        width:640,
+        zIndex: topZindex,
+        title: review_dialog_title
+    });
+//    win.getContent().style.color = "#484848";
+//    win.getContent().style.background = "#ffffff";
+    topZindex++;
+    code_reviews_dialog_map[review_id] = win;
+    return win
+}
+
+function getReviewObjById(review_id) {
+    for (var reviewlist in code_reviews_map) {
+        for (var i = 0; i < reviewlist.length; i++) {
+            var review = reviewlist[i];
+            if (review.id == review_id) {
+                return review;
+            }
+        }
+    }
+    return null;
+}
+
+function formPopup(x, y){
+    //@see http://docs.jquery.com/UI/Effects/Scale
+    var win = $('#review-form-frame').dialog({
+        show: {effect:'scale', direction: 'both'},// ? 'top-left'
+//        position: [x, y + 5],
+        width:640,
+        zIndex: topZindex,
+        title: add_form_title
+    });
+//    win.getContent().style.background = "#ffffff";
+    if (review_form_dialog != null) {
+        review_form_dialog.destroy();
+        review_form_dialog = null;
+    }
+    review_form_dialog = win;
+    topZindex += 10;
+    return false;
+}
+
+function hideForm() {
+    if (review_form_dialog == null) {
+        return;
+    }
+    review_form_dialog.dialog('close');
+    review_form_dialog = null;
+    $('#review-form').html('');
+}
+function addReview(url) {
+    $('#review-form').load(url);
+}
+
+function deleteReview(review_id) {
+    $('show_review_' + review_id).remove();
+    $('review_' + review_id).remove();
+    
+}
+
+function changeImage(review_id, is_closed) {
+    var span = $('review_' + review_id);
+    var new_image = null;
+    var dummy = new Element('span');
+    if (is_closed) {
+        dummy.insert(showClosedReviewImageTag);
+    }
+    else {
+        dummy.insert(showReviewImageTag);
+    }
+    new_image = dummy.down().getAttribute('src');
+    //alert(new_image);
+    span.down('img').setAttribute('src', new_image);
+
+}
+
+function make_addreview_link(project, link) {
+    var alist = $('#content p a');
+    if (alist == null) {
+        return;
+    }
+    var a = alist[0];
+    var p = a.parentNode;
+    p.innerHTML = p.innerHTML + " | " + link;
+}
+
+function call_update_revisions(url) {
+    var changeset_ids = '';
+    var links = $$('table.changesets tbody tr.changeset td.id a');
+    for (var i = 0; i < links.length; i++) {
+        var link = links[i];
+        var href = link.getAttribute('href');
+        var id = href.replace(/^.*\/revisions\//, '');
+        if (i > 0) {
+            changeset_ids += ',';
+        }
+        changeset_ids += id;
+    }
+    new Ajax.Updater('code_review_revisions', url,
+    {
+        evalScripts:true,
+        method:'get',
+        parameters: 'changeset_ids=' + encodeURI(changeset_ids)
+    });
+}
+
+$.fn.serialize2json = function()
+{
+   var o = {};
+   var a = this.serializeArray();
+   $.each(a, function() {
+       if (o[this.name]) {
+           if (!o[this.name].push) {
+               o[this.name] = [o[this.name]];
+           }
+           o[this.name].push(this.value || '');
+       } else {
+           o[this.name] = this.value || '';
+       }
+   });
+   return o;
 };
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/activity.css b/public/plugin_assets/redmine_code_review/stylesheets/activity.css
index e3cdc3d55..202ed54e3 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/activity.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/activity.css
@@ -1,4 +1,4 @@
-
-dt.code_review {
-    background-image: url(../images/review.png);
+
+dt.code_review {
+    background-image: url(../images/review.png);
 }
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/code_review.css b/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
index 11939ae79..e25dc6d72 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/code_review.css
@@ -1,97 +1,97 @@
-/*
-# Code Review plugin for Redmine
-# Copyright (C) 2009  Haruyuki Iida
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-#review-form-frame {
-height: 100%;
-}
-
-.autoscroll table.filecontent th.line-num {
-    white-space: nowrap;
-    vertical-align: bottom;
-    padding-top: 0;
-    padding-bottom: 0;
-    text-align:left;
-}
-
-table.filecontent th.line-num img{
-    padding: 0;
-    margin: 0;
-    cursor: pointer;
-}
-
-
-.code-review-form-title {
-    background-color: #002059;
-    color: white;
-    padding-left: 2px;
-    padding-right: 2px;
-    cursor: default;
-}
-
-
-.code_review_viewer {
-
-    min-width: 300px;
-    /*
-    max-width: 60%;
-    */
-    /* max-height: 400px; */
-}
-
-.code_review_viewer .issue{
-    
-}
-
-.code_review_body {
-    background-color: white;
-    
-    padding:2px;
-    
-}
-
-#code_review_list table.list td {
-    text-align: center;
-}
-
-#code_review_list table.list td.path {
-    text-align: left;
-}
-
-#code_review_list table.list td.subject {
-    text-align: left;
-}
-
-.icon-review {
-    background-image: url(../images/review.png);
-    background-repeat: no-repeat;
-}
-
-.icon-closed-review {
-    background-image: url(../images/closed_review.png);
-    background-repeat: no-repeat;
-}
-
-.icon-settings {
-    background-image: url(../../../images/changeset.png);
-    background-repeat: no-repeat;
-}
-
-
-li.code_review_summary {
-    list-style-type: none;
+/*
+# Code Review plugin for Redmine
+# Copyright (C) 2009  Haruyuki Iida
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+#review-form-frame {
+height: 100%;
+}
+
+.autoscroll table.filecontent th.line-num {
+    white-space: nowrap;
+    vertical-align: bottom;
+    padding-top: 0;
+    padding-bottom: 0;
+    text-align:left;
+}
+
+table.filecontent th.line-num img{
+    padding: 0;
+    margin: 0;
+    cursor: pointer;
+}
+
+
+.code-review-form-title {
+    background-color: #002059;
+    color: white;
+    padding-left: 2px;
+    padding-right: 2px;
+    cursor: default;
+}
+
+
+.code_review_viewer {
+
+    min-width: 300px;
+    /*
+    max-width: 60%;
+    */
+    /* max-height: 400px; */
+}
+
+.code_review_viewer .issue{
+    
+}
+
+.code_review_body {
+    background-color: white;
+    
+    padding:2px;
+    
+}
+
+#code_review_list table.list td {
+    text-align: center;
+}
+
+#code_review_list table.list td.path {
+    text-align: left;
+}
+
+#code_review_list table.list td.subject {
+    text-align: left;
+}
+
+.icon-review {
+    background-image: url(../images/review.png);
+    background-repeat: no-repeat;
+}
+
+.icon-closed-review {
+    background-image: url(../images/closed_review.png);
+    background-repeat: no-repeat;
+}
+
+.icon-settings {
+    background-image: url(../../../images/changeset.png);
+    background-repeat: no-repeat;
+}
+
+
+li.code_review_summary {
+    list-style-type: none;
 }
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE b/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
index 5bcdad1bd..0a7cf9ad1 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/MIT-LICENSE
@@ -1,19 +1,19 @@
-Copyright (c) 2006 Sébastien Gruhier (http://xilinus.com, http://itseb.com)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2006 Sébastien Gruhier (http://xilinus.com, http://itseb.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
index 432d14e36..4846e6185 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert.css
@@ -1,119 +1,119 @@
-.overlay_alert {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alert_nw {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/top_left.gif) no-repeat bottom left;			
-}
-
-.alert_n {
-	height: 5px;
-	background: transparent url(alert/top.gif) repeat-x bottom left;			
-}
-
-.alert_ne {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/top_right.gif) no-repeat bottom left			
-}
-
-.alert_e {
-	width: 5px;
-	background: transparent url(alert/right.gif) repeat-y 0 0;			
-}
-
-.alert_w {
-	width: 5px;
-	background: transparent url(alert/left.gif) repeat-y 0 0;			
-}
-
-.alert_sw {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/bottom_left.gif) no-repeat 0 0;			
-}
-
-.alert_s {
-	height: 5px;
-	background: transparent url(alert/bottom.gif) repeat-x 0 0;			
-}
-
-.alert_se, .alert_sizer {
-	width: 5px;
-	height: 5px;
-	background: transparent url(alert/bottom_right.gif) no-repeat 0 0;			
-}
-
-.alert_close {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_minimize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_maximize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_title {
-	float:left;
-	height:1px;
-	width:100%;
-}
-
-.alert_content {
-	overflow:visible;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-  font: 12px arial;
-	background: #FFF;
-}
-
-/* For alert/confirm dialog */
-.alert_window {
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alert_message {
-  font: 12px arial;
-	width:100%;
-	color:#F00;
-	padding-bottom:10px;
-}
-
-.alert_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alert_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alert_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-
+.overlay_alert {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alert_nw {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/top_left.gif) no-repeat bottom left;			
+}
+
+.alert_n {
+	height: 5px;
+	background: transparent url(alert/top.gif) repeat-x bottom left;			
+}
+
+.alert_ne {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/top_right.gif) no-repeat bottom left			
+}
+
+.alert_e {
+	width: 5px;
+	background: transparent url(alert/right.gif) repeat-y 0 0;			
+}
+
+.alert_w {
+	width: 5px;
+	background: transparent url(alert/left.gif) repeat-y 0 0;			
+}
+
+.alert_sw {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/bottom_left.gif) no-repeat 0 0;			
+}
+
+.alert_s {
+	height: 5px;
+	background: transparent url(alert/bottom.gif) repeat-x 0 0;			
+}
+
+.alert_se, .alert_sizer {
+	width: 5px;
+	height: 5px;
+	background: transparent url(alert/bottom_right.gif) no-repeat 0 0;			
+}
+
+.alert_close {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_minimize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_maximize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_title {
+	float:left;
+	height:1px;
+	width:100%;
+}
+
+.alert_content {
+	overflow:visible;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+  font: 12px arial;
+	background: #FFF;
+}
+
+/* For alert/confirm dialog */
+.alert_window {
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alert_message {
+  font: 12px arial;
+	width:100%;
+	color:#F00;
+	padding-bottom:10px;
+}
+
+.alert_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alert_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alert_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
index c2ad538ca..a74fc71c3 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alert_lite.css
@@ -1,88 +1,88 @@
-.overlay_alert_lite {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alert_lite_sizer {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_close {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_minimize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_maximize {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_title {
-	width:0px;
-	height:0px;
-	display:none;
-}
-
-.alert_lite_content {
-	overflow:auto;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background: #FFF;
-}
-
-
-/* For alert/confirm dialog */
-.alert_lite_window {
-	border:1px solid #F00;	
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alert_lite_message {
-	font-size:16px;
-	text-align:center;
-	width:100%;
-	color:#F00;
-	padding-bottom:10px;
-}
-
-.alert_lite_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alert_lite_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alert_lite_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-table.alert_lite_header  {
-  border:1px solid #F00;
-  background:#FFF
-}
-
+.overlay_alert_lite {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alert_lite_sizer {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_close {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_minimize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_maximize {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_title {
+	width:0px;
+	height:0px;
+	display:none;
+}
+
+.alert_lite_content {
+	overflow:auto;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background: #FFF;
+}
+
+
+/* For alert/confirm dialog */
+.alert_lite_window {
+	border:1px solid #F00;	
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alert_lite_message {
+	font-size:16px;
+	text-align:center;
+	width:100%;
+	color:#F00;
+	padding-bottom:10px;
+}
+
+.alert_lite_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alert_lite_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alert_lite_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+table.alert_lite_header  {
+  border:1px solid #F00;
+  background:#FFF
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
index 7d2790e75..6d2862c0e 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/alphacube.css
@@ -1,150 +1,150 @@
-.overlay_alphacube {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.alphacube_nw {
-	background: transparent url(alphacube/left-top.gif) no-repeat 0 0;			
-  width:10px;
-  height:25px;
-}
-
-.alphacube_n {
-  background: transparent url(alphacube/top-middle.gif) repeat-x 0 0;			
-  height:25px;
-}
-
-.alphacube_ne {
-  background: transparent url(alphacube/right-top.gif) no-repeat 0 0;			
-  width:10px;	  
-  height:25px;
-}
-
-.alphacube_w {
-  background: transparent url(alphacube/frame-left.gif) repeat-y top left;			
-  width:7px;
-}
-
-.alphacube_e {
-  background: transparent url(alphacube/frame-right.gif) repeat-y top right;			
-  width:7px;	  
-}
-
-.alphacube_sw {
-  background: transparent url(alphacube/bottom-left-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.alphacube_s {
-  background: transparent url(alphacube/bottom-middle.gif) repeat-x 0 0;			
-  height:7px;
-}
-
-.alphacube_se, .alphacube_sizer  {
-  background: transparent url(alphacube/bottom-right-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.alphacube_sizer {
-	cursor:se-resize;	
-}
-
-.alphacube_close {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-close-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:11px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_minimize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-min-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:55px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_maximize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(alphacube/button-max-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:33px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.alphacube_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#123456;
-}
-
-.alphacube_content {
-	overflow:auto;
-	color: #000;
-	font-family: Tahoma, Arial, sans-serif;
-  font: 12px arial;
-	background:#FDFDFD;
-}
-
-/* For alert/confirm dialog */
-.alphacube_window {
-	border:1px solid #F00;	
-	background: #FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.alphacube_message {
-  font: 12px arial;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.alphacube_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.alphacube_buttons input {
-	width:20%;
-	margin:10px;
-}
-
-.alphacube_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background: #FFF url('alert/progress.gif') no-repeat center center
-}
-
-.alphacube_wired_frame {
-	background: #FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;	
-}
-
-
+.overlay_alphacube {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.alphacube_nw {
+	background: transparent url(alphacube/left-top.gif) no-repeat 0 0;			
+  width:10px;
+  height:25px;
+}
+
+.alphacube_n {
+  background: transparent url(alphacube/top-middle.gif) repeat-x 0 0;			
+  height:25px;
+}
+
+.alphacube_ne {
+  background: transparent url(alphacube/right-top.gif) no-repeat 0 0;			
+  width:10px;	  
+  height:25px;
+}
+
+.alphacube_w {
+  background: transparent url(alphacube/frame-left.gif) repeat-y top left;			
+  width:7px;
+}
+
+.alphacube_e {
+  background: transparent url(alphacube/frame-right.gif) repeat-y top right;			
+  width:7px;	  
+}
+
+.alphacube_sw {
+  background: transparent url(alphacube/bottom-left-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.alphacube_s {
+  background: transparent url(alphacube/bottom-middle.gif) repeat-x 0 0;			
+  height:7px;
+}
+
+.alphacube_se, .alphacube_sizer  {
+  background: transparent url(alphacube/bottom-right-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.alphacube_sizer {
+	cursor:se-resize;	
+}
+
+.alphacube_close {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-close-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:11px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_minimize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-min-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:55px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_maximize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(alphacube/button-max-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:33px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.alphacube_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#123456;
+}
+
+.alphacube_content {
+	overflow:auto;
+	color: #000;
+	font-family: Tahoma, Arial, sans-serif;
+  font: 12px arial;
+	background:#FDFDFD;
+}
+
+/* For alert/confirm dialog */
+.alphacube_window {
+	border:1px solid #F00;	
+	background: #FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.alphacube_message {
+  font: 12px arial;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.alphacube_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.alphacube_buttons input {
+	width:20%;
+	margin:10px;
+}
+
+.alphacube_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background: #FFF url('alert/progress.gif') no-repeat center center
+}
+
+.alphacube_wired_frame {
+	background: #FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;	
+}
+
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
index 437c5ec92..e5c6edc1c 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/behavior.htc
@@ -1,51 +1,51 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="propertyChanged()" />
-<script>
-
-var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
-var realSrc;
-var blankSrc = "blank.gif";
-
-if (supported) fixImage();
-
-function propertyChanged() {
-   if (!supported) return;
-
-   var pName = event.propertyName;
-   if (pName != "src") return;
-   // if not set to blank
-   if ( ! new RegExp(blankSrc).test(src))
-      fixImage();
-};
-
-function fixImage() {
-   // get src
-   var src = element.src;
-
-   // check for real change
-   if (src == realSrc) {
-      element.src = blankSrc;
-      return;
-   }
-
-   if ( ! new RegExp(blankSrc).test(src)) {
-      // backup old src
-      realSrc = src;
-   }
-
-   // test for png
-   if ( /\.png$/.test( realSrc.toLowerCase() ) ) {
-      // set blank image
-      element.src = blankSrc;
-      // set filter
-      element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
-                                     src + "',sizingMethod='scale')";
-   }
-   else {
-      // remove filter
-      element.runtimeStyle.filter = "";
-   }
-}
-
-</script>
+<public:component>
+<public:attach event="onpropertychange" onevent="propertyChanged()" />
+<script>
+
+var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32";
+var realSrc;
+var blankSrc = "blank.gif";
+
+if (supported) fixImage();
+
+function propertyChanged() {
+   if (!supported) return;
+
+   var pName = event.propertyName;
+   if (pName != "src") return;
+   // if not set to blank
+   if ( ! new RegExp(blankSrc).test(src))
+      fixImage();
+};
+
+function fixImage() {
+   // get src
+   var src = element.src;
+
+   // check for real change
+   if (src == realSrc) {
+      element.src = blankSrc;
+      return;
+   }
+
+   if ( ! new RegExp(blankSrc).test(src)) {
+      // backup old src
+      realSrc = src;
+   }
+
+   // test for png
+   if ( /\.png$/.test( realSrc.toLowerCase() ) ) {
+      // set blank image
+      element.src = blankSrc;
+      // set filter
+      element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
+                                     src + "',sizingMethod='scale')";
+   }
+   else {
+      // remove filter
+      element.runtimeStyle.filter = "";
+   }
+}
+
+</script>
 </public:component>
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
index 2f83cfd46..e3df3e0a4 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/darkX.css
@@ -1,121 +1,121 @@
-.overlay_darkX {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.darkX_nw {
-	background: transparent url(darkX/titlebar-left-focused.png) no-repeat 0 0;			
-  width:6px;
-  height:21px;
-}
-.darkX_n {
-  background: transparent url(darkX/titlebar-mid-focused.png) repeat-x 0 0;			
-  height:21px;
-}
-.darkX_ne {
-  background: transparent url(darkX/titlebar-right-focused.png) no-repeat 0 0;			
-  width:6px;	  
-  height:21px;
-}
-.darkX_w {
-  background: transparent url(darkX/frame-left-focused.png) repeat-y top left;			
-  width:3px;
-}
-
-.darkX_e {
-  background: transparent url(darkX/frame-right-focused.png) repeat-y top right;			
-  width:3px;	  
-}
-
-.darkX_sw {
-  background: transparent url(darkX/frame-bottom-left-focused.png) no-repeat 0 0;			
-  width:5px;
-  height:3px;
-}
-.darkX_s {
-  background: transparent url(darkX/frame-bottom-mid-focused.png) repeat-x 0 0;			
-  height:3px;
-}
-.darkX_se, .darkX_sizer {
-  background: transparent url(darkX/frame-bottom-right-focused.png) no-repeat 0 0;			
-  width:5px;
-  height:3px;
-}
-
-.darkX_sizer {
-	cursor:se-resize;	
-}
-
-.darkX_close {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-close-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:5px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkX_minimize {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-minimize-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:26px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkX_maximize {
-	width: 21px;
-	height: 21px;
-	background: transparent url(darkX/button-maximize-focused.png) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:47px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-
-.darkX_title {
-	float:left;
-	height:14px;
-	font-size:12px;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#FFF;
-}
-
-.darkX_content {
-	overflow:auto;
-	color: #E6DF2A;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 14px;
-	background:#5E5148;
-}
-
-
-/* FOR IE */
-* html .darkX_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
-}
-
-* html .darkX_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
-}
-
-* html .darkX_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
-}
+.overlay_darkX {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.darkX_nw {
+	background: transparent url(darkX/titlebar-left-focused.png) no-repeat 0 0;			
+  width:6px;
+  height:21px;
+}
+.darkX_n {
+  background: transparent url(darkX/titlebar-mid-focused.png) repeat-x 0 0;			
+  height:21px;
+}
+.darkX_ne {
+  background: transparent url(darkX/titlebar-right-focused.png) no-repeat 0 0;			
+  width:6px;	  
+  height:21px;
+}
+.darkX_w {
+  background: transparent url(darkX/frame-left-focused.png) repeat-y top left;			
+  width:3px;
+}
+
+.darkX_e {
+  background: transparent url(darkX/frame-right-focused.png) repeat-y top right;			
+  width:3px;	  
+}
+
+.darkX_sw {
+  background: transparent url(darkX/frame-bottom-left-focused.png) no-repeat 0 0;			
+  width:5px;
+  height:3px;
+}
+.darkX_s {
+  background: transparent url(darkX/frame-bottom-mid-focused.png) repeat-x 0 0;			
+  height:3px;
+}
+.darkX_se, .darkX_sizer {
+  background: transparent url(darkX/frame-bottom-right-focused.png) no-repeat 0 0;			
+  width:5px;
+  height:3px;
+}
+
+.darkX_sizer {
+	cursor:se-resize;	
+}
+
+.darkX_close {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-close-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:5px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkX_minimize {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-minimize-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:26px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkX_maximize {
+	width: 21px;
+	height: 21px;
+	background: transparent url(darkX/button-maximize-focused.png) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:47px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+
+.darkX_title {
+	float:left;
+	height:14px;
+	font-size:12px;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#FFF;
+}
+
+.darkX_content {
+	overflow:auto;
+	color: #E6DF2A;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 14px;
+	background:#5E5148;
+}
+
+
+/* FOR IE */
+* html .darkX_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-minimize-focused.png", sizingMethod="crop");
+}
+
+* html .darkX_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-maximize-focused.png", sizingMethod="scale");
+}
+
+* html .darkX_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/darkX/button-close-focused.png", sizingMethod="crop");
+}
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
index 69e3b7fc2..d7981e9ca 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/debug.css
@@ -1,25 +1,25 @@
-div.inspector div.inspectable {
- padding: 0.25em 0 0.25em 1em;
- background-color: Gray;
- color: white;
- border: outset 2px white;
- cursor: pointer;
-}
- 
-div.inspector div.child {
- margin: 0 0 0 1em;
-}
- 
-#debug_window_content { /*  DIV container for debug sizing*/
- width:250px;
- height:100px;
- background-color:#000;
-}
- 
-#debug {         /*  DIV container for debug contents*/
- padding:3px;
- color:#0f0;
- font-family:monaco, Tahoma, Verdana, Arial, Helvetica, sans-serif;
- font-size:10px;
-}
- 
+div.inspector div.inspectable {
+ padding: 0.25em 0 0.25em 1em;
+ background-color: Gray;
+ color: white;
+ border: outset 2px white;
+ cursor: pointer;
+}
+ 
+div.inspector div.child {
+ margin: 0 0 0 1em;
+}
+ 
+#debug_window_content { /*  DIV container for debug sizing*/
+ width:250px;
+ height:100px;
+ background-color:#000;
+}
+ 
+#debug {         /*  DIV container for debug contents*/
+ padding:3px;
+ color:#0f0;
+ font-family:monaco, Tahoma, Verdana, Arial, Helvetica, sans-serif;
+ font-size:10px;
+}
+ 
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
index 6ab13789d..591451723 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/default.css
@@ -1,155 +1,155 @@
-.overlay_dialog {
-	background-color: #666666;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.overlay___invisible__ {
-  background-color: #666666;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-}
-
-.dialog_nw {
-	width: 9px;
-	height: 23px;
-	background: transparent url(default/top_left.gif) no-repeat 0 0;		
-}
-
-.dialog_n {
-	background: transparent url(default/top_mid.gif) repeat-x 0 0;	
-	height: 23px;
-}
-
-.dialog_ne {
-	width: 9px;
-	height: 23px;
-	background: transparent url(default/top_right.gif) no-repeat 0 0;		
-}
-
-.dialog_e {
-	width: 2px;
-	background: transparent url(default/center_right.gif) repeat-y 0 0;	
-}
-
-.dialog_w {
-	width: 2px;
-	background: transparent url(default/center_left.gif) repeat-y 0 0;		
-}
-
-.dialog_sw {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/bottom_left.gif) no-repeat 0 0;			
-}
-
-.dialog_s {
-	background: transparent url(default/bottom_mid.gif) repeat-x 0 0;		
-	height: 19px;
-}
-
-.dialog_se {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/bottom_right.gif) no-repeat 0 0;			
-}
-
-.dialog_sizer {
-	width: 9px;
-	height: 19px;
-	background: transparent url(default/sizer.gif) no-repeat 0 0;	
-	cursor:se-resize;	
-}
-
-.dialog_close {
-	width: 14px;
-	height: 14px;
-	background: transparent url(default/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:8px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_minimize {
-	width: 14px;
-	height: 15px;
-	background: transparent url(default/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:28px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_maximize {
-	width: 14px;
-	height: 15px;
-	background: transparent url(default/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:5px;
-	left:49px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.dialog_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	width:100%;
-	color:#000;
-}
-
-.dialog_content {
-	overflow:auto;
-	color: #DDD;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background-color:#123;
-}
-
-.top_draggable, .bottom_draggable {
-  cursor:move;
-}
-
-.status_bar {
-  font-size:12px;
-}
-.status_bar input{
-  font-size:12px;
-}
-
-.wired_frame {
-	display: block;
-  position: absolute;
-  border: 1px #000 dashed;
-}
-
-/* DO NOT CHANGE THESE VALUES*/
-.dialog {
-	display: block;
-	position: absolute;
-}
-
-.dialog table.table_window  { 
-  border-collapse: collapse; 
-  border-spacing: 0; 
-  width: 100%;
-	margin: 0px;
-	padding:0px;
-}
-
-.dialog table.table_window td , .dialog table.table_window th { 
-  padding: 0; 
-}
-
-.dialog .title_window {
-  -moz-user-select:none;
-}                                                    
-
+.overlay_dialog {
+	background-color: #666666;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.overlay___invisible__ {
+  background-color: #666666;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+}
+
+.dialog_nw {
+	width: 9px;
+	height: 23px;
+	background: transparent url(default/top_left.gif) no-repeat 0 0;		
+}
+
+.dialog_n {
+	background: transparent url(default/top_mid.gif) repeat-x 0 0;	
+	height: 23px;
+}
+
+.dialog_ne {
+	width: 9px;
+	height: 23px;
+	background: transparent url(default/top_right.gif) no-repeat 0 0;		
+}
+
+.dialog_e {
+	width: 2px;
+	background: transparent url(default/center_right.gif) repeat-y 0 0;	
+}
+
+.dialog_w {
+	width: 2px;
+	background: transparent url(default/center_left.gif) repeat-y 0 0;		
+}
+
+.dialog_sw {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/bottom_left.gif) no-repeat 0 0;			
+}
+
+.dialog_s {
+	background: transparent url(default/bottom_mid.gif) repeat-x 0 0;		
+	height: 19px;
+}
+
+.dialog_se {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/bottom_right.gif) no-repeat 0 0;			
+}
+
+.dialog_sizer {
+	width: 9px;
+	height: 19px;
+	background: transparent url(default/sizer.gif) no-repeat 0 0;	
+	cursor:se-resize;	
+}
+
+.dialog_close {
+	width: 14px;
+	height: 14px;
+	background: transparent url(default/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:8px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_minimize {
+	width: 14px;
+	height: 15px;
+	background: transparent url(default/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:28px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_maximize {
+	width: 14px;
+	height: 15px;
+	background: transparent url(default/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:5px;
+	left:49px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.dialog_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	width:100%;
+	color:#000;
+}
+
+.dialog_content {
+	overflow:auto;
+	color: #DDD;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background-color:#123;
+}
+
+.top_draggable, .bottom_draggable {
+  cursor:move;
+}
+
+.status_bar {
+  font-size:12px;
+}
+.status_bar input{
+  font-size:12px;
+}
+
+.wired_frame {
+	display: block;
+  position: absolute;
+  border: 1px #000 dashed;
+}
+
+/* DO NOT CHANGE THESE VALUES*/
+.dialog {
+	display: block;
+	position: absolute;
+}
+
+.dialog table.table_window  { 
+  border-collapse: collapse; 
+  border-spacing: 0; 
+  width: 100%;
+	margin: 0px;
+	padding:0px;
+}
+
+.dialog table.table_window td , .dialog table.table_window th { 
+  padding: 0; 
+}
+
+.dialog .title_window {
+  -moz-user-select:none;
+}                                                    
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
index 257a1b1e3..249388be5 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.css
@@ -1,3 +1,3 @@
-/* PNG fix for all themes that uses PNG images on IE */
-td, div { behavior: url(../themes/iefix/iepngfix.htc) }
-
+/* PNG fix for all themes that uses PNG images on IE */
+td, div { behavior: url(../themes/iefix/iepngfix.htc) }
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
index a6c683b9f..9a13f32bf 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/iefix/iepngfix.htc
@@ -1,54 +1,54 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script type="text/javascript">
-
-// IE5.5+ PNG Alpha Fix v1.0RC4
-// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the CC-GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-
-// Modified/Simplified on 04/23/2007 by Sebastien Gruhier (http://www.xilinus.com) 
-// To work only on background and to handle repeat bg  
-                     
-// This must be a path to a blank image. That's all the configuration you need.
-if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
-
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m)
-{
- if (filters[f])
- {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- }
- else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix()
-{         
- // Assume IE7 is OK.
- if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- var bgImg = currentStyle.backgroundImage || style.backgroundImage;  
- var bgRepeat = currentStyle.backgroundRepeat || style.backgroundRepeat;        
- if (bgImg && bgImg != 'none')
- {
-  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
-  {
-   var s = RegExp.$1;
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   style.backgroundImage = 'none';
-   filt(s, bgRepeat == "no-repeat" ? 'crop' : 'scale');
-  }
- }
-}
-
-doFix();
-
-</script>
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0RC4
+// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the CC-GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+// Modified/Simplified on 04/23/2007 by Sebastien Gruhier (http://www.xilinus.com) 
+// To work only on background and to handle repeat bg  
+                     
+// This must be a path to a blank image. That's all the configuration you need.
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m)
+{
+ if (filters[f])
+ {
+  filters[f].enabled = s ? true : false;
+  if (s) with (filters[f]) { src = s; sizingMethod = m }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix()
+{         
+ // Assume IE7 is OK.
+ if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
+  (event && !/(background|src)/.test(event.propertyName))) return;
+
+ var bgImg = currentStyle.backgroundImage || style.backgroundImage;  
+ var bgRepeat = currentStyle.backgroundRepeat || style.backgroundRepeat;        
+ if (bgImg && bgImg != 'none')
+ {
+  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
+  {
+   var s = RegExp.$1;
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   style.backgroundImage = 'none';
+   filt(s, bgRepeat == "no-repeat" ? 'crop' : 'scale');
+  }
+ }
+}
+
+doFix();
+
+</script>
 </public:component>
\ No newline at end of file
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
index 95ec287a9..0d955c3d7 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting.css
@@ -1,960 +1,960 @@
-.overlay___invisible__ {
-  background-color: #666;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-}
-
-.top_draggable, .bottom_draggable {
-	cursor:move;
-}
-
-.status_bar {
-	font-size:12px;
-}
-.status_bar input{
-	font-size:12px;
-}
-
-.wired_frame {
-	display:block;
-	position:absolute;
-	border:1px #000 dashed;
-}
-
-
-
-.overlay_bluelighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.bluelighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.bluelighting_nw {
-	background:transparent url(lighting/top-left-blue.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.bluelighting_n {
-	background:transparent url(lighting/top-middle-blue.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.bluelighting_ne {
-	background:transparent url(lighting/top-right-blue.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.bluelighting_w {
-	background:transparent url(lighting/left-blue.png) repeat-y top left;			
-	width:9px;
-}
-
-.bluelighting_e {
-	background:transparent url(lighting/right-blue.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.bluelighting_sw {
-	background:transparent url(lighting/bottom-left-blue.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.bluelighting_s {
-	background:transparent url(lighting/bottom-middle-blue.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.bluelighting_se, .bluelighting_sizer  {
-	background:transparent url(lighting/bottom-right-blue.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.bluelighting_sizer {
-	cursor:se-resize;	
-}
-
-.bluelighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-blue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.bluelighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#17385B;
-}
-
-.bluelighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#BFDBFF;
-}
-
-/* For alert/confirm dialog */
-.bluelighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.bluelighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.bluelighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.bluelighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.bluelighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .bluelighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
-}
-
-* html .bluelighting_se, * html .bluelighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
-}
-
-* html .bluelighting_content {
-	background:#B8D7FF;
-}
-
-
-
-.overlay_greylighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.greylighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.greylighting_nw {
-	background:transparent url(lighting/top-left-grey.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.greylighting_n {
-	background:transparent url(lighting/top-middle-grey.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.greylighting_ne {
-	background:transparent url(lighting/top-right-grey.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.greylighting_w {
-	background:transparent url(lighting/left-grey.png) repeat-y top left;			
-	width:9px;
-}
-
-.greylighting_e {
-	background:transparent url(lighting/right-grey.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.greylighting_sw {
-	background:transparent url(lighting/bottom-left-grey.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.greylighting_s {
-	background:transparent url(lighting/bottom-middle-grey.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.greylighting_se, .greylighting_sizer  {
-	background:transparent url(lighting/bottom-right-grey.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.greylighting_sizer {
-	cursor:se-resize;	
-}
-
-.greylighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-grey.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greylighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#525252;
-}
-
-.greylighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#CDCDCD;
-}
-
-/* For alert/confirm dialog */
-.greylighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.greylighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.greylighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.greylighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.greylighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .greylighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
-}
-
-* html .greylighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
-}
-
-* html greylighting_se, * html .greylighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
-}
-
-* html .greylighting_content {
-	background:#C7C7C7;
-}
-
-
-
-.overlay_greenlighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.greenlighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.greenlighting_nw {
-	background:transparent url(lighting/top-left-green.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.greenlighting_n {
-	background:transparent url(lighting/top-middle-green.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.greenlighting_ne {
-	background:transparent url(lighting/top-right-green.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.greenlighting_w {
-	background:transparent url(lighting/left-green.png) repeat-y top left;			
-	width:9px;
-}
-
-.greenlighting_e {
-	background:transparent url(lighting/right-green.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.greenlighting_sw {
-	background:transparent url(lighting/bottom-left-green.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.greenlighting_s {
-	background:transparent url(lighting/bottom-middle-green.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.greenlighting_se, .greenlighting_sizer  {
-	background:transparent url(lighting/bottom-right-green.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.greenlighting_sizer {
-	cursor:se-resize;	
-}
-
-.greenlighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-green.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.greenlighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#2A6002;
-}
-
-.greenlighting_content {
-	overflow:auto;
-	color:#000;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#ACFCAF;
-}
-
-/* For alert/confirm dialog */
-.greenlighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.greenlighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.greenlighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.greenlighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.greenlighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .greenlighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
-}
-
-* html .greenlighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
-}
-
-* html greenlighting_se, * html .greenlighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
-}
-
-* html .greenlighting_content {
-	background:#A4FCA7;
-}
-
-
-
-.overlay_darkbluelighting {
-	background-color:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;
-}
-
-.darkbluelighting_wired_frame {
-	background:#FFF;
-	filter:alpha(opacity=60);
-	-moz-opacity:0.6;
-	opacity:0.6;	
-}
-
-.darkbluelighting_nw {
-	background:transparent url(lighting/top-left-darkblue.png) no-repeat 0 0;			
-	width:9px;
-	height:28px;
-}
-
-.darkbluelighting_n {
-	background:transparent url(lighting/top-middle-darkblue.png) repeat-x 0 0;			
-	height:28px;
-}
-
-.darkbluelighting_ne {
-	background:transparent url(lighting/top-right-darkblue.png) no-repeat 0 0;			
-	width:15px;	  
-	height:28px;
-}
-
-.darkbluelighting_w {
-	background:transparent url(lighting/left-darkblue.png) repeat-y top left;			
-	width:9px;
-}
-
-.darkbluelighting_e {
-	background:transparent url(lighting/right-darkblue.png) repeat-y top right;			
-	width:15px;	  
-}
-
-.darkbluelighting_sw {
-	background:transparent url(lighting/bottom-left-darkblue.png) no-repeat 0 0;			
-	width:9px;
-	height:15px;
-}
-
-.darkbluelighting_s {
-	background:transparent url(lighting/bottom-middle-darkblue.png) repeat-x 0 0;			
-	height:15px;
-}
-
-.darkbluelighting_se, .darkbluelighting_sizer  {
-	background:transparent url(lighting/bottom-right-darkblue.png) no-repeat 0 0;			
-	width:15px;
-	height:15px;
-}
-
-.darkbluelighting_sizer {
-	cursor:se-resize;	
-}
-
-.darkbluelighting_close {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-close-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:10px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_maximize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-maximize-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_minimize {
-	width:15px;
-	height:9px;
-	background:transparent url(lighting/button-minimize-darkblue.png) no-repeat 0 0;			
-	position:absolute;
-	top:11px;
-	right:40px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.darkbluelighting_title {
-	float:left;
-	height:14px;
-	font-size:14px;
-	font-weight:bold;
-	font-family:Verdana, Arial, sans-serif;
-	text-align:center;
-	margin-top:2px;
-	width:100%;
-	color:#E4EFFD;
-}
-
-.darkbluelighting_content {
-	overflow:auto;
-	color:#FFF;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	background:#0413C0;
-}
-
-/* For alert/confirm dialog */
-.darkbluelighting_window {
-	border:1px solid #F00;	
-	background:#FFF;
-	padding:20px;
-	margin-left:auto;
-	margin-right:auto;
-	width:400px;
-}
-
-.darkbluelighting_message {
-  	font-size:12px;
-	text-align:center;
-	width:100%;
-	padding-bottom:10px;
-}
-
-.darkbluelighting_buttons {
-	text-align:center;
-	width:100%;
-}
-
-.darkbluelighting_buttons input {
-	border:1px solid #999;
-	border-top-color:#CCC;
-	border-left-color:#CCC;
-	padding:2px;
-	background-color:#FFF;
-	color:#333;
-	background-image:url(lighting/background_buttons.gif);
-	background-repeat:repeat-x;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	text-align:center;
-}
-
-.darkbluelighting_progress {
-	float:left;
-	margin:auto;
-	text-align:center;
-	width:100%;
-	height:16px;
-	background:transparent url('lighting/spinner.gif') no-repeat center center
-}
-
-/* FOR IE */
-* html .darkbluelighting_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
-}
-
-* html .darkbluelighting_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
-}
-
-* html darkbluelighting_se, * html .darkbluelighting_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_maximize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
-}
-
-* html .darkbluelighting_content {
-	background:#020EBA;
-}
-
+.overlay___invisible__ {
+  background-color: #666;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+}
+
+.top_draggable, .bottom_draggable {
+	cursor:move;
+}
+
+.status_bar {
+	font-size:12px;
+}
+.status_bar input{
+	font-size:12px;
+}
+
+.wired_frame {
+	display:block;
+	position:absolute;
+	border:1px #000 dashed;
+}
+
+
+
+.overlay_bluelighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.bluelighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.bluelighting_nw {
+	background:transparent url(lighting/top-left-blue.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.bluelighting_n {
+	background:transparent url(lighting/top-middle-blue.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.bluelighting_ne {
+	background:transparent url(lighting/top-right-blue.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.bluelighting_w {
+	background:transparent url(lighting/left-blue.png) repeat-y top left;			
+	width:9px;
+}
+
+.bluelighting_e {
+	background:transparent url(lighting/right-blue.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.bluelighting_sw {
+	background:transparent url(lighting/bottom-left-blue.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.bluelighting_s {
+	background:transparent url(lighting/bottom-middle-blue.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.bluelighting_se, .bluelighting_sizer  {
+	background:transparent url(lighting/bottom-right-blue.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.bluelighting_sizer {
+	cursor:se-resize;	
+}
+
+.bluelighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-blue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.bluelighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#17385B;
+}
+
+.bluelighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#BFDBFF;
+}
+
+/* For alert/confirm dialog */
+.bluelighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.bluelighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.bluelighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.bluelighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.bluelighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .bluelighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-blue.png", sizingMethod="scale");
+}
+
+* html .bluelighting_se, * html .bluelighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-blue.png", sizingMethod="crop");
+}
+
+* html .bluelighting_content {
+	background:#B8D7FF;
+}
+
+
+
+.overlay_greylighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.greylighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.greylighting_nw {
+	background:transparent url(lighting/top-left-grey.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.greylighting_n {
+	background:transparent url(lighting/top-middle-grey.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.greylighting_ne {
+	background:transparent url(lighting/top-right-grey.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.greylighting_w {
+	background:transparent url(lighting/left-grey.png) repeat-y top left;			
+	width:9px;
+}
+
+.greylighting_e {
+	background:transparent url(lighting/right-grey.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.greylighting_sw {
+	background:transparent url(lighting/bottom-left-grey.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.greylighting_s {
+	background:transparent url(lighting/bottom-middle-grey.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.greylighting_se, .greylighting_sizer  {
+	background:transparent url(lighting/bottom-right-grey.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.greylighting_sizer {
+	cursor:se-resize;	
+}
+
+.greylighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-grey.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greylighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#525252;
+}
+
+.greylighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#CDCDCD;
+}
+
+/* For alert/confirm dialog */
+.greylighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.greylighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.greylighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.greylighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.greylighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .greylighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-grey.png", sizingMethod="scale");
+}
+
+* html .greylighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-grey.png", sizingMethod="scale");
+}
+
+* html greylighting_se, * html .greylighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-grey.png", sizingMethod="crop");
+}
+
+* html .greylighting_content {
+	background:#C7C7C7;
+}
+
+
+
+.overlay_greenlighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.greenlighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.greenlighting_nw {
+	background:transparent url(lighting/top-left-green.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.greenlighting_n {
+	background:transparent url(lighting/top-middle-green.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.greenlighting_ne {
+	background:transparent url(lighting/top-right-green.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.greenlighting_w {
+	background:transparent url(lighting/left-green.png) repeat-y top left;			
+	width:9px;
+}
+
+.greenlighting_e {
+	background:transparent url(lighting/right-green.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.greenlighting_sw {
+	background:transparent url(lighting/bottom-left-green.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.greenlighting_s {
+	background:transparent url(lighting/bottom-middle-green.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.greenlighting_se, .greenlighting_sizer  {
+	background:transparent url(lighting/bottom-right-green.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.greenlighting_sizer {
+	cursor:se-resize;	
+}
+
+.greenlighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-green.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.greenlighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#2A6002;
+}
+
+.greenlighting_content {
+	overflow:auto;
+	color:#000;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#ACFCAF;
+}
+
+/* For alert/confirm dialog */
+.greenlighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.greenlighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.greenlighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.greenlighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.greenlighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .greenlighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-green.png", sizingMethod="scale");
+}
+
+* html .greenlighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-green.png", sizingMethod="scale");
+}
+
+* html greenlighting_se, * html .greenlighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-green.png", sizingMethod="crop");
+}
+
+* html .greenlighting_content {
+	background:#A4FCA7;
+}
+
+
+
+.overlay_darkbluelighting {
+	background-color:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;
+}
+
+.darkbluelighting_wired_frame {
+	background:#FFF;
+	filter:alpha(opacity=60);
+	-moz-opacity:0.6;
+	opacity:0.6;	
+}
+
+.darkbluelighting_nw {
+	background:transparent url(lighting/top-left-darkblue.png) no-repeat 0 0;			
+	width:9px;
+	height:28px;
+}
+
+.darkbluelighting_n {
+	background:transparent url(lighting/top-middle-darkblue.png) repeat-x 0 0;			
+	height:28px;
+}
+
+.darkbluelighting_ne {
+	background:transparent url(lighting/top-right-darkblue.png) no-repeat 0 0;			
+	width:15px;	  
+	height:28px;
+}
+
+.darkbluelighting_w {
+	background:transparent url(lighting/left-darkblue.png) repeat-y top left;			
+	width:9px;
+}
+
+.darkbluelighting_e {
+	background:transparent url(lighting/right-darkblue.png) repeat-y top right;			
+	width:15px;	  
+}
+
+.darkbluelighting_sw {
+	background:transparent url(lighting/bottom-left-darkblue.png) no-repeat 0 0;			
+	width:9px;
+	height:15px;
+}
+
+.darkbluelighting_s {
+	background:transparent url(lighting/bottom-middle-darkblue.png) repeat-x 0 0;			
+	height:15px;
+}
+
+.darkbluelighting_se, .darkbluelighting_sizer  {
+	background:transparent url(lighting/bottom-right-darkblue.png) no-repeat 0 0;			
+	width:15px;
+	height:15px;
+}
+
+.darkbluelighting_sizer {
+	cursor:se-resize;	
+}
+
+.darkbluelighting_close {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-close-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:10px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_maximize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-maximize-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_minimize {
+	width:15px;
+	height:9px;
+	background:transparent url(lighting/button-minimize-darkblue.png) no-repeat 0 0;			
+	position:absolute;
+	top:11px;
+	right:40px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.darkbluelighting_title {
+	float:left;
+	height:14px;
+	font-size:14px;
+	font-weight:bold;
+	font-family:Verdana, Arial, sans-serif;
+	text-align:center;
+	margin-top:2px;
+	width:100%;
+	color:#E4EFFD;
+}
+
+.darkbluelighting_content {
+	overflow:auto;
+	color:#FFF;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:12px;
+	background:#0413C0;
+}
+
+/* For alert/confirm dialog */
+.darkbluelighting_window {
+	border:1px solid #F00;	
+	background:#FFF;
+	padding:20px;
+	margin-left:auto;
+	margin-right:auto;
+	width:400px;
+}
+
+.darkbluelighting_message {
+  	font-size:12px;
+	text-align:center;
+	width:100%;
+	padding-bottom:10px;
+}
+
+.darkbluelighting_buttons {
+	text-align:center;
+	width:100%;
+}
+
+.darkbluelighting_buttons input {
+	border:1px solid #999;
+	border-top-color:#CCC;
+	border-left-color:#CCC;
+	padding:2px;
+	background-color:#FFF;
+	color:#333;
+	background-image:url(lighting/background_buttons.gif);
+	background-repeat:repeat-x;
+	font-family:Verdana, Arial, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	text-align:center;
+}
+
+.darkbluelighting_progress {
+	float:left;
+	margin:auto;
+	text-align:center;
+	width:100%;
+	height:16px;
+	background:transparent url('lighting/spinner.gif') no-repeat center center
+}
+
+/* FOR IE */
+* html .darkbluelighting_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-left-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-middle-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/top-right-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/left-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/right-darkblue.png", sizingMethod="scale");
+}
+
+* html .darkbluelighting_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-left-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-middle-darkblue.png", sizingMethod="scale");
+}
+
+* html darkbluelighting_se, * html .darkbluelighting_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/bottom-right-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-close-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-minimize-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_maximize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/lighting/button-maximize-darkblue.png", sizingMethod="crop");
+}
+
+* html .darkbluelighting_content {
+	background:#020EBA;
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
index 36ea182e7..92248c665 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/lighting/pngbehavior.htc
@@ -1,67 +1,67 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script type="text/javascript">
-
-// IE5.5+ PNG Alpha Fix v1.0RC4
-// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the CC-GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-
-
-// This must be a path to a blank image. That's all the configuration you need.
-if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
-
-
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m)
-{
- if (filters[f])
- {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- }
- else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix()
-{           
-  alert('ok')
-  
- // Assume IE7 is OK.
- if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- var bgImg = currentStyle.backgroundImage || style.backgroundImage;
-
- if (tagName == 'IMG')
- {
-  if ((/\.png$/i).test(src))
-  {
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   filt(src, 'scale');
-   src = blankImg;
-  }
-  else if (src.indexOf(blankImg) < 0) filt();
- }
- else if (bgImg && bgImg != 'none')
- {
-  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
-  {
-   var s = RegExp.$1;
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   style.backgroundImage = 'none';
-   filt(s, 'crop');
-   // IE link fix.
-   for (var n = 0; n < childNodes.length; n++)
-    if (childNodes[n].style) childNodes[n].style.position = 'relative';
-  }
-  else filt();
- }
-}
-
-doFix();
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0RC4
+// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the CC-GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+
+// This must be a path to a blank image. That's all the configuration you need.
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m)
+{
+ if (filters[f])
+ {
+  filters[f].enabled = s ? true : false;
+  if (s) with (filters[f]) { src = s; sizingMethod = m }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix()
+{           
+  alert('ok')
+  
+ // Assume IE7 is OK.
+ if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
+  (event && !/(background|src)/.test(event.propertyName))) return;
+
+ var bgImg = currentStyle.backgroundImage || style.backgroundImage;
+
+ if (tagName == 'IMG')
+ {
+  if ((/\.png$/i).test(src))
+  {
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   filt(src, 'scale');
+   src = blankImg;
+  }
+  else if (src.indexOf(blankImg) < 0) filt();
+ }
+ else if (bgImg && bgImg != 'none')
+ {
+  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
+  {
+   var s = RegExp.$1;
+   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+    style.width = offsetWidth + 'px';
+   style.backgroundImage = 'none';
+   filt(s, 'crop');
+   // IE link fix.
+   for (var n = 0; n < childNodes.length; n++)
+    if (childNodes[n].style) childNodes[n].style.position = 'relative';
+  }
+  else filt();
+ }
+}
+
+doFix();
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
index 24751f868..fdff45d8e 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
@@ -1,333 +1,333 @@
-/* Focused windows */
-.overlay_mac_os_x {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.mac_os_x_nw {
-	background: transparent url(mac_os_x/TL_Main.png) no-repeat 0 0;			
-  width:24px;
-  height:30px;
-}
-
-.mac_os_x_n {
-  background: transparent url(mac_os_x/T_Main.png) repeat-x 0 0;			
-  height:30px;
-}
-
-.mac_os_x_ne {
-  background: transparent url(mac_os_x/TR_Main.png) no-repeat 0 0;			
-  width:31px;	  
-  height:30px;
-}
-
-.mac_os_x_w {
-  background: transparent url(mac_os_x/L_Main.png) repeat-y top left;			
-  width:16px;
-}
-
-.mac_os_x_e {
-  background: transparent url(mac_os_x/R_Main.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.mac_os_x_sw {
-  background: transparent url(mac_os_x/BL_Main.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_s {
-  background: transparent url(mac_os_x/B_Main.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.mac_os_x_se, .mac_os_x_sizer {
-  background: transparent url(mac_os_x/BR_Main.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_sizer {
-	cursor:se-resize;	
-}
-
-.mac_os_x_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:8px;
-	width:100%;
-	color:#000;
-}
-
-.mac_os_x_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#FFF;
-}
-.mac_os_x_s .status_bar {
-  padding-bottom:24px;
-}
-
-/* FOR IE */
-* html .mac_os_x_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
-}
-
-
-/* Focused windows */
-.overlay_blur_os_x {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.blur_os_x_nw {
-	background: transparent url(mac_os_x/TL.png) no-repeat 0 0;			
-  width:24px;
-  height:30px;
-}
-
-.blur_os_x_n {
-  background: transparent url(mac_os_x/T.png) repeat-x 0 0;			
-  height:30px;
-}
-
-.blur_os_x_ne {
-  background: transparent url(mac_os_x/TR.png) no-repeat 0 0;			
-  width:31px;	  
-  height:30px;
-}
-
-.blur_os_x_w {
-  background: transparent url(mac_os_x/L.png) repeat-y top left;			
-  width:16px;
-}
-
-.blur_os_x_e {
-  background: transparent url(mac_os_x/R.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.blur_os_x_sw {
-  background: transparent url(mac_os_x/BL.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.blur_os_x_s {
-  background: transparent url(mac_os_x/B.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.blur_os_x_se, .blur_os_x_sizer {
-  background: transparent url(mac_os_x/BR.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.blur_os_x_sizer {
-	cursor:se-resize;	
-}
-
-.blur_os_x_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.blur_os_x_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:8px;
-	width:100%;
-	color:#000;
-}
-
-.blur_os_x_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#FFF;
-}
-.blur_os_x_s .status_bar {
-  padding-bottom:24px;
-}
-
-/* FOR IE */
-* html .blur_os_x_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
-}
-
-* html .blur_os_x_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
-}
-
-* html .blur_os_x_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
-}
-
+/* Focused windows */
+.overlay_mac_os_x {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.mac_os_x_nw {
+	background: transparent url(mac_os_x/TL_Main.png) no-repeat 0 0;			
+  width:24px;
+  height:30px;
+}
+
+.mac_os_x_n {
+  background: transparent url(mac_os_x/T_Main.png) repeat-x 0 0;			
+  height:30px;
+}
+
+.mac_os_x_ne {
+  background: transparent url(mac_os_x/TR_Main.png) no-repeat 0 0;			
+  width:31px;	  
+  height:30px;
+}
+
+.mac_os_x_w {
+  background: transparent url(mac_os_x/L_Main.png) repeat-y top left;			
+  width:16px;
+}
+
+.mac_os_x_e {
+  background: transparent url(mac_os_x/R_Main.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.mac_os_x_sw {
+  background: transparent url(mac_os_x/BL_Main.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_s {
+  background: transparent url(mac_os_x/B_Main.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.mac_os_x_se, .mac_os_x_sizer {
+  background: transparent url(mac_os_x/BR_Main.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_sizer {
+	cursor:se-resize;	
+}
+
+.mac_os_x_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:8px;
+	width:100%;
+	color:#000;
+}
+
+.mac_os_x_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#FFF;
+}
+.mac_os_x_s .status_bar {
+  padding-bottom:24px;
+}
+
+/* FOR IE */
+* html .mac_os_x_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
+}
+
+
+/* Focused windows */
+.overlay_blur_os_x {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.blur_os_x_nw {
+	background: transparent url(mac_os_x/TL.png) no-repeat 0 0;			
+  width:24px;
+  height:30px;
+}
+
+.blur_os_x_n {
+  background: transparent url(mac_os_x/T.png) repeat-x 0 0;			
+  height:30px;
+}
+
+.blur_os_x_ne {
+  background: transparent url(mac_os_x/TR.png) no-repeat 0 0;			
+  width:31px;	  
+  height:30px;
+}
+
+.blur_os_x_w {
+  background: transparent url(mac_os_x/L.png) repeat-y top left;			
+  width:16px;
+}
+
+.blur_os_x_e {
+  background: transparent url(mac_os_x/R.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.blur_os_x_sw {
+  background: transparent url(mac_os_x/BL.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.blur_os_x_s {
+  background: transparent url(mac_os_x/B.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.blur_os_x_se, .blur_os_x_sizer {
+  background: transparent url(mac_os_x/BR.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.blur_os_x_sizer {
+	cursor:se-resize;	
+}
+
+.blur_os_x_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.blur_os_x_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:8px;
+	width:100%;
+	color:#000;
+}
+
+.blur_os_x_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#FFF;
+}
+.blur_os_x_s .status_bar {
+  padding-bottom:24px;
+}
+
+/* FOR IE */
+* html .blur_os_x_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
+}
+
+* html .blur_os_x_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
+}
+
+* html .blur_os_x_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
index e663e3c5e..4c89f602d 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
@@ -1,160 +1,160 @@
-.overlay_mac_os_x_dialog {
-	background-color: #FF7224;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.mac_os_x_dialog_nw {
-  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
-  width:16px;
-  height:16px;
-}
-
-.mac_os_x_dialog_n {
-	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
-  height:18px;
-}
-
-.mac_os_x_dialog_ne {
-  background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
-  width:16px;
-  height:16px;
-}
-
-.mac_os_x_dialog_w {
-  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
-  width:16px;
-}
-
-.mac_os_x_dialog_e {
-  background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.mac_os_x_dialog_sw {
-  background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_dialog_s {
-  background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
-  background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_dialog_sizer {
-	cursor:se-resize;	
-}
-
-.mac_os_x_dialog_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:6px;
-	width:100%;
-	color:#000;
-}
-
-.mac_os_x_dialog_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
-}
-
-.mac_os_x_dialog_buttons {
-  text-align: center;
-}
-/* FOR IE */
-* html .mac_os_x_dialog_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-
-* html .mac_os_x_dialog_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
+.overlay_mac_os_x_dialog {
+	background-color: #FF7224;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.mac_os_x_dialog_nw {
+  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
+  width:16px;
+  height:16px;
+}
+
+.mac_os_x_dialog_n {
+	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
+  height:18px;
+}
+
+.mac_os_x_dialog_ne {
+  background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
+  width:16px;
+  height:16px;
+}
+
+.mac_os_x_dialog_w {
+  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
+  width:16px;
+}
+
+.mac_os_x_dialog_e {
+  background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.mac_os_x_dialog_sw {
+  background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_dialog_s {
+  background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
+  background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_dialog_sizer {
+	cursor:se-resize;	
+}
+
+.mac_os_x_dialog_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:6px;
+	width:100%;
+	color:#000;
+}
+
+.mac_os_x_dialog_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
+}
+
+.mac_os_x_dialog_buttons {
+  text-align: center;
+}
+/* FOR IE */
+* html .mac_os_x_dialog_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
+}
+
+
+* html .mac_os_x_dialog_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_dialog_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_dialog_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
index 2c439bd00..e2700e5b7 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
@@ -1,164 +1,164 @@
-.overlay_nuncio img { border: none; }
-
-.overlay_nuncio {
-	background-color: #666666;
-}
-
-.nuncio_nw {
-	width: 12px;
-	height: 28px;
-	background: url(nuncio/top_left.png) no-repeat;		
-}
-
-.nuncio_n {
-	background: url(nuncio/top_mid.png) repeat-x;
-	height: 28px;
-}
-
-.nuncio_ne {
-	width: 21px;
-	height: 28px;
-	background: url(nuncio/top_right.png) no-repeat;		
-}
-
-.nuncio_e {
-	width: 21px;
-	background: url(nuncio/center_right.png)  repeat-y top right;		
-}
-
-.nuncio_w {
-	width: 12px;
-	background: url(nuncio/center_left.png) repeat-y top left;			
-}
-
-.nuncio_sw {
-	width: 12px;
-	height: 18px;
-	background: url(nuncio/bottom_left.png) no-repeat;			
-}
-
-.nuncio_s {
-	background: url(nuncio/bottom_mid.png) repeat-x 0 0;				
-	height: 18px;
-}
-
-.nuncio_se, .nuncio_sizer {
-	width: 21px;
-	height: 18px;
-	background: url(nuncio/bottom_right.png) no-repeat;			
-}
-
-.nuncio_close {
-	width: 14px;
-	height: 14px;
-	background: url(nuncio/close.png) no-repeat;			
-	position:absolute;
-	top:10px;
-	right:22px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.nuncio_minimize {
-	width: 14px;
-	height: 15px;
-	background: url(nuncio/minimize.png) no-repeat;			
-	position:absolute;
-	top:10px;
-	right:40px;
-	cursor:pointer;
-	z-index:2000;
-}
-
-.nuncio_title {
-	float:left;
-	font-size:11px;
-	font-weight: bold;
-	font-style: italic;
-	color: #fff;
-	width: 100%
-}
-
-.nuncio_content {
-	background: url(nuncio/overlay.png) repeat;
-	overflow:auto;
-	color: #ddd;
-	font-family: Tahoma, Arial, "sans-serif";
-	font-size: 10px;
-}
-
-.nuncio_sizer {
-	cursor:se-resize;	
-}
-
-
-.top_draggable, .bottom_draggable {
-  cursor:move
-}
-/* FOR IE */
-* html .nuncio_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
-}
-
-* html .nuncio_n {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
-}
-
-* html .nuncio_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
-}
-
-* html .nuncio_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
-}
-
-* html .nuncio_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
-}
-
-* html .nuncio_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
-}
-
-* html .nuncio_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
-}
-
-* html .nuncio_close {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
-}
-
-* html .nuncio_minimize {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
-}
-
+.overlay_nuncio img { border: none; }
+
+.overlay_nuncio {
+	background-color: #666666;
+}
+
+.nuncio_nw {
+	width: 12px;
+	height: 28px;
+	background: url(nuncio/top_left.png) no-repeat;		
+}
+
+.nuncio_n {
+	background: url(nuncio/top_mid.png) repeat-x;
+	height: 28px;
+}
+
+.nuncio_ne {
+	width: 21px;
+	height: 28px;
+	background: url(nuncio/top_right.png) no-repeat;		
+}
+
+.nuncio_e {
+	width: 21px;
+	background: url(nuncio/center_right.png)  repeat-y top right;		
+}
+
+.nuncio_w {
+	width: 12px;
+	background: url(nuncio/center_left.png) repeat-y top left;			
+}
+
+.nuncio_sw {
+	width: 12px;
+	height: 18px;
+	background: url(nuncio/bottom_left.png) no-repeat;			
+}
+
+.nuncio_s {
+	background: url(nuncio/bottom_mid.png) repeat-x 0 0;				
+	height: 18px;
+}
+
+.nuncio_se, .nuncio_sizer {
+	width: 21px;
+	height: 18px;
+	background: url(nuncio/bottom_right.png) no-repeat;			
+}
+
+.nuncio_close {
+	width: 14px;
+	height: 14px;
+	background: url(nuncio/close.png) no-repeat;			
+	position:absolute;
+	top:10px;
+	right:22px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.nuncio_minimize {
+	width: 14px;
+	height: 15px;
+	background: url(nuncio/minimize.png) no-repeat;			
+	position:absolute;
+	top:10px;
+	right:40px;
+	cursor:pointer;
+	z-index:2000;
+}
+
+.nuncio_title {
+	float:left;
+	font-size:11px;
+	font-weight: bold;
+	font-style: italic;
+	color: #fff;
+	width: 100%
+}
+
+.nuncio_content {
+	background: url(nuncio/overlay.png) repeat;
+	overflow:auto;
+	color: #ddd;
+	font-family: Tahoma, Arial, "sans-serif";
+	font-size: 10px;
+}
+
+.nuncio_sizer {
+	cursor:se-resize;	
+}
+
+
+.top_draggable, .bottom_draggable {
+  cursor:move
+}
+/* FOR IE */
+* html .nuncio_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
+}
+
+* html .nuncio_n {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
+}
+
+* html .nuncio_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
+}
+
+* html .nuncio_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
+}
+
+* html .nuncio_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
+}
+
+* html .nuncio_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
+}
+
+* html .nuncio_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
+}
+
+* html .nuncio_close {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
+}
+
+* html .nuncio_minimize {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
+}
+
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
index 9bda2a68d..d7d722e8a 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
@@ -1,108 +1,108 @@
-.overlay_spread {
-	background-color: #85BBEF;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.spread_nw {
-	background: transparent url(spread/left-top.gif) no-repeat 0 0;			
-  width:10px;
-  height:25px;
-}
-
-.spread_n {
-  background: transparent url(spread/top-middle.gif) repeat-x 0 0;			
-  height:25px;
-}
-
-.spread_ne {
-  background: transparent url(spread/right-top.gif) no-repeat 0 0;			
-  width:10px;	  
-  height:25px;
-}
-
-.spread_w {
-  background: transparent url(spread/frame-left.gif) repeat-y top left;			
-  width:7px;
-}
-
-.spread_e {
-  background: transparent url(spread/frame-right.gif) repeat-y top right;			
-  width:7px;	  
-}
-
-.spread_sw {
-  background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.spread_s  {
-  background: transparent url(spread/bottom-middle.gif) repeat-x 0 0;			
-  height:7px;
-}
-
-.spread_se, .spread_sizer {
-  background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0;			
-  width:7px;
-  height:7px;
-}
-
-.spread_sizer {
-	cursor:se-resize;	
-}
-
-.spread_close {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-close-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:11px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_minimize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-min-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:55px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_maximize {
-	width: 23px;
-	height: 23px;
-	background: transparent url(spread/button-max-focus.gif) no-repeat 0 0;			
-	position:absolute;
-	top:0px;
-	right:33px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.spread_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:14px;
-	font-weight:bold;
-	text-align:left;
-	margin-top:2px;
-	width:100%;
-	color:#E47211;
-}
-
-.spread_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background:#A9EA00;
-}
-
+.overlay_spread {
+	background-color: #85BBEF;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.spread_nw {
+	background: transparent url(spread/left-top.gif) no-repeat 0 0;			
+  width:10px;
+  height:25px;
+}
+
+.spread_n {
+  background: transparent url(spread/top-middle.gif) repeat-x 0 0;			
+  height:25px;
+}
+
+.spread_ne {
+  background: transparent url(spread/right-top.gif) no-repeat 0 0;			
+  width:10px;	  
+  height:25px;
+}
+
+.spread_w {
+  background: transparent url(spread/frame-left.gif) repeat-y top left;			
+  width:7px;
+}
+
+.spread_e {
+  background: transparent url(spread/frame-right.gif) repeat-y top right;			
+  width:7px;	  
+}
+
+.spread_sw {
+  background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.spread_s  {
+  background: transparent url(spread/bottom-middle.gif) repeat-x 0 0;			
+  height:7px;
+}
+
+.spread_se, .spread_sizer {
+  background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0;			
+  width:7px;
+  height:7px;
+}
+
+.spread_sizer {
+	cursor:se-resize;	
+}
+
+.spread_close {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-close-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:11px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_minimize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-min-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:55px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_maximize {
+	width: 23px;
+	height: 23px;
+	background: transparent url(spread/button-max-focus.gif) no-repeat 0 0;			
+	position:absolute;
+	top:0px;
+	right:33px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.spread_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:14px;
+	font-weight:bold;
+	text-align:left;
+	margin-top:2px;
+	width:100%;
+	color:#E47211;
+}
+
+.spread_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background:#A9EA00;
+}
+
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index be23fffec..af22d6306 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -51,14 +51,22 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .hworkTip em {display:block; border-width:8px; position:absolute; bottom:4px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;}
 .hworkTip span {display:block; border-width:8px; position:absolute; bottom:4px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;}
 .hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;}
-.hworkList80 {width:80px; text-align:center;}
+.hworkList30 {width:30px; text-align:center;}
 .hworkList50 {width:50px; text-align:center;}
+.hworkList60 {width:60px; text-align:center;}
+.hworkList80 {width:80px; text-align:center;}
+.hworkList90 {width:90px; text-align:center;}
+.hworkList100 {width:100px; text-align:center;}
 .hworkList130 {width:130px; text-align:center;}
+.hworkList160 {width:160px; text-align:center;}
+.hworkList260 {width:260px; text-align:left;}
 .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px;  width:714px; margin-bottom:10px; }
-.hworkName {width:115px; float:left; line-height:18px;}
-.hworkName div{max-height: 40px;overflow: hidden;}
-.hworkStName {width:60px; max-width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
-.hworkStID {width:80px; max-width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
+.hworkName {width:80px; float:left; line-height:18px;}
+.hworkName div{max-height: 36px;overflow: hidden;}
+.hworkStName {width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkStName100 {width:100px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkStID {width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
+.hworkStID90 {width:90px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .hworkDate {max-width:150px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:14px; line-height:14px; font-size:12px; color:#888888;}
 .hworkMenu {width:100px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-110px; font-size:12px; color:#888888; display:none; line-height:2; z-index:99;}
 a.hworkExport {background:url(../images/homepage_icon2.png) -10px -401px no-repeat; padding-left:23px;}
@@ -79,12 +87,14 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: left;height: 40px;}
 .width385{width: 385px;}
 .width505{width: 505px;}
+.width130{width: 130px;}
 .width165{width: 165px;}
 .width180{width: 180px;}
 .width525{width: 525px;}
 .width285{width: 285px;}
 .width255{width: 255px;}
 .width530{width: 530px;}
+.ml18 {margin-left:18px;}
 .mr95{margin-right: 95px;}
 .mr140 {margin-right: 140px;}
 .ml100{margin-left: 100px;}
@@ -124,14 +134,19 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostDes {float:left; width:655px; margin-left:15px;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;}
 .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;}
+.homepagePostTitle td,.homepagePostTitle tr {border: 1px solid; border-color: inherit;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
 .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
+
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
-.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
+.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
 div.minHeight48{min-height: 48px;}
@@ -166,6 +181,9 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
+.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
@@ -434,8 +452,8 @@ span.author { font-size: 0.9em; color: #888; }
 .bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px;  }
 .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999;  }
 .hwork_txt{ width:560px; padding-left:5px; background:#fff;}
-a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;}
-a:hover.tijiao{ background:#0f99a9;}
+a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:10px;}
+a:hover.tijiao{ background:#297fb8;}
 .members_left{ float:left; width:410px;  margin-right:20px; text-align:center;}
 .members_left{}
 .members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4;  width:410px; padding-top:10px; }
@@ -497,8 +515,8 @@ a.xls{ margin-left:5px; color:#136b3b;}
 .ni_con p{ color:#808181; }
 .ni_con a:hover{ text-decoration:none;}
 .ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
-a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
-a:hover.tijiao{ background:#0f99a9;}
+a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:15px;}
+a:hover.tijiao{ background:#297fb8;}
 .c_pink{ color:#e65d5e;}
 .ni_con_work { width:300px; margin:25px 20px;}
 .ni_con_work p{ color:#808181; }
@@ -1105,6 +1123,9 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .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;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 20px;}
+.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .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;}
@@ -1223,7 +1244,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .ml7 {margin-left:7px;}
 .tac {text-align:center;}
 .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
-.hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
+.hworkPrName {width:160px; max-width:160px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;}
 .mr150 {margin-right:150px;}
 .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
 .captainName {max-width:75px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
@@ -1296,6 +1317,48 @@ a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: no
 /*20160310分班样式*/
 .select-class-option {width:125px;}
 
+/* 作业二级回复 */
+.clearfix:after { content:"."; display:block; height:0; visibility:hidden; clear:both; }
+.clearfix { zoom:1; }
+.clearit { clear:both; height:0; font-size:0; overflow:hidden; }
+.comment_item{ width:720px; background-color:#f1f1f1; color:#888;}
+.comment_top{ height:15px;    border: 1px solid #e4e4e4; padding:10px; position:relative;}
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.fl{ float:left;}
+.fr{ float:right;}
+.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
+.J_Comment_Face img{ width:40px; height:40px; }
+.t_content{ width:92%; margin-left:15px;}
+a.content-username { color:#269ac9; font-size:14px; margin-right:15px;}
+a.content-username:hover{ color:#297fb8;}
+.orig_user img{width:32px; height:32px;}
+.reply-right{ float:right; position:relative;}
+.reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.comment_orig_content{margin:10px 0; color:#999;}
+.comment_orig_content .comment_orig_content{margin-top:0;}
+.orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px;}
+.orig_cont_sub{ border-top:0}
+.orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
+.orig_user{ margin:10px 15px 10px 5px;}
+.orig_user span{ color:#999; padding-right:5px;}
+.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
+.orig_right{ width:80%; margin-top:5px;}
+a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
+a:hover.comment_ding_link{ color:#269ac9;}
+.comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
+.comment_ding_link em{font-style: normal;font-family: arial;}
+.comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
+.comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
+.comment_content{ color:#333;}
+.t_txt{ margin-top:10px;}
+.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_textarea{width:90%;  margin-bottom:10px;}
+.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
+.orig_sub:hover{ background:#297fb8;}
+.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
+
+
 /* 代码查重弹框 */
 a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.Blue-btn{ background:#3598db; color:#fff;}
@@ -1334,3 +1397,4 @@ a.pages-big{ width:50px;}
 
 .red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 09319ff65..44e64e9ab 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -75,6 +75,8 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml24{margin-left:24px;}
+.ml25{margin-left:25px;}
 .ml36{ margin-left:36px; }
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
@@ -425,7 +427,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; }
 a.sendButtonBlue {color:#269ac9;}
 a.sendButtonBlue:hover {color:#ffffff;}
-.resourcesSelectSendButton:hover {background-color:#297fb8;}
 .db {display:block !important;}
 
 .dropdown-menu {
@@ -596,10 +597,11 @@ a.projectsLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageLeftMenuHideIcon {background:url(../images/homepage_icon.png) -74px -220px no-repeat;display:block; height:18px;}
+.homepageLeftMenuHideIcon {background:url(../images/homepage_icon.png) 100px -624px no-repeat;display:block; height:18px;}
 .homepageMenuSetting {display:inline-block; background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
 .homepageMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
+a.homepageMenuControl {float:left; width:180px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
 .homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
@@ -618,6 +620,8 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageSystenMessageContent {width:281px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContent {width:235px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageHomeworkContentWarn2 {width:60px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageHomeworkContent2 {width:285px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
@@ -674,6 +678,11 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
+.homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.borderBottomNone {border-bottom:none !important;}
+.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
 .borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
@@ -708,6 +717,8 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family:"微软雅黑","宋体";}
+.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
+.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
@@ -1225,8 +1236,8 @@ blockquote {
 .bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px;  }
 .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999;  }
 .hwork_txt{ width:560px; padding-left:5px; background:#fff;}
-a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;}
-a:hover.tijiao{ background:#0f99a9;}
+a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:10px;}
+a:hover.tijiao{ background:#297fb8;}
 .members_left{ float:left; width:410px;  margin-right:20px; text-align:center;}
 .members_left{}
 .members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4;  width:410px; padding-top:10px; }
@@ -1494,6 +1505,53 @@ a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../i
 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;}
 
+.green_btn_share{ background:#28be6c; padding:2px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
+
+/* 作业二级回复 */
+.clearfix:after { content:"."; display:block; height:0; visibility:hidden; clear:both; }
+.clearfix { zoom:1; }
+.clearit { clear:both; height:0; font-size:0; overflow:hidden; }
+.comment_item{ width:720px; background-color:#f1f1f1; color:#888;}
+.comment_top{ height:15px;    border: 1px solid #e4e4e4; padding:10px; position:relative;}
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.fl{ float:left;}
+.fr{ float:right;}
+.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
+.J_Comment_Face img{ width:40px; height:40px; }
+.t_content{ width:92%; margin-left:15px;}
+a.content-username { color:#269ac9; font-size:14px; margin-right:15px;}
+a.content-username:hover{ color:#297fb8;}
+.orig_user img{width:32px; height:32px;}
+.reply-right{ float:right; position:relative;}
+.reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.comment_orig_content{margin:10px 0; color:#999;}
+.comment_orig_content .comment_orig_content{margin-top:0;}
+.orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px;}
+.orig_cont_sub{ border-top:0}
+.orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
+.orig_user{ margin:10px 15px 10px 5px;}
+.orig_user span{ color:#999; padding-right:5px;}
+.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
+.orig_right{ width:80%; margin-top:5px;}
+a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
+a:hover.comment_ding_link{ color:#269ac9;}
+.comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
+.comment_ding_link em{font-style: normal;font-family: arial;}
+.comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
+.comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
+.comment_content{ color:#333;}
+.t_txt{ margin-top:10px;}
+.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_textarea{width:90%;  margin-bottom:10px;}
+.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
+.orig_sub:hover{ background:#297fb8;}
+.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
+
+.likeText{color: #7f7f7f}
+.likeNum{color: #7f7f7f}
+
 /* 代码查重弹框 */
 a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.Blue-btn{ background:#3598db; color:#fff;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 3a203c10d..abfeaef85 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -16,13 +16,15 @@
 .orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;}
 .w607 {width:607px;}
 .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
-a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;}
+a.saveBtn {padding:2px 10px; background-color:#269ac9; color:#ffffff;}
 a.saveBtn:hover {background-color:#297fb8;}
 .orgMemberList {width:480px; float:left;}
-.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
-.orgListUser {width:85px; float:left;}
+.orgColumnList {width:688px; float:left;}
+.orgListUser {width:110px; float:left;padding-right: 10px;}
 .orgListRole {width:180px; float:left;}
-.orgOrder {width:30px; float:left;margin-right:10px;text-align:center;}
+.orgOrder {width:70px; float:left; text-align:center;}
+.orgSubNum {width:30px; float:left; text-align:center;}
+.subNumBlock {cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; height:17px; line-height:17px; margin:7px 0; vertical-align:middle;}
 .orgMemContainer {width:208px;}
 .orgMemberAdd {float:right;}
 .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
@@ -67,7 +69,9 @@ a.org-cancel-btn:hover {background-color:#717171; color:#ffffff;}
 a.linkGrey8 {color:#888888;}
 a.linkGrey8:hover {color:#585858;}
 .orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;}
-.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;}
+.orgListRow {border-bottom:1px solid #e4e4e4; padding:5px 0; color:#555555; line-height:21px;}
+.orgSubList {height:31px; line-height:31px; vertical-align:middle; color:#555555;}
+.orgListBg {background-color:#eaebec;}
 .orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
@@ -75,8 +79,15 @@ a.linkGrey8:hover {color:#585858;}
 #orgUserName {display:inline-block;}
 .org_login_list a {color:#269ac9;}
 
-.orgListStatus {width:40px; float:left;}
-.orgListStatusList {width:58px; float:left;}
+.orgListStatus, .orgSubStatus {width:55px; float:left;}
+.orgListStatusList, .orgSubOrder {width:90px; float:left;}
+.orgListType, .orgSubType {width:55px; float:left;}
+.orgListCatalog, .orgSubCatalog {width:75px; float:left;}
+.orgListOperation, .orgSubOperation {width:223px; float:left; text-align:right;}
+.orgSubTree {width:20px; height:31px; background:url(/images/org_tree.png) 0 0 no-repeat; float:left; margin-left:30px;}
+.orgSubTree2 {width:20px; height:31px; background:url(/images/org_tree.png) 0 -45px no-repeat; float:left; margin-left:30px;}
+.orgSubColumn {width:100px; float:left;}
+.subColumnControl {width:90px; max-width:90px; margin-right:10px; float:left; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
 .personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;}
 .reCon{ margin:5px; width:710px;}
 .retop{width:710px; height:40px; background:#eaeaea; padding:5px;}
@@ -148,4 +159,22 @@ a.blue-btn {
     background-color: #269ac9;
     cursor: pointer;
     text-align: center;
-}
\ No newline at end of file
+}
+
+/*名师榜20160505*/
+.function-row {border-bottom:1px dashed #b2b2b2; padding-bottom:16px;}
+.teacher-list-search {width:310px; height:23px; border:1px solid #ccc; border-right:none; outline:none;}
+.teacher-search-icon {background:url(../images/search.png) 0 3px no-repeat; width:25px; height:25px; border:1px solid #ccc; border-left:none; cursor:pointer;}
+.teacher-search-type {width:84px; height:23px; border:1px solid #ccc; outline:none;}
+.teacher-list-row {border-bottom:1px dashed #b2b2b2; padding:18px 0;}
+.teacher-avatar {float:left;}
+.teacher-name {font-size:18px; color:#333; margin-right:15px;}
+.teacher-social-block {width:90px; float:left; text-align:center;}
+.block-num {font-size:16px; color:#000;}
+.block-title {font-size:12px; color:#999;}
+.block-slice {width:1px; height:40px; background-color:#e0e0e0; float:left; margin-top:3px;}
+.teacher-intro {font-size:13px; color:#999; line-height:24px; height:72px; overflow:hidden;}
+a.teacher-select {font-size:13px; color:#fff; padding:3px 18px; background-color:#269ac9;}
+a.teacher-select:hover {background-color:#297fb8;}
+a.follow-button {font-size:13px; color:#272727; padding:3px 5px; background-color:#f2efef;}
+a.follow-button:hover {background-color:#c1c1c1;}
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index 7c0b9f84a..c2cf0a478 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 /* CSS Document */
 /* 样式重置 */
 body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
@@ -13,6 +14,7 @@ a:hover,a:active{color:#24366e;}
 .sn-cl {clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
 .sn-container {width:100%; background-color:#fff;}
 .sn-p-absolute {position:absolute;}
+.sn-p-relative {position:relative;}
 .sn-grey-opacity {background:rgba(230, 230, 230, 0.9)!important; filter:Alpha(opacity=90); background:#e6e6e6;}
 .sn-border {border-top:1px solid #dfdfdf; border-bottom:1px solid #dfdfdf;}
 /* 公共 */
@@ -31,7 +33,7 @@ a:hover,a:active{color:#24366e;}
 .sn-font-grey3 {color:#999;}
 a.sn-link-blue {color:#24366e;}
 a.sn-link-white {color:#fff;}
-a.sn-link-grey {color:#999;}
+a.sn-link-grey {color:#666;}
 a.sn-link-grey:hover {color:#24366e;}
 a.sn-link-grey2 {color:#888;}
 a.sn-link-select {color:#809df9;}
@@ -46,10 +48,13 @@ a.sn-link-select {color:#809df9;}
 .sn-mt13 {margin-top:13px;}
 .sn-mt15 {margin-top:15px;}
 .sn-mt28 {margin-top:28px;}
+.sn-mb20 {margin-bottom:20px;}
 .sn-mb40 {margin-bottom:40px;}
 .sn-ml15 {margin-left:15px;}
+.sn-ml20 {margin-left:20px;}
 .sn-ml55 {margin-left:55px;}
 .sn-mr0 {margin-right:0px !important;}
+.sn-mr20 {margin-right:20px;}
 .sn-mr50 {margin-right:50px;}
 .sn-w229 {width:229px;}
 /*头部样式*/
@@ -61,19 +66,22 @@ a.sn-link-select {color:#809df9;}
 .sn-bg-blue {background-color:#24366e;}
 .sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
 .sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
-.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;}
+.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;}
 .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;}
 a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}
-.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1;}
-.sn-nav li {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
-.sn-nav li a {display:inline-block; padding:8px 6px; border-radius:5px;}
-.sn-nav li a:hover {background-color:#809df9;}
+.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; line-height:1; overflow:hidden;}
+.nav-element-default, .nav-element {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
+.nav-element-default a, .nav-element a  {display:inline-block; padding:8px 6px; border-radius:5px;}
+.nav-element-default a:hover, .nav-element a:hover {background-color:#809df9;}
+.sn-subnav-position {position:absolute; left:0; top:55px; z-index:99;}
 .sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;}
 .sn-sub-nav li {color:#999; float:left;}
 .sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;}
 .sn-sub-nav li a:hover {border-bottom:3px solid #ffbd18; height:37px;}
 .sn-subnav-slice {margin:12px 5px;}
 .sn-banner {width:1200px; height:210px; margin:0 auto;}
+.sn-logo-add{ display:block;  top:5px; left:0px; position:absolute;  width:20px; height:20px;background:url(../images/default_blank/icons-add.png) 0px -3px no-repeat;}
+.sn-banner-add{ display:block; position:absolute; top:210px; left:360px;width:27px; height:27px; background:url(../images/default_blank/icons-add.png) -32px -0px no-repeat;}
 .sn-content-position {width:1200px; height:50px; line-height:50px; vertical-align:middle; font-size:14px; color:#888; margin:0 auto;}
 /*footer样式*/
 .sn-footer {width:1200px; height:220px; margin:0 auto; text-align:center; font-size:14px; color:#fff; line-height:normal;}
@@ -119,12 +127,15 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:
 .h2-title a:hover.more{ color:#24366e;}
 .sn-news-bigbox{ padding:0px 26px 0px 18px; margin:18px 0 26px; border-right:1px solid #ebebeb;}
 .sn-news-bigbox a.h3-title{ font-size:18px; width:380px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
-.sn-news-bigbox .sn-news-txt{ width:380px; color:#666;}
+.sn-news-bigbox .sn-news-txt{ width:380px; height:180px; color:#666; overflow:hidden;}
+.sn-news-txt img {width:100%;}
 .sn-news-bigbox .sn-news-bigimg{ width:380px; height:165px;}
 .txt-grey{ color:#999;}
 .sn-news-smallbox{padding:0px 18px 0px 26px; margin:18px 0 26px; width:350px; }
 .sn-news-smallbox .sn-news-smallimg{ width:85px; height:85px; margin-right:10px;}
-.sn-news-smallbox a.h4-title{ font-size:14px; width:255px; float:left;}
+.sn-title-wrap {width:250px; height:62px; line-height: 26px; font-size:14px; overflow:hidden; position: relative;}
+.sn-news-smallbox a.h4-title{}
+.title-ellipsis {width:15px; display:block; bottom:0; right:-4px; position:absolute;}
 /* index-resources */
 .sn-index-resourcescon{ padding-top:12px;background:#f2f2f2;}
 .sn-index-resourcesbox{ padding:10px; background:#f2f2f2; width:185px; float:left;}
@@ -136,22 +147,21 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:
 .resources-tagbox img {max-width: 100%;}
 a.more-btn{ display:block; width:185px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;}
 /* index-partner */
-.sn-index-partnerbox{ padding:25px 30px; }
-.sn-index-partnerbox{ width:775px;}
+.sn-index-partnerbox{width:760px; padding:25px 30px;}
 .sn-index-partnerbox ul li{ height:55px;}
-.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:370px; height:43px; float:left;}
+.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:368px; height:43px; float:left;}
 .partner-btnbox{ width:90px; margin:0 auto;}
 .partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;}
 .partner-btn:hover{ background-color:#172b65;}
 /* index-active */
-.sn-index-activebox{ margin-bottom:20px; background:#fff; padding-bottom:10px;}
+.sn-index-activebox, .sn-teacher-wrap{ margin-bottom:20px; background:#fff; padding-bottom:10px;}
 .active-title{width:330px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
 .sn-index-active{ margin:0px 20px 5px 20px;}
 .sn-index-active a.sn-activeimg{width:330px; height:210px;}
 /* index-wx*/
 .sn-index-wxbox{margin-bottom:20px; background:#fff;}
 .sn-index-wximg{ margin:15px; margin-right:5px;}
-.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;}
+.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px; max-height:64px; overflow:hidden;}
 .sn-index-smallbanner img{ display:block; width:369px; height:169px; }
 
 /* 内页新闻列表 */
@@ -164,15 +174,11 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou
 .sn-inner-newslist a:hover{ color:#24366e;}
 a.sn-newslist-titile{ font-size:15px;width:840px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
 a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;}
-.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; }
-.sn-inner-pages a:hover{  background-color:#24366e; color:#fff;}
-a.sn-inner-pages-big{ width:50px;}
-a.sn-pages-active{  background-color:#24366e; color:#fff;}
-.sn-inner-pages{width:330px; margin:40px auto 100px;}
+
 /* 内页新闻展示 */
 .sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; }
-.sn-inner-pcon{text-indent:2em;}
-.sn-inner-newscon img{ display:block; width:830px; margin:25px auto 5px;}
+.sn-inner-pcon{text-indent:2em; overflow:hidden;}
+.sn-inner-newscon img{ display:block; max-width:830px; margin:25px auto 5px;}
 .sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;}
 .sn-inner-imgp{ color:#000;   text-align:center; margin-bottom:30px;}
 a.sn-newslist-zan{ display:block; background:url(../images/zan.gif) 0 15px no-repeat; width:54px; height:28px; padding-left:12px; color:#999; }
@@ -207,14 +213,108 @@ a.sn-reply-username { color:#24366e; margin-right:15px; }
 .user-img img{border:2px solid #e6473b; }
 .user-img img:hover{border:2px solid #29156f;}
 
+/*组织弹窗*/
+.sn-w300 {width:300px;}
+.org-popup-wrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
+.org-popup-close {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:block; position: absolute; z-index: 1000; right:10px; top:5px;}
 
+/****翻页***/
+/*ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }*/
+/*ul.wlist li{float: left;}*/
+/*ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;}*/
+/*ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}*/
+/*.wlist_select {display:block; font-size:12px; border:1px solid #d1d1d1; color:#24366e; float:left; width:50px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; }*/
+.wlist_select a{background-color: #24366e;cursor: default;width: 30px;}
 
+.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:50px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; }
+.sn-inner-pages a:hover{  background-color:#24366e; color:#fff;}
+a.sn-inner-pages-big{ width:50px;}
+a.sn-pages-active{  background-color:#24366e; color:#fff;}
+.sn-inner-pages{width:330px; margin:40px auto 100px;}
 
+ul.sn-inner-pages{ float:right; border-bottom:none; height:30px; margin-top:20px; }
+ul.sn-inner-pages li{float: left;}
+ul.sn-inner-pages li a{border: 1px solid #d1d1d1;padding: 1px 4px 1px 4px;margin-left: 3px;}
+ul.sn-inner-pages li a:hover{ background-color:#24366e; color:#fff; text-decoration:none;}
+.sn-inner-pages_select { background-color:#24366e; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
+.sn-inner-pages_select a{background-color: #24366e; color: #fff;cursor: default;}
 
+/*名师榜*/
+.sn-teacher-list {margin:0 20px; padding:15px 0; border-bottom:1px solid #e9e9e9;}
+a.sn-teacher-name {width:60px; font-size:18px; color:#777; float:left;}
+.sn-teacher-unit {width:169px; font-size:14px; color:#999; float:left; margin-left:15px; margin-top:3px;}
+.sn-teacher-info {height:30px; line-height:30px; vertical-align:middle; float:left; margin-left:15px;}
+.sn-teacher-social {height:30px; line-height:30px; vertical-align:middle; float:left; color:#999; font-size:12px; margin-left:15px;}
+.sn-border-none {border:none;}
+.sn-teacher-block {width:163px; height:222px; border-right:1px solid #e5e7ec; margin:40px 0 24px 0; float:left;}
+.sn-teacher-avatar2 {margin:0 18px; padding:18px 0;}
+.sn-teacher-info2 {color:#666; text-align:center; font-size:16px;}
+.sn-info2-hidden {width:153px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; margin:0 auto;}
+.sn-avatar-circle {border-radius:50%;}
 
-
-
-
-
-
+/*弹框*/
+.upload_con h2 {
+    display: block;
+    background: #eaeaea;
+    font-size: 14px;
+    color: #343333;
+    height: 31px;
+    width: auto;
+    margin-top: 25px;
+    padding-left: 20px;
+    padding-top: 5px;
+}
+a.blue_btn {
+    background: #64bdd9;
+    color: #fff;
+    font-size: 14px;
+    font-weight: normal;
+    padding: 2px 8px;
+    text-align: center;
+    cursor: pointer;
+}
+a.grey_btn {
+    background: #d9d9d9;
+    color: #656565;
+    font-size: 14px;
+    font-weight: normal;
+    text-align: center;
+    margin-left: 10px;
+    margin-bottom: 10px;
+    padding: 2px 10px;
+}
+span.add_attachment {
+    font-size: 80%;
+    line-height: 2.5em;
+}
+.c_dark {
+    color: #2d2d2d;
+}
+.upload_filename {
+    background: url(../images/pic_file.png) 0 -20px no-repeat;
+    color: #7f7f7f;
+    width: 270px;
+    border: none;
+    padding-left: 20px;
+    margin-right: 10px;
+    margin-bottom: 5px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.profiler-results.profiler-left {
+    left: 0px;
+}
+.profiler-results {
+    z-index: 2147483643;
+    position: fixed;
+    top: 0px;
+}
+.filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
+.ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
+.ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
+.evaluation{position: relative;}
+.evaluation_submit{position: absolute;right: 0px;bottom: 0px;}
+.student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; }
 
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index aae9ceb7c..17977d46a 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -219,7 +219,9 @@ a:hover.talk_btn{ background:#2a9dc1;}
 /****讨论区内页***/
 .mt0{ margin-top:0px;}
 .talk_info{  margin-left:60px; margin-top:10px;}
-.issue_desc li{list-style-type: decimal;margin-left: 20px;}
+/*.issue_desc li{list-style-type: decimal;margin-left: 20px;}*/
+.issue_desc ol li{list-style-type: decimal;margin-left: 20px;}
+.issue_desc ul li{list-style-type: disc;margin-left: 20px;}
 .talk_info img {max-width:100%;}
 a.talk_edit{ color:#426e9a; margin-right:5px;}
 a:hover.talk_edit{ color:#ff5722;}
@@ -969,6 +971,9 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     margin: 10px auto 0px;
     background-color: #F1F1F1;
 }
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
 }
@@ -980,6 +985,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     vertical-align: middle;
     font-size: 12px;
     color: #888;
+    position: relative;
 }
 .homepagePostReplyBannerCount {
     width: 255px;
@@ -1106,6 +1112,9 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .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;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 20px;}
+.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .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;}
@@ -1231,4 +1240,4 @@ a.pages-big{ width:50px;}
 .pages{width:330px; margin:20px auto 10px;}
 
 .red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
\ No newline at end of file
+.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index ac6425b94..643aea8cf 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -87,6 +87,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
 .ml125 { margin-left:125px;}
+.ml200 {margin-left:200px;}
 .ml320{ margin-left:320px;}
 .ml150 { margin-left:150px;}
 .mr-5 {margin-right:-5px;}
@@ -111,6 +112,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mw20{ margin: 0 20px;}
 .mt1{margin-top: 1px;}
 .mt-4 {margin-top:-4px;}
+.mt-10 {margin-top:-10px;}
 .mt0 {margin-top:0px !important;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
@@ -143,7 +145,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w50 {width:50px;}
 .w60{ width:60px;}
 .w70{ width:70px;}
-.w80{ width:80px;}
+.w80{ width:80px !important;}
 .w90{ width:90px;}
 .w100{width: 100px;}
 .w125{width:125px;}
@@ -153,6 +155,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w170{width:170px;}
 .w230{width:230px !important;}
 .w235{ width:235px !important;}
+.w250{ width:250px !important;}
 .w280{ width:280px;}
 .w265{ width: 265px;}
 .w270{ width: 270px;}
@@ -181,6 +184,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .h70{ height:70px;}
 .h150{ height:150px;}
 .p10 {padding-left:10px; padding-right:10px;}
+.mw220 {max-width: 220px !important;}
 .mw360 {max-width: 360px !important;}
 .mw380 {max-width: 380px !important;}
 .mw400 {max-width: 400px !important;}
@@ -599,9 +603,12 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
 .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
-.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
+.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
 .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:15px;}
@@ -632,6 +639,9 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyDes {float:left; width:620px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
+.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}
@@ -920,7 +930,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; }
 a.sendButtonBlue {color:#269ac9;}
 a.sendButtonBlue:hover {color:#ffffff;}
-.resourcesSelectSendButton:hover {background-color:#297fb8;}
 .db {display:block !important;}
 
 .dropdown-menu {
@@ -968,8 +977,8 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
 .AgreementTxt{text-indent:2em; margin-bottom:15px;}
 .AgreementImg{ margin:0px auto;}
 
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type:decimal; margin-left:20px;}
+.list_style ul li{list-style-type:disc; margin-left:20px;}
 
 /* @功能 定义 */
 span.at {color:#269ac9;}
@@ -1140,3 +1149,6 @@ a.program-btn{background: url(../images/homepage_icon.png) -86px -393px no-repea
 /*排序样式*/
 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;}
+
+.likeText{color: #7f7f7f}
+.likeNum{color: #7f7f7f}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index b9f76ffbf..56c867829 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -495,7 +495,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}
 a.sendButtonBlue {color:#15bccf;}
 a.sendButtonBlue:hover {color:#ffffff;}
-.resourcesSelectSendButton:hover {background-color:#15bccf;}
 .db {display:block !important;}
 
 .dropdown-menu {
diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css
index 9e0e07a77..89dc34d7a 100644
--- a/public/stylesheets/repository.css
+++ b/public/stylesheets/repository.css
@@ -287,4 +287,7 @@ li.commit .commit-row-info .committed_ago {
 .rep_history_grey{
     color: #7F7F7F;
 }
-.rep_mail_name{max-width: 150px; overflow: hidden; text-overflow: ellipsis;}
\ No newline at end of file
+.rep_mail_name{max-width: 150px; overflow: hidden; text-overflow: ellipsis;}
+a.btn_zipdown{ display:block; height:25px; width:80px; text-align: center; line-height: 25px;  border: 1px solid #dddddd;   background-image: linear-gradient(#FCFCFC, #EEE);
+    color: #7f7f7f; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; margin-top: 7px; margin-right: 5px;}
+a:hover.btn_zipdown{color:#269ac9;}
\ No newline at end of file
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index fffa7a214..daa66d6bb 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -77,3 +77,6 @@ a.underline {text-decoration:underline;}
 .loading-box {position:absolute; top:50%; background:white; width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;}
 .loading-box img {margin-top: 3px; text-align: center;}
 .loading-box span {display: block; font-size:12px;}
+
+/*帖子锁定样式*/
+.locked_btn_cir {background: url("/images/locked.png") 0 0 no-repeat; cursor: default;}
\ No newline at end of file
diff --git a/spec/controllers/sub_document_comments_controller_spec.rb b/spec/controllers/sub_document_comments_controller_spec.rb
new file mode 100644
index 000000000..53f650132
--- /dev/null
+++ b/spec/controllers/sub_document_comments_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubDocumentCommentsController, :type => :controller do
+
+end
diff --git a/spec/controllers/sub_domains_controller_spec.rb b/spec/controllers/sub_domains_controller_spec.rb
new file mode 100644
index 000000000..99209ba27
--- /dev/null
+++ b/spec/controllers/sub_domains_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubDomainsController, :type => :controller do
+
+end
diff --git a/spec/factories/sub_document_comments.rb b/spec/factories/sub_document_comments.rb
new file mode 100644
index 000000000..61bb4352f
--- /dev/null
+++ b/spec/factories/sub_document_comments.rb
@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :sub_document_comment do
+    content "MyText"
+title "MyText"
+sub_domain_id 1
+creator_id 1
+parent_id 1
+reply_id 1
+locked 1
+sticky 1
+org_subfield_id 1
+  end
+
+end
diff --git a/spec/factories/sub_domains.rb b/spec/factories/sub_domains.rb
new file mode 100644
index 000000000..d99bcdbff
--- /dev/null
+++ b/spec/factories/sub_domains.rb
@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :sub_domain do
+    org_subfield_id 1
+priority 1
+name "MyString"
+field_type "MyString"
+hide 1
+status 1
+  end
+
+end
diff --git a/spec/models/sub_document_comment_spec.rb b/spec/models/sub_document_comment_spec.rb
new file mode 100644
index 000000000..48693951f
--- /dev/null
+++ b/spec/models/sub_document_comment_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubDocumentComment, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/sub_domain_spec.rb b/spec/models/sub_domain_spec.rb
new file mode 100644
index 000000000..2e48b6518
--- /dev/null
+++ b/spec/models/sub_domain_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubDomain, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end