diff --git a/app/assets/javascripts/org_subfields.js.coffee b/app/assets/javascripts/org_subfields.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/org_subfields.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/org_subfields.css.scss b/app/assets/stylesheets/org_subfields.css.scss
new file mode 100644
index 000000000..19263385e
--- /dev/null
+++ b/app/assets/stylesheets/org_subfields.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the org_subfields 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/exercise_controller.rb b/app/controllers/exercise_controller.rb
index a99ab32ec..2a75d0580 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -18,13 +18,13 @@ class ExerciseController < ApplicationController
     end_exercises.each do |exercise|
       exercise.update_column('exercise_status', 3)
     end
-    if @course.is_public == 0 && !User.current.member_of_course?(@course)
+    if @course.is_public == 0 && !(User.current.member_of_course?(@course)||User.current.admin?)
       render_403
       return
     end
     remove_invalid_exercise(@course)
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
-    if @is_teacher
+    if @is_teacher || User.current.admin?
       exercises = @course.exercises.order("created_at asc")
     else
       exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc")
@@ -48,13 +48,13 @@ class ExerciseController < ApplicationController
     end_exercises.each do |exercise|
       exercise.update_column('exercise_status', 3)
     end
-    unless User.current.member_of_course?(@course)
+    unless User.current.member_of_course?(@course) || User.current.admin?
       render_403
       return
     end
     @exercise = Exercise.find params[:id]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    if @exercise.exercise_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?)
+    if @exercise.exercise_status != 2 && (!(User.current.allowed_to?(:as_teacher,@course) || User.current.admin?))
       render_403
       return
     end
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 687ef9503..a8d6dfe8f 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -126,14 +126,33 @@ class HomeworkCommonController < ApplicationController
     if @homework_detail_manual.comment_status == 1
       student_works = @homework.student_works
       if student_works && student_works.size >= 2
-        student_works.each_with_index do |work, index|
-          user = work.user
-          n = @homework_detail_manual.evaluation_num
-          n = n < student_works.size ? n : student_works.size - 1
-          assigned_homeworks = get_assigned_homeworks(student_works, n, index)
-          assigned_homeworks.each do |h|
-            student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
-            student_works_evaluation_distributions.save
+        if @homework.homework_type == 3
+          student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
+          student_work_projects.each_with_index do |pro_work, pro_index|
+            n = @homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            work_index = -1
+            student_works.each_with_index do |stu_work, stu_index|
+              if stu_work.id.to_i == pro_work.student_work_id.to_i
+                work_index = stu_index
+              end
+            end
+            assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
+          end
+        else
+          student_works.each_with_index do |work, index|
+            user = work.user
+            n = @homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
           end
         end
         @homework_detail_manual.update_column('comment_status', 2)
@@ -143,7 +162,8 @@ class HomeworkCommonController < ApplicationController
         Mailer.send_mail_anonymous_comment_open(@homework).deliver
       else
         @statue = 2
-      end
+
+    end
     else
       @statue = 3
     end
@@ -262,6 +282,7 @@ class HomeworkCommonController < ApplicationController
       @user_activity_id = -1
     end
     @is_in_course = params[:is_in_course]
+    @course_activity = params[:course_activity].to_i
   end
 
   private
@@ -276,6 +297,7 @@ class HomeworkCommonController < ApplicationController
     @homework = HomeworkCommon.find params[:id]
     @homework_detail_manual = @homework.homework_detail_manual
     @homework_detail_programing = @homework.homework_detail_programing
+    @homework_detail_group = @homework.homework_detail_group
     @course = @homework.course
   rescue
     render_404
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 9b090de9a..6f173b7c2 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -169,6 +169,11 @@ class MessagesController < ApplicationController
       course_activity.updated_at = Time.now
       course_activity.save
     end
+    forge_activity = ForgeActivity.where("forge_act_type='Message' and forge_act_id=#{@topic.id}").first
+    if forge_activity
+      forge_activity.updated_at = Time.now
+      forge_activity.save
+    end
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
     if user_activity
       user_activity.updated_at = Time.now
diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 02527bdfc..29b728268 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -13,7 +13,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment.content = params[:org_document_comment][:content]
     if @org_document_comment.save
       flash.keep[:notice] = l(:notice_successful_create)
-      OrgActivity
+      EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at)
       redirect_to organization_org_document_comments_path(@organization)
     else
       redirect_to new_org_document_comment_path(:organization_id => @organization.id)
@@ -36,13 +36,18 @@ class OrgDocumentCommentsController < ApplicationController
     if @org_document.parent.nil?
       act  = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first
       act.update_attributes(:updated_at => @org_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
           redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)
         else
-          redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
+          if params[:flag].to_i == 1
+            redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
+          else
+            redirect_to organization_path(@org_document.organization.id)
+          end
         end
       }
     end
@@ -81,10 +86,10 @@ class OrgDocumentCommentsController < ApplicationController
   def destroy
     @org_document_comment = OrgDocumentComment.find(params[:id])
     org = @org_document_comment.organization
+    if @org_document_comment.id == org.home_id
+      org.update_attributes(:home_id => nil)
+    end
     if @org_document_comment.destroy
-      if @org_document_comment.id == org.id
-        org.home_id == nil
-      end
     end
     respond_to do |format|
       format.js
diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
new file mode 100644
index 000000000..6fdf0ae40
--- /dev/null
+++ b/app/controllers/org_subfields_controller.rb
@@ -0,0 +1,20 @@
+class OrgSubfieldsController < ApplicationController
+  def create
+    @subfield = OrgSubfield.create(:name => params[:name])
+    @organization = Organization.find(params[:organization_id])
+    @organization.org_subfields << @subfield
+    @subfield.update_attributes(:priority => @subfield.id)
+  end
+
+  def destroy
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.destroy
+  end
+
+  def update
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.update_attributes(:name => params[:name])
+  end
+end
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index b326051e6..85f57917b 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -37,6 +37,19 @@ class OrganizationsController < ApplicationController
     @organization = Organization.new
     render :layout => 'new_base'
   end
+
+  def edit
+    @organization = Organization.find(params[:id])
+  end
+
+  def destroy
+    @organization = Organization.find(params[:id])
+    @organization.destroy
+    respond_to do |format|
+      format.html{ redirect_to admin_organization_path }
+    end
+  end
+
   def create
     @organization = Organization.new
     @organization.name = params[:organization][:name]
@@ -142,6 +155,12 @@ class OrganizationsController < ApplicationController
     # end
   end
 
+  def cancel_homepage
+    @org = Organization.find(params[:id])
+    @org.home_id = nil
+    @org.save
+  end
+
   def autocomplete_search
     @project = Project.find(params[:project_id])
     #@flag = params[:flag] || false
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 715f56d3d..200bd4d69 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -320,9 +320,20 @@ class ProjectsController < ApplicationController
     @activity.scope_select {|t| !has["show_#{t}"].nil?}
 =end
 
+    @page = params[:page] ? params[:page].to_i + 1 : 0
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
-      @events_pages = ForgeActivity.where("project_id = ? and forge_act_type != ?",@project, "Document" ).order("created_at desc").page(params['page'|| 1]).per(20);
+      case params[:type]
+        when nil
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo')",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'issue'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'news'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'message'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+      end
+
       #events = @activity.events(@date_from, @date_to)
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index c1e124063..ca07dccdc 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -31,7 +31,7 @@ class RepositoriesController < ApplicationController
   default_search_scope :changesets
 
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo]
-  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
+  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers, :forked]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
@@ -69,9 +69,11 @@ class RepositoriesController < ApplicationController
       project = project_from_current_project(@project.id, User.current.id)
       redirect_to project_path(project)
     else
-      # 单个用户只能拥有一个名字一样的版本库，否则不能fork
-      # if is_sigle_identifier?(User.current, @repository.identifier)
-        # REDO: 那些人有权限forked项目
+      # 自己不能fork自己的项目
+      if User.current.id == @project.user_id
+        flash[:notice] = l(:project_gitlab_fork_own)
+        redirect_to repository_url(@repository)
+      else
         g = Gitlab.client
         gproject = g.fork(@project.gpid, User.current.gid)
         if gproject
@@ -79,10 +81,7 @@ class RepositoriesController < ApplicationController
           forked_count = @project.forked_count.to_i + 1
           @project.update_attributes(:forked_count => forked_count)
         end
-      # else
-      #   flash[:notice] = l(:project_gitlab_fork_double_message)
-      #   redirect_to settings_project_url(@project, :tab => 'repositories')
-      # end
+      end
     end
 
   end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index dd2a5b5fc..f79646ade 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -3,8 +3,8 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work]
-  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students]
+  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work,:revise_attachment]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
   before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment]
@@ -95,12 +95,27 @@ class StudentWorkController < ApplicationController
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
-        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+        else
+          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        end
       elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-        my_work = @homework.student_works.where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          my_work = @homework.student_works.where(:id => pro.student_work_id)
+        else
+          my_work = @homework.student_works.where(:user_id => User.current.id)
+        end
         @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
       elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+        else
+          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        end
         if my_work.empty?
           @stundet_works = []
         else
@@ -116,12 +131,27 @@ class StudentWorkController < ApplicationController
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
-        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+        else
+          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        end
       elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-        my_work = @homework.student_works.where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          my_work = @homework.student_works.where(:id => pro.student_work_id)
+        else
+          my_work = @homework.student_works.where(:user_id => User.current.id)
+        end
         @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
       elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+        else
+          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        end
         if my_work.empty?
           @stundet_works = []
         else
@@ -190,6 +220,10 @@ class StudentWorkController < ApplicationController
       student_work.user_id = User.current.id
       student_work.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(student_work)
+      if @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1
+        @student_work_project = @homework.student_work_projects.where("user_id = #{User.current.id}").first
+        student_work.project_id = @student_work_project.project_id
+      end
       #提交作品时，计算是否迟交
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
         student_work.late_penalty = @homework.late_penalty
@@ -197,6 +231,35 @@ class StudentWorkController < ApplicationController
         student_work.late_penalty = 0
       end
       if student_work.save
+        if @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1
+          @student_work_project.student_work_id = student_work.id
+          @student_work_project.save
+          members = params[:group_member_ids].split(',')
+          for i in 1 .. members.count-1
+            stu_project = StudentWorkProject.new
+            stu_project.homework_common_id = @homework.id
+            stu_project.student_work_id = student_work.id
+            stu_project.project_id = @student_work_project.project_id
+            stu_project.user_id = members[i].to_i
+            stu_project.is_leader = 0
+            stu_project.save
+          end
+        elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0
+          members = params[:group_member_ids].split(',')
+          for i in 0 .. members.count-1
+            stu_project = StudentWorkProject.new
+            stu_project.homework_common_id = @homework.id
+            stu_project.student_work_id = student_work.id
+            stu_project.project_id = -1
+            stu_project.user_id = members[i].to_i
+            if i == 0
+              stu_project.is_leader = 1
+            else
+              stu_project.is_leader = 0
+            end
+            stu_project.save
+          end
+        end
         course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
         if course_activity
           course_activity.updated_at = Time.now
@@ -276,6 +339,18 @@ class StudentWorkController < ApplicationController
 
   def destroy
     if @work.destroy
+      if @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 1
+        pros = @work.student_work_projects.where("is_leader = 0")
+        pros.each do |pro|
+          pro.destroy
+        end
+        project = @work.student_work_projects.where("is_leader = 1").first
+        project.update_attributes(:student_work_id => nil)
+      elsif @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 0
+        @work.student_work_projects.each do |pro2|
+          pro2.destroy
+        end
+      end
       respond_to do |format|
         format.html {
           redirect_to student_work_index_url(:homework => @homework.id)
@@ -288,12 +363,36 @@ class StudentWorkController < ApplicationController
     @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
     if @work
       @work.destroy
+      if @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 1
+        pros = @work.student_work_projects.where("is_leader = 0")
+        pros.each do |pro|
+          pro.destroy
+        end
+        project = @work.student_work_projects.where("is_leader = 1").first
+        project.update_attributes(:student_work_id => nil)
+      elsif @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 0
+        @work.student_work_projects.each do |pro2|
+          pro2.destroy
+        end
+      end
     end
     redirect_to user_homeworks_user_path(User.current.id)
   end
 
   def retry_work
     if @work.destroy
+      if @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 1
+        pros = @work.student_work_projects.where("is_leader = 0")
+        pros.each do |pro|
+          pro.destroy
+        end
+        project = @work.student_work_projects.where("is_leader = 1").first
+        project.update_attributes(:student_work_id => nil)
+      elsif @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 0
+        @work.student_work_projects.each do |pro2|
+          pro2.destroy
+        end
+      end
       @student_work = StudentWork.new
       respond_to do |format|
         format.js
@@ -500,8 +599,9 @@ class StudentWorkController < ApplicationController
     if params[:student_path]
       redirect_to student_work_index_url(:homework => @homework.id)
     else
-      @user_activity_id = params[:user_activity_id]
-      @is_in_course = params[:is_in_course]
+      @user_activity_id = params[:user_activity_id].to_i
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
       respond_to do |format|
         format.js
       end
@@ -527,7 +627,101 @@ class StudentWorkController < ApplicationController
     @course_activity = params[:course_activity].to_i
   end
 
+  def revise_attachment
+    Attachment.attach_filesex(@work, params[:attachments], params[:attachment_type])
+    revise_attachments = @work.attachments.where("attachtype = 7").reorder("created_on desc")
+    if revise_attachments.count == 2
+      revise_attachments.last.destroy
+    end
+    #@attachment = @work.attachments.where("attachtype = 7").order("created_on desc").first
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def new_student_work_project
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #创建作业的关联项目
+  def student_work_project
+    @project = StudentWorkProject.new
+    @project.homework_common_id = @homework.id
+    @project.project_id = (Project.find params[:projectName].to_i).id
+    @project.user_id = User.current.id
+    @project.is_leader = 1
+    if @project.save
+      @user_activity_id = params[:user_activity_id].to_i
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
+      respond_to do |format|
+        format.js
+      end
+    end
+
+  end
+
+  #查找学生创建的项目列表
+  def search_user_projects
+    condition = '%%'
+    if !params[:name].nil?
+      condition = "%#{params[:name].strip}%".gsub(" ","")
+    end
+    @project_ids = Project.where("user_id = #{User.current.id} and name like '#{condition}'")
+    @first = params[:first].to_i
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #查找课程的学生
+  def search_course_students
+    name = ""
+    unless params[:name].nil?
+      name = params[:name]
+    end
+    all_student_ids = "(" + @homework.course.student.map{|student| student.student_id}.join(",") + ")"
+    all_students = User.where("id in #{all_student_ids}")
+    @users = searchstudent_by_name all_students,name
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def cancel_relate_project
+    relate_pro = StudentWorkProject.where("user_id = #{User.current.id} and homework_common_id = #{@homework.id}").first
+    if relate_pro.destroy
+      @user_activity_id = params[:user_activity_id].to_i
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   private
+  def searchstudent_by_name  users, name
+    mems = []
+    if name != ""
+      name = name.to_s.downcase
+      users.each do |m|
+        username = m.lastname.to_s.downcase + m.firstname.to_s.downcase
+        if(m.login.to_s.downcase.include?(name) ||  m.user_extensions[:student_id].to_s.downcase.include?(name) || username.include?(name))
+          mems << m
+        end
+      end
+    else
+      mems = users
+    end
+    mems
+  end
+
   def hsd_committed_work?(user, homework)
     sw = StudentWork.where("user_id =? and homework_common_id =?", user, homework).first
     sw.nil? ? result = false : result = true
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 834009d71..b6d336547 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -551,12 +551,21 @@ class UsersController < ApplicationController
               )
             end
           end
+        end
 
+        #分组作业
+        if homework.homework_type == 3
+          homework_detail_group = HomeworkDetailGroup.new
+          homework.homework_detail_group = homework_detail_group
+          homework_detail_group.min_num = params[:min_num].to_i
+          homework_detail_group.max_num = params[:max_num].to_i
+          homework_detail_group.base_on_project = params[:base_on_project].to_i
         end
 
         if homework.save
           homework_detail_manual.save if homework_detail_manual
           homework_detail_programing.save if homework_detail_programing
+          homework_detail_group.save if homework_detail_group
 
           if params[:is_in_course] == "1"
             redirect_to homework_common_index_path(:course => homework.course_id)
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index c9c4dcce3..df9fd30f2 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -104,6 +104,15 @@ class WordsController < ApplicationController
         @user = User.find(@journal_destroyed.jour_id)
         @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
         @is_user = true
+      elsif @journal_destroyed.jour_type == 'HomeworkCommon'
+        @homework = HomeworkCommon.find @journal_destroyed.jour_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].to_i
+        @course_activity = params[:course_activity].to_i
       end
       respond_to do |format|
         format.js
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cbc646eac..8f4679c67 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2435,15 +2435,24 @@ module ApplicationHelper
         link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
+        project = cur_user_projects_for_homework homework
         if work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-          link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
+            link_to "提交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再提交作品'
+          else
+            link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          end
         elsif work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
-          link_to "补交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_red'
+          if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
+            link_to "补交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再补交作品'
+          else
+            link_to "补交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_red'
+          end
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
-            link_to "匿评结束", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
+            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
             link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
           elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
@@ -2459,6 +2468,24 @@ module ApplicationHelper
 
   end
 
+  def relate_project homework,is_teacher,is_in_course,user_activity_id,course_activity
+    if User.current.member_of_course?(homework.course)
+      if is_teacher
+        #link_to "已关联(#{homework.student_work_projects.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      else
+        projects = cur_user_projects_for_homework homework
+        works = cur_user_works_for_homework homework
+        if works.nil? && projects.nil?
+          link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework.id,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目'
+        elsif works.nil?
+          link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => homework.id,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目'
+        else
+          #link_to "已关联(#{homework.student_work_projects.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+        end
+      end
+    end
+  end
+
   def student_anonymous_comment homework
     if  homework.homework_detail_manual
       case homework.homework_detail_manual.comment_status
@@ -2474,7 +2501,20 @@ module ApplicationHelper
 
   #获取当前用户在指定作业下提交的作业的集合
   def cur_user_works_for_homework homework
-    homework.student_works.where("user_id = ?",User.current).first
+    work = homework.student_works.where("user_id = ?",User.current).first
+    if homework.homework_type == 3
+      pro = homework.student_work_projects.where("user_id = #{User.current.id}").first
+      if pro.nil? || pro.student_work_id == "" || pro.student_work_id.nil?
+        work = nil
+      else
+        work = StudentWork.find pro.student_work_id
+      end
+    end
+    work
+  end
+  #获取当前用户在指定作业下关联的项目的集合
+  def cur_user_projects_for_homework homework
+    homework.student_work_projects.where("user_id = ?",User.current).first
   end
 
   def file_preview_tag(file, html_options={})
diff --git a/app/helpers/org_subfields_helper.rb b/app/helpers/org_subfields_helper.rb
new file mode 100644
index 000000000..a9f8a396f
--- /dev/null
+++ b/app/helpers/org_subfields_helper.rb
@@ -0,0 +1,2 @@
+module OrgSubfieldsHelper
+end
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index e1cf3464e..df5c872f8 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -126,4 +126,15 @@ module StudentWorkHelper
     end
     type
   end
+
+  def revise_attachment_status homework, attach
+    date = Time.parse(format_time(attach.created_on.to_s)).strftime("%Y-%m-%d")
+    status = ""
+    if homework.homework_detail_manual && ((homework.anonymous_comment == 0 &&homework.homework_detail_manual.evaluation_start.to_s <= date) || (homework.anonymous_comment == 1 && homework.end_time < date))
+      status = "此时其他同学作品已公开"
+    else
+      status = "此时其他同学作品尚未公开"
+    end
+    return status
+  end
 end
\ No newline at end of file
diff --git a/app/models/course.rb b/app/models/course.rb
index 8647b82df..d7ca1387c 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -32,7 +32,7 @@ class Course < ActiveRecord::Base
            :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
   has_many :principals, :through => :member_principals, :source => :principal
   has_many :users, :through => :members
-  has_many :org_courses
+  has_many :org_courses, :dependent => :destroy
   has_many :organizations, :through => :org_courses
   # has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
diff --git a/app/models/editor_of_document.rb b/app/models/editor_of_document.rb
new file mode 100644
index 000000000..15d9e7e37
--- /dev/null
+++ b/app/models/editor_of_document.rb
@@ -0,0 +1,4 @@
+class EditorOfDocument < ActiveRecord::Base
+  belongs_to :user, :class_name => 'User', :foreign_key => 'editor_id'
+  belongs_to :org_document_comment
+end
\ No newline at end of file
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index bb5f30442..115575289 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -48,8 +48,10 @@ class ForgeActivity < ActiveRecord::Base
   def add_org_activity
     if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
       org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first
-      org_activity.created_at = self.created_at
-      org_activity.save
+      if org_activity
+        org_activity.created_at = self.created_at
+        org_activity.save
+      end
     else
       OrgActivity.create(:user_id => self.user_id,
                        :org_act_id => self.forge_act_id,
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 8d421a98f..0ad667bd1 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -9,6 +9,8 @@ class HomeworkCommon < ActiveRecord::Base
   belongs_to :user
   has_one :homework_detail_manual, :dependent => :destroy
   has_one :homework_detail_programing, :dependent => :destroy
+  has_one :homework_detail_group, :dependent => :destroy
+  has_many :student_work_projects, :dependent => :destroy
   has_many :homework_tests, :dependent => :destroy
   has_many :student_works, :dependent => :destroy, :conditions => "is_test=0"
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
@@ -74,6 +76,10 @@ class HomeworkCommon < ActiveRecord::Base
     self.homework_type == 2 && self.homework_detail_programing
   end
 
+  def is_group_homework?
+    self.homework_type == 3 && self.homework_detail_group
+  end
+
   ###添加回复
   def self.add_homework_jour(user, notes, id , options = {})
     homework = HomeworkCommon.find(id)
diff --git a/app/models/homework_detail_group.rb b/app/models/homework_detail_group.rb
new file mode 100644
index 000000000..0a9cb5fe2
--- /dev/null
+++ b/app/models/homework_detail_group.rb
@@ -0,0 +1,4 @@
+class HomeworkDetailGroup < ActiveRecord::Base
+  belongs_to :homework_common
+  attr_accessible :base_on_project, :homework_common_id, :max_num, :min_num
+end
diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb
index 7b9f9cd75..e2ce350ce 100644
--- a/app/models/org_document_comment.rb
+++ b/app/models/org_document_comment.rb
@@ -3,7 +3,7 @@ class OrgDocumentComment < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :organization
   belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
-
+  has_many :editor_of_documents, :dependent => :destroy
   acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc"
   has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy
   after_create :document_save_as_org_activity
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
new file mode 100644
index 000000000..1660310f8
--- /dev/null
+++ b/app/models/org_subfield.rb
@@ -0,0 +1,3 @@
+class OrgSubfield < ActiveRecord::Base
+  belongs_to :organization, :foreign_key => :organization_id
+end
\ No newline at end of file
diff --git a/app/models/organization.rb b/app/models/organization.rb
index d3755b5ee..350dc3080 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -5,7 +5,8 @@ class Organization < ActiveRecord::Base
   has_many :projects,:through => :org_projects
   has_many :courses, :through => :org_courses
   has_many :org_document_comments, :dependent => :destroy
-  has_many :org_courses
+  has_many :org_courses, :dependent => :destroy
+  has_many :org_subfields, :dependent => :destroy
   has_many :users, :through => :org_members
   validates_uniqueness_of :name
   after_create :save_as_org_activity
diff --git a/app/models/project.rb b/app/models/project.rb
index 6495dbe26..cd4036810 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -43,6 +43,7 @@ class Project < ActiveRecord::Base
     end
   end
 
+  has_many :student_work_projects,:dependent => :destroy
   has_many :student_works
   has_many :time_entry_activities
   has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
@@ -86,6 +87,7 @@ class Project < ActiveRecord::Base
 
   # end
   #ADDED BY NIE
+  has_one :project_score, :dependent => :destroy
   has_many :project_infos, :dependent => :destroy 
   has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
   has_many :user_grades, :class_name => "UserGrade", :dependent => :destroy
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index 010ede635..c6e2a6584 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -4,12 +4,14 @@ class StudentWork < ActiveRecord::Base
 
   belongs_to :homework_common
   belongs_to :user
+  has_many :student_work_projects
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
   belongs_to :project
   has_many :student_work_tests, order: 'id desc'
   # course's message
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :attachments, :dependent => :destroy
 
   before_destroy :delete_praise
   before_save :set_program_score, :set_src
diff --git a/app/models/student_work_project.rb b/app/models/student_work_project.rb
new file mode 100644
index 000000000..676071817
--- /dev/null
+++ b/app/models/student_work_project.rb
@@ -0,0 +1,7 @@
+class StudentWorkProject < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :homework_common
+  belongs_to :student_work
+  belongs_to :project
+  belongs_to :user
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 17b66a43d..8e2c096de 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -107,6 +107,7 @@ class User < Principal
   has_many :student_works, :dependent => :destroy
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
+  has_many :student_work_projects, :dependent => :destroy
   #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
diff --git a/app/views/attachments/destroy.js.erb b/app/views/attachments/destroy.js.erb
index d23422e24..cfbe68085 100644
--- a/app/views/attachments/destroy.js.erb
+++ b/app/views/attachments/destroy.js.erb
@@ -1,5 +1,9 @@
 <% if @is_destroy%>
     $("#attachment_<%= @attachment.id%>").remove();
+    if(document.getElementById("uploadReviseBox")) {
+        $("#uploadReviseBox").removeClass('disable_link');
+        $("#choose_revise_attach").attr("onclick","_file.click();");
+    }
 <%else%>
     var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
     //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  start
@@ -26,5 +30,10 @@
             $('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
         }
     }
+
+    if(document.getElementById("uploadReviseBox")) {
+        $("#uploadReviseBox").removeClass('disable_link');
+        $("#choose_revise_attach").attr("onclick","_file.click();");
+    }
     //modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  end
 <% end%>
\ No newline at end of file
diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
index ea904a63f..b0354b53f 100644
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@@ -1,3 +1,6 @@
+<% if @course %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
-
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+<% end %>
 init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 3b3877228..010bc8ec9 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -4,7 +4,7 @@
         $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
         $("#course_id").val($("#option_select").val());
-        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
+        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>");
         homework_description_editor.html("");
         $("#homework_editor").toggle();
     }
diff --git a/app/views/homework_common/score_rule_set.js.erb b/app/views/homework_common/score_rule_set.js.erb
index a3afb0c9a..7fae1ecdc 100644
--- a/app/views/homework_common/score_rule_set.js.erb
+++ b/app/views/homework_common/score_rule_set.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:remote=>true}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity =>@course_activity,:remote=>true}) %>');
 showModal('ajax-modal', '350px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index b071a7c3b..5af5c9ad0 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -18,18 +18,61 @@
   <%= 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>
 
 </head>
 <!--add by huang-->
 <body onload="prettyPrint();">
-    <div class="navContainer">
+<div class="orgContainer">
+  <div class="orgNav">
+    <div class="navOrgLogo fl"><a href="javascript:void(0);" onclick="show_homepage(<%= @organization.id %>, <%= @organization.home_id.nil? ? 0 : 1 %>);"><img src="/images/home_logo.png" width="21" height="19" alt="Trustie" class="mt3" /></a></div>
+    <ul>
+      <li class="navOrgMenu fl">
+        <a href="javascript:void(0);"  onclick="show_homepage(<%= @organization.id %>, <%= @organization.home_id.nil? ? 0 : 1 %>);" class="linkGrey8 f14">首页</a>
+        <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
+      </li>
       <% if User.current.logged? %>
-          <%= render :partial => 'layouts/logined_header' %>
+        <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
+          <span class="orgMenuArrow" id="orgArrow">
+            <ul class="org_login_list" style="display:none;">
+              <li> <%= link_to "个人主页",user_path(User.current), :class => "linkGrey8" %></li>
+              <li><%= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>
+          </ul>
+          </span>
+        </li>
+        <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><%=link_to User.current, user_path(User.current), :class => "linkGrey8 f14", :id => "orgUserName" %></li>
+          <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
-          <%= render :partial => 'layouts/unlogin_header' %>
+          <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
+          <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>false) %>" class="linkGrey8 f14 mr15">注册</a></li>
       <% end %>
-    </div>
+    </ul>
+    <!--<div class="navHomepageProfile">
+      <ul>
+        <li class="homepageProfileMenuIcon"><a href="javascript:void(0);">
+          <div class="mt5 mb8"><img src="images/homepageProfileImage.png" width="40" height="40" /></div>
+          </a>
+          <ul class="topnav_login_list" style="display:none;">
+            <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div>-->
+  </div>
+</div>
 <div class="cl"></div>
   <div class="homepageContentContainer">
     <div class="homepageContent">
@@ -53,10 +96,12 @@
           <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
           <div class="orgName fl mb5 f14">
             <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
-            <% if @organization.is_public? %>
-                <span class="img_private"><%= l(:label_public)%></span>
-            <% else %>
-                <span class="img_private"><%= l(:label_private)%></span>
+            <% if User.current.logged? %>
+                <% if @organization.is_public? %>
+                    <span class="img_private"><%= l(:label_public)%></span>
+                <% else %>
+                    <span class="img_private"><%= l(:label_private)%></span>
+                <% end %>
             <% end %>
           </div>
 
@@ -75,68 +120,24 @@
 
           <div class="cl"></div>
           <div class="f12 fontGrey3">
-            <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;(
-            <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
-            )&nbsp;|&nbsp;
-            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+            <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
+            <% if User.current.logged? %>
+                (
+                <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+                )
+            <% end %>
+            &nbsp;|&nbsp;
+            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
+            <% if User.current.logged? %>
+              （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+            <% end %>
           </div>
         </div>
-        <div class="homepageLeftMenuContainer">
-          <div class="homepageLeftMenuBlock">
-            <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
-          </div>
-          <div class="homepageLeftMenuBlock">
-            <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
-            <%=link_to "", join_project_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
-            <!--<div class="courseMenu" id="projectMenu">-->
-              <!--<ul>-->
-                <!--<li class="courseMenuIcon" id="projectMenuIcon">-->
-                  <!--<ul class="topnav_course_menu" id="topnav_project_menu" style="line-height:1;">-->
-                    <!--&lt;!&ndash;<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>&ndash;&gt;-->
-                    <!--<li>-->
-                      <!--<%#= link_to "关联项目",join_project_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>-->
-                    <!--</li>-->
-                  <!--</ul>-->
-                <!--</li>-->
-              <!--</ul>-->
-            <!--</div>-->
-          <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
-        </div>
-          <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuProjects">
-            <ul >
-              <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
-              <!--<%#= @organization.org_projects.each do |p|%>-->
-              <!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey"><%#= p.name%></a></li>-->
-              <!--<%# end %>-->
-              <!--<li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>-->
-            </ul>
-          </div>
-          <div class="homepageLeftMenuBlock">
-            <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
-            <%=link_to "", join_course_menu_organization_path(@organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
-            <%#= link_to "关联课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>
-            <!--<div class="courseMenu" id="courseMenu">-->
-              <!--<ul>-->
-              <!--<li class="courseMenuIcon" id="courseMenuIcon">-->
-                <!--<ul class="topnav_course_menu" id="topnav_course_menu" style="line-height:1;">-->
-                  <!--&lt;!&ndash;<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>&ndash;&gt;-->
-                  <!--<li>-->
-                    <!--<%#= link_to "关联课程",join_course_menu_organization_path(@organization),:remote => true,:class => "menuGrey",:method => "post"%>-->
-                  <!--</li>-->
-                <!--</ul>-->
-              <!--</li>-->
-            <!--</ul>-->
-            <!--</div>-->
-            <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
-          </div>
-          <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuCourses">
-            <ul >
-              <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
-            </ul>
-          </div>
+        <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
+            <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
         </div>
       </div>
-      <div class="homepageRight">
+      <div class="homepageRight" style="margin-top:<%= params[:show_homepage].nil? ? '10px':'0px' %>;">
         <%= render_flash_messages %>
         <%= yield %>
         <%= call_hook :view_layouts_base_content %>
@@ -147,7 +148,22 @@
 
     <!--页面底部-->
     <div class="cl"></div>
-    <%= render :partial => 'layouts/footer' %>
+    <div id="Footer">
+      <div class="footerAboutContainer">
+        <ul class="footerAbout">
+          <li class="fl"><a href="<%= about_us_path %>"  class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+          <li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+          <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+          <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
+        </ul>
+      </div>
+      <div class="cl"></div>
+
+      <ul class="copyright mt10">
+        <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
+        <li>ICP备09019772</li>
+      </ul>
+    </div>
     <div class="cl"></div>
     <div id="ajax-modal" style="display:none;"></div>
 
@@ -168,7 +184,33 @@
         $("#projectMenu").mouseleave(function(){
             $("#topnav_project_menu").hide();
         });
-    </script>
+
+  function show_homepage(id, has_homepage){
+      if (has_homepage == 1)
+      {
+          window.location.href = "/organizations/" + id + "?show_homepage=1";
+      }
+      else
+      {
+          alert("您还未设置首页！");
+      }
+  }
+    $(document).ready(function(){
+        $("#orgUser,#orgSwitch").click(function(){
+            $(".org_login_list").toggle();
+            if($("#orgArrow").attr("class") == "orgMenuArrow"){
+                $("#orgArrow").attr("class","orgMenuArrow2");
+            }
+            else {
+                $("#orgArrow").attr("class","orgMenuArrow") ;
+            }
+        });
+        if($(".org_login_list").children().click){
+            $(".org_login_list").css("display","none");
+            $("#orgArrow").attr("class","orgMenuArrow");
+        };
+    });
+</script>
 </body>
 </html>
 
diff --git a/app/views/layouts/base_organization.html.erb b/app/views/layouts/base_organization.html.erb
new file mode 100644
index 000000000..0d7309ddd
--- /dev/null
+++ b/app/views/layouts/base_organization.html.erb
@@ -0,0 +1,127 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
+<%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>组织主页</title>
+  <meta charset="utf-8" />
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <link href="css/public.css" rel="stylesheet"   type="text/css" />
+  <link href="css/leftside.css" rel="stylesheet"   type="text/css" />
+  <link href="css/org.css" rel="stylesheet"   type="text/css" />
+  <script src="js/jquery-1.3.2.js" type="text/javascript"></script>
+  <script type="text/javascript" src="js/bootstrap.js"></script>
+  <script>
+      $(document).ready(function(){
+          h1 = $(".homepageLeft").height();
+          if ($("#orgMain").height()< h1) {$("#orgMain").height(h1-42);}
+      })
+  </script>
+</head>
+
+<body>
+<div class="orgContainer">
+  <div class="orgNav">
+    <div class="navOrgLogo fl"><a href="javascript:void(0);"><img src="/images/home_logo.png" width="21" height="19" alt="确实Trustie" class="mt3" /></a></div>
+    <ul>
+      <li class="navOrgMenu fl"><a href="javascript:void(0);" class="linkGrey8 f14">首页</a></li>
+      <li class="navOrgMenu fr"><a href="javascript:void(0);" class="linkGrey8 f14">登录</a></li>
+      <li class="navOrgMenu fr"><a href="javascript:void(0);" class="linkGrey8 f14 mr15">注册</a></li>
+    </ul>
+    <!--<div class="navHomepageProfile">
+      <ul>
+        <li class="homepageProfileMenuIcon"><a href="javascript:void(0);">
+          <div class="mt5 mb8"><img src="images/homepageProfileImage.png" width="40" height="40" /></div>
+          </a>
+          <ul class="topnav_login_list" style="display:none;">
+            <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>
+            <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div>-->
+  </div>
+</div>
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft">
+      <div class="homepagePortraitContainer">
+        <!--<div class="pr_info_logo fl mr10 mb5">-->
+
+        <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
+          <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
+          <% if User.current.logged?%>
+              <% if User.current.id == @organization.creator_id %>
+                  <div id="edit_org_file_btn" class="none">
+                    <div class="homepageEditProfile">
+                      <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
+                    </div>
+                  </div>
+              <% end %>
+          <% end%>
+        </div>
+        <div class="orgName fl mb5 f14">
+          <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+          <% if @organization.is_public? %>
+              <span class="img_private"><%= l(:label_public)%></span>
+          <% else %>
+              <span class="img_private"><%= l(:label_private)%></span>
+          <% end %>
+        </div>
+
+        <% if User.current.admin_of_org?(@organization) and params[:show_homepage].nil? %>
+            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+        <% end %>
+
+        <div class="cl"></div>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;(
+          <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+          )&nbsp;|&nbsp;
+          <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+        </div>
+      </div>
+      <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
+        <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+      </div>
+    </div>
+    <div class="homepageRight" style="margin-top:0px;">
+      <%= render_flash_messages %>
+      <%= yield %>
+      <%= call_hook :view_layouts_base_content %>
+      <div style="clear:both;"></div>
+    </div>
+  </div>
+</div>
+<div class="cl"></div>
+<div id="Footer">
+  <div class="footerAboutContainer">
+    <ul class="footerAbout">
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
+    </ul>
+  </div>
+  <div class="cl"></div>
+
+  <ul class="copyright mt10">
+    <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
+    <li>ICP备09019772</li>
+  </ul>
+</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/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 9e9bd688f..1d68c9fa0 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project','courses','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
diff --git a/app/views/mailer/send_mail_anonymous_comment_open.html.erb b/app/views/mailer/send_mail_anonymous_comment_open.html.erb
index 5409ade55..3aa3d1c21 100644
--- a/app/views/mailer/send_mail_anonymous_comment_open.html.erb
+++ b/app/views/mailer/send_mail_anonymous_comment_open.html.erb
@@ -2,7 +2,7 @@
   <ul style="list-style-type:none; margin:0; padding:0;">
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @anonymous_comment_close_name, @anonymous_comment_close_url%> <span style="color: red; padding-left: 10px;">已经开启匿评了！</span></p>
+          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @anonymous_comment_close_name, @anonymous_comment_close_url%> <span style="color: red; padding-left: 10px;">已经开启匿评了，请您关注！</span></p>
         </span>
     </li>
   </ul>
diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb
index 40ed2eeb2..1906cae95 100644
--- a/app/views/org_document_comments/add_reply.js.erb
+++ b/app/views/org_document_comments/add_reply.js.erb
@@ -1,3 +1,3 @@
 
-$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document, :act => @act}) %>");
+$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
 init_activity_KindEditor_data(<%= @act.id %>,"","87%");
\ No newline at end of file
diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb
index d967c42fd..9a9f74ac6 100644
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@@ -19,6 +19,6 @@
                 init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%");
             });
         </script>
-          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first} %>
+          <%= 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_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 31e4f7e05..7655f996e 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -25,7 +25,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
       <% unless @document.content.blank? %>
-          <div class="homepagePostIntro">
+          <div class="homepagePostIntro" style="width:640px;">
             <%= @document.content.html_safe %>
           </div>
       <% end %>
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
new file mode 100644
index 000000000..8a676e93e
--- /dev/null
+++ b/app/views/org_subfields/create.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 }) %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
diff --git a/app/views/org_subfields/destroy.js.erb b/app/views/org_subfields/destroy.js.erb
new file mode 100644
index 000000000..8a676e93e
--- /dev/null
+++ b/app/views/org_subfields/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 }) %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
diff --git a/app/views/org_subfields/update.js.erb b/app/views/org_subfields/update.js.erb
new file mode 100644
index 000000000..06982ccfc
--- /dev/null
+++ b/app/views/org_subfields/update.js.erb
@@ -0,0 +1,3 @@
+$("#subfield_show_<%= @subfield.id %>").html("<%= @subfield.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/organizations/_join_course_menu.html.erb b/app/views/organizations/_join_course_menu.html.erb
index d875550de..fa507db28 100644
--- a/app/views/organizations/_join_course_menu.html.erb
+++ b/app/views/organizations/_join_course_menu.html.erb
@@ -22,11 +22,10 @@
 </head>
 
 <body>
-<div class="resourceSharePopup">
+<!--<div class="resourceSharePopup">-->
   <div>
     <div class="relateText fl">请选择关联到组织的课程</div>
   </div>
-  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_courses', :organization_id => organization_id),:method => 'post', :id => 'join_courses_form', :remote => true,:class=>"resourcesSearchBox" do %>
       <input type="text" name="courses" placeholder="搜索您已加入的课程的名称" class="searchCourse" />
@@ -42,7 +41,7 @@
   <div>
   </div>
   <div class="cl"></div>
-</div>
+<!--</div>-->
 
 <script type="text/javascript">
     var lastSearchCondition = '';
diff --git a/app/views/organizations/_join_project_menu.html.erb b/app/views/organizations/_join_project_menu.html.erb
index e13e1416e..a491d8788 100644
--- a/app/views/organizations/_join_project_menu.html.erb
+++ b/app/views/organizations/_join_project_menu.html.erb
@@ -22,11 +22,10 @@
 </head>
 
 <body>
-<div class="resourceSharePopup">
+
   <div>
     <div class="relateText fl">请选择关联到组织的项目</div>
   </div>
-  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_projects', :organization_id => organization_id),:method => 'post', :id => 'join_projects_form', :remote => true,:class=>"resourcesSearchBox" do %>
         <input type="text" name="projects" placeholder="搜索您已加入的项目的名称" class="searchCourse" />
@@ -38,7 +37,7 @@
     <% end %>
   </div>
   <div class="cl"></div>
-</div>
+
 
 <script type="text/javascript">
     var lastSearchCondition = '';
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 33ac13e76..9cb84e6d6 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -22,7 +22,7 @@
                 </div>
             <% end %>
             <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
-                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act} %>
+                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2} %>
             <% end %>
         <% end %>
         <% if act.container_type == 'Project' %>
@@ -56,7 +56,7 @@
 <% end %>
 
 <% if org_act_count == 10 %>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>
+    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>
     <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
 
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
new file mode 100644
index 000000000..cb604f6ba
--- /dev/null
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -0,0 +1,33 @@
+<div class="homepageLeftMenuBlock">
+  <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %>
+</div>
+<div class="homepageLeftMenuBlock">
+  <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
+  <% if User.current.logged? %>
+    <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
+  <% end %>
+</div>
+<div class="homepageLeftMenuCourses" id="homepageLeftMenuProjects" style="display:<%= organization.projects.count == 0?'none':'' %>">
+  <ul >
+    <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+  </ul>
+</div>
+<div class="homepageLeftMenuBlock">
+  <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
+  <% if User.current.logged? %>
+    <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
+  <% end %>
+</div>
+<div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">
+  <ul >
+    <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+  </ul>
+</div>
+<% organization.org_subfields.each do |field| %>
+    <div class="homepageLeftMenuBlock">
+      <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses_#{field.id}').slideToggle();"><%= field.name %></a>
+      <%=link_to "", :title => "关联#{field.name}"%>
+    </div>
+    <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
new file mode 100644
index 000000000..76ee84e69
--- /dev/null
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -0,0 +1,71 @@
+<div class="resources mt10" id="organization_document_<%= document.id %>">
+  <div class="homepagePostBrief">
+
+    <div class="homepagePostDes" style="width:690px;">
+
+      <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
+
+      <% unless document.content.blank? %>
+          <div class="homepagePostIntro" >
+            <%= document.content.html_safe %>
+          </div>
+      <% end %>
+      <% if params[:show_homepage].nil? %>
+          <div class="homepagePostDate" style="float:right;">
+            发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
+          </div>
+          <div class="cl"></div>
+          <div class="homepagePostDate" style="float:right;">
+            最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
+          </div>
+      <% end %>
+      <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
+                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %>
+                  </li>
+                  <li>
+                    <%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :remote => true, :class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+  </div>
+
+</div>
+
+<script type="text/javascript">
+    function expand_reply(container, btnid) {
+        var target = $(container);
+        var btn = $(btnid);
+        if (btn.data('init') == '0') {
+            btn.data('init', 1);
+            btn.html('收起回复');
+            target.show();
+        } else {
+            btn.data('init', 0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 888cbbf68..7588c7f6f 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -8,24 +8,20 @@
         <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
-        <% if document.organization.home_id == document.id %>
-            <span style="color:#269ac9;">首页</span>
-        <% else %>
             <span style="color:#269ac9;">组织文章</span>
-        <% end %>
       </div>
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
       <div class="homepagePostDate">
         发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %></div>
       <% unless document.content.blank? %>
-          <div class="homepagePostIntro">
+          <div class="homepagePostIntro" style="width:640px;">
             <%= document.content.html_safe %>
           </div>
       <% end %>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
     <%# end %>-->
-      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %>
+      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
           <div class="homepagePostSetting">
             <ul>
               <li class="homepagePostSettingIcon">
@@ -36,7 +32,7 @@
                     <% end %>
                   </li>
                   <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 0), :class => "postOptionLink" %>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag), :class => "postOptionLink" %>
                   </li>
                   <li>
                     <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
@@ -92,7 +88,7 @@
       </div>
       <div class="homepagePostReplyInputContainer">
         <div nhname='new_message_<%= act.id %>' style="display:none;">
-          <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id), :method => "post", :remote => true) do |f| %>
+          <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
               <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
               <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="org_content"></textarea>
 
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
new file mode 100644
index 000000000..a0f6dc60f
--- /dev/null
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -0,0 +1,61 @@
+
+  <ul class="orgListRow">
+    <li class="orgListUser fb">已有栏目</li>
+    <li class="orgListRole fb">状态</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="orgListRow">
+    <li class="orgListUser">组织首页</li>
+    <li class="orgListUser">默认</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="orgListRow">
+    <li class="orgListUser">动态</li>
+    <li class="orgListUser">默认</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="orgListRow">
+    <li class="orgListUser">项目</li>
+    <li class="orgListUser">默认</li>
+    <div class="cl"></div>
+  </ul>
+  <ul class="orgListRow">
+    <li class="orgListUser">课程</li>
+    <li class="orgListUser">默认</li>
+    <div class="cl"></div>
+  </ul>
+  <% subfields.each do |field| %>
+    <ul class="orgListRow">
+        <li class="orgListUser"><div id="subfield_show_<%= field.id %>"><%= field.name %></div><div id="subfield_edit_<%= field.id %>" style="display:none;">
+          <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;" /></div></li>
+        <li class="orgListUser">新增</li>
+        <%= link_to "删除",org_subfield_path(field), :method => 'delete',:remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr5" %>
+        <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+        <div class="cl"></div>
+    </ul>
+  <% end %>
+
+  <script>
+    function edit(show_id, edit_id){
+        $(show_id).toggle();
+        $(edit_id).toggle();
+        $(edit_id).find('input').focus();
+        $(edit_id).find('input').on('keypress',function(e){
+            if(e.keyCode == 13){
+                this.blur();
+            }
+        })
+    }
+    function update_subfield(show_id, edit_id, field_id, input_value) {
+        if ($(show_id).html().trim() != input_value.trim()) {
+            if (confirm('确定修改为' + input_value + "?"))
+                $.ajax({
+                    url :"/org_subfields/" + field_id + "?name=" + input_value,
+                    type :'put'
+                });
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+//       $(edit_id).focus();
+   }
+  </script>
\ No newline at end of file
diff --git a/app/views/organizations/cancel_homepage.js.erb b/app/views/organizations/cancel_homepage.js.erb
new file mode 100644
index 000000000..bf9eb798c
--- /dev/null
+++ b/app/views/organizations/cancel_homepage.js.erb
@@ -0,0 +1 @@
+window.location.href = "<%= organization_path(@org) %>";
\ No newline at end of file
diff --git a/app/views/organizations/destroy.js.erb b/app/views/organizations/destroy.js.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/edit.html.erb b/app/views/organizations/edit.html.erb
new file mode 100644
index 000000000..57f34f341
--- /dev/null
+++ b/app/views/organizations/edit.html.erb
@@ -0,0 +1,108 @@
+
+<% @nav_dispaly_organization_label = 1
+   @nav_dispaly_forum_label = 1 %>
+<%= error_messages_for 'organization' %>
+<div class="organization_r_h02">
+  <h2 class="organization_h2">编辑组织</h2>
+</div>
+<div class="ml15 mr15" id="orgContent_1">
+  <!--<div class="orgLogo mb10"><a href="javascript:void(0);"><img src="images/0" width="55" height="55" alt="组织logo" class="mr10 logoBorder fl ml10" /></a>-->
+  <!--<a href="javascript:void(0);" class="logoEnter fl linkGrey4">上传图片</a>-->
+  <%#= form_for( @organization,{:controller => 'organizations',:action => 'update',:id=>@organization,:html=>{:id=>'update_org_form',:method=>'put'}}) do %>
+  <%= labelled_form_for @organization, :html => {:id => "edit_organization_#{@organization.id}"} do |f|%>
+      <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %>
+      <!--<div class="cl"></div>-->
+      <!--</div>-->
+      <div class="orgRow mb10"><span class="c_red">*&nbsp;</span>组织名称：<input type="text" name="organization[name]" id="organization_name" maxlength="100" onblur="check_uniq(<%=@organization.id %>);" onfocus="$('#check_name_hint').hide()" class="orgNameInput"  value="<%= @organization.name%>" />
+        <div class="cl"></div>
+      </div>
+      <div style="margin-left: 80px " id="check_name_hint"></div>
+      <div class="orgRow mb10"><span class="ml10">组织描述：</span><textarea type="text" name="organization[description]" class="orgDes" id="org_desc"  placeholder="最多3000个汉字（或6000个英文字符）"><%= @organization.description%></textarea>
+        <div class="cl"></div>
+      </div>
+      <div style="margin-left: 80px " id="check_desc_hint"></div>
+      <!--<div class="orgRow mb10"><span class="ml10">组织URL：</span>-->
+      <!--<div class="w607 fr">https：//-->
+      <!--<input type="text" name="organization[domain]" value="<%= @organization.domain%>" class="orgUrlInput" />-->
+      <!--.trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;">申请</a>-->
+      <!--<p id="apply_hint"></p></div>-->
+      <!--&lt;!&ndash;class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 &ndash;&gt;-->
+      <!--</div>-->
+      <!--<div class="cl"></div>-->
+      <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
+        <input type="checkbox" name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
+      </div>
+      <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org(<%=@organization.id %>);">保存</a>
+  <% end %>
+</div>
+<div class="cl"></div>
+
+<% html_title(l(:label_edit_organization)) -%>
+
+<script>
+    function update_org(id){
+        check_uniq(id);
+        if( $checkName){
+            $("#edit_organization_"+id).submit();
+        }
+    }
+    //新建组织
+    //验证组织名称
+    function regex_organization_name()
+    {
+        var name = $.trim($("#organization_name").val());
+        if(name.length == 0)
+        {
+            $("#organization_name_notice").html('<span class="c_red">名字不能为空<span>').show();
+            return false;
+        }
+        else
+        {
+            $("#organization_name_notice").html('').hide();
+            return true;
+        }
+    }
+
+    var $checkName = false;
+
+    function check_uniq(dom){
+        if($("#organization_name").val().trim() == ""){
+            $("#organization_name_notice").html('<span class="c_red">名字不能为空<span>').show();
+            return;
+        }
+        $.get(
+                '<%=  check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim()
+        )
+    }
+
+    //提交新建项目
+    function submit_new_organization()
+    {
+        $.get(
+                '<%=  check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim()
+        )
+        if(regex_organization_name() && $checkName)
+        {
+            $("#new_organization").submit();
+        }
+    }
+
+    $(function(){
+        $('#organization_new_type').change(function(){
+            var type = $('#organization_new_type').val();
+            if(type == '1'){
+                $(this).next().html("<%= l(:label_type_des_development)%>");
+            }
+            else if(type == '2'){
+                $(this).next().html("<%= l(:label_type_des_research)%>");
+            }
+            else if(type == '3'){
+                $(this).next().html("<%= l(:label_type_des_friend)%>");
+            }
+//            var p1=$(this).children('option:selected').val("研讨模式：面向小组研究，支持任务分工、论坛交流、资源分享等。");//这就是selected的值
+//            var p2=$('#param2').val();//获取本页面其他标签的值
+        })
+
+    })
+</script>
+
diff --git a/app/views/organizations/join_course_menu.js.erb b/app/views/organizations/join_course_menu.js.erb
index 27c96c8c7..9812d412b 100644
--- a/app/views/organizations/join_course_menu.js.erb
+++ b/app/views/organizations/join_course_menu.js.erb
@@ -1,3 +1,11 @@
 $('#topnav_course_menu').hide();
+
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_course_menu', :locals => {:organization_id => @organization.id}) %>');
-$('#ajax-modal').show();
+showModal('ajax-modal', '320px');
+$('#ajax-modal').siblings().hide();
+$('#ajax-modal').before(
+        "<a href='javascript:' onclick='hideModal();location.reload();' class='resourceClose' style='margin-left: 300px;'></a>");
+//$('#ajax-modal').css('position','absolute')
+$('#ajax-modal').css("top","").css("left","");
+$('#ajax-modal').parent().addClass("resourceSharePopup");
+
diff --git a/app/views/organizations/join_courses.js.erb b/app/views/organizations/join_courses.js.erb
index 643af161f..dbe8b23ff 100644
--- a/app/views/organizations/join_courses.js.erb
+++ b/app/views/organizations/join_courses.js.erb
@@ -2,4 +2,5 @@ $("#homepageLeftMenuCourses").html("");
 $("#homepageLeftMenuCourses").append("<ul>");
 $("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses',
     :locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1})  %>");
-$("#homepageLeftMenuCourses").append("</ul>");
\ No newline at end of file
+$("#homepageLeftMenuCourses").append("</ul>");
+$("#homepageLeftMenuCourses").show();
\ No newline at end of file
diff --git a/app/views/organizations/join_project_menu.js.erb b/app/views/organizations/join_project_menu.js.erb
index 413aa7081..81bd802a4 100644
--- a/app/views/organizations/join_project_menu.js.erb
+++ b/app/views/organizations/join_project_menu.js.erb
@@ -1,3 +1,11 @@
 $('#topnav_project_menu').hide();
+
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_project_menu', :locals => {:organization_id => @organization.id}) %>');
-$('#ajax-modal').show();
\ No newline at end of file
+showModal('ajax-modal', '320px');
+$('#ajax-modal').siblings().hide();
+$('#ajax-modal').before(
+        "<a href='javascript:' onclick='hideModal();location.reload();' class='resourceClose' style='margin-left: 300px;'></a>");
+//$('#ajax-modal').css('position','absolute');
+$('#ajax-modal').css("top","").css("left","");
+$('#ajax-modal').parent().addClass("resourceSharePopup");
+
diff --git a/app/views/organizations/join_projects.js.erb b/app/views/organizations/join_projects.js.erb
index a39d94819..53a9e4a02 100644
--- a/app/views/organizations/join_projects.js.erb
+++ b/app/views/organizations/join_projects.js.erb
@@ -2,4 +2,5 @@ $("#homepageLeftMenuProjects").html("");
 $("#homepageLeftMenuProjects").append("<ul>");
 $("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects',
     :locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1})  %>");
-$("#homepageLeftMenuProjects").append("</ul>");
\ No newline at end of file
+$("#homepageLeftMenuProjects").append("</ul>");
+$("#homepageLeftMenuProjects").show();
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 82b28fb8a..e0f262b99 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -2,7 +2,7 @@
     function g(o){return document.getElementById(o);}
     function HoverLi(n){
 //如果有N个标签,就将i<=N;
-        for(var i=1;i<=2;i++){
+        for(var i=1;i<=3;i++){
             g('orgSetting_'+i).className='orgSettingOp';
             g('orgContent_'+i).className='undis';}
             g('orgContent_'+n).className='dis ml15 mr15';
@@ -34,6 +34,7 @@
       <ul class="mb10">
         <li class="orgSettingOp orgOpActive" id="orgSetting_1" onclick="HoverLi(1);">信息</li>
         <li class="orgSettingOp" id="orgSetting_2" onclick="HoverLi(2);">成员</li>
+        <li class="orgSettingOp" id="orgSetting_3" onclick="HoverLi(3);">栏目</li>
         <li class="orgBorder"></li>
         <div class="cl"></div>
       </ul>
@@ -45,13 +46,11 @@
         <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %>
           <!--<div class="cl"></div>-->
         <!--</div>-->
-        <div class="orgRow mb10"><span class="c_red">*&nbsp;</span>组织名称：
-          <input type="text" name="organization[name]" id="organization_name" maxlength="100" onblur="check_uniq(<%=@organization.id %>);" onfocus="$('#check_name_hint').hide()" class="orgNameInput"  value="<%= @organization.name%>" />
+        <div class="orgRow mb10"><span class="c_red">*&nbsp;</span>组织名称：<input type="text" name="organization[name]" id="organization_name" maxlength="100" onblur="check_uniq(<%=@organization.id %>);" onfocus="$('#check_name_hint').hide()" class="orgNameInput"  value="<%= @organization.name%>" />
           <div class="cl"></div>
         </div>
             <div style="margin-left: 80px " id="check_name_hint"></div>
-        <div class="orgRow mb10"><span class="ml10">组织描述：</span>
-          <textarea type="text" name="organization[description]" class="orgDes" id="org_desc"  placeholder="最多3000个汉字（或6000个英文字符）"><%= @organization.description%></textarea>
+        <div class="orgRow mb10"><span class="ml10">组织描述：</span><textarea type="text" name="organization[description]" class="orgDes" id="org_desc"  placeholder="最多3000个汉字（或6000个英文字符）"><%= @organization.description%></textarea>
           <div class="cl"></div>
         </div>
             <div style="margin-left: 80px " id="check_desc_hint"></div>
@@ -106,4 +105,26 @@
         </div>
         <div class="cl"></div>
       </div>
-    </div>
\ No newline at end of file
+      <div class="undis ml15 mr15" id="orgContent_3">
+        <div class="orgMemberList" id="org_subfield_list">
+          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields } %>
+        </div>
+        <div class="fr orgMemContainer">
+          <div class="orgMemberAdd">
+            <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 mb20" />
+                <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>
+  function add_org_subfield(){
+      if ($("#subfield_name").val().trim() != "")
+        $("#add_subfield_form").submit();
+  }
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index e44e0778d..9ee9d11c0 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -12,6 +12,7 @@
     .homepagePostReplyInputContainer .ke-inline-block {display: none;}
     .homepagePostReplyInputContainer .ke-container {float: left;}
 </style>
+<% if params[:show_homepage].nil? %>
 <div class="homepageRightBanner">
   <div class="NewsBannerName">最新动态</div>
   <ul class="resourcesSelect">
@@ -49,17 +50,16 @@
       </ul>
     </li>
   </ul>
-
 </div>
-
-<% if !@organization.home_id.nil?  and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %>
+<% end %>
+<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %>
     <script>
         $(function() {
             init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "87%");
         });
     </script>
     <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
-        <%= render :partial => 'show_org_document', :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',
diff --git a/app/views/projects/_attachment_acts.html.erb b/app/views/projects/_attachment_acts.html.erb
new file mode 100644
index 000000000..2baa8791a
--- /dev/null
+++ b/app/views/projects/_attachment_acts.html.erb
@@ -0,0 +1,35 @@
+<div class="resources mt10" id="user_activity_<%= user_activity_id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %> TO
+        <%= link_to activity.project.name.to_s+" | 项目附件", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word hidden fl m_w600">
+        <%= link_to format_activity_title("#{l(:label_attachment)}: #{activity.filename}"), {:controller => 'attachments', :action => 'show', :id => activity.id}, :class => "problem_tit fl fb" %>
+        <%#= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
+      </div>
+      <div class="cl"></div>
+      <div class="homepagePostDate">
+        发布时间：<%= format_time(activity.created_on) %>
+      </div>
+      <p class="mt5 break_word"><%= textAreailizable act, :description %><br/></p>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id %>">
+        <div id="intro_content_<%= user_activity_id %>">
+          <%#= activity.description.html_safe %>
+        </div>
+      </div>
+      <div class="cl"></div>
+
+    </div>
+    <div class="cl"></div>
+  </div>
+
+</div>
\ No newline at end of file
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
new file mode 100644
index 000000000..f97646d3c
--- /dev/null
+++ b/app/views/projects/_project_activities.html.erb
@@ -0,0 +1,102 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<style type="text/css">
+    /*回复框*/
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
+    .ke-inline-block{display: none;}
+    div.ke-container{float:left;}
+</style>
+<% unless forge_acts.empty? %>
+    <% forge_acts.each do |activity| -%>
+        <script>
+            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();
+                }
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                showNormalImage('activity_description_<%= activity.id %>');
+                if ($("#intro_content_<%= activity.id %>").height() > 360) {
+                    $("#intro_content_show_<%= activity.id %>").show();
+                }
+                $("#intro_content_show_<%= activity.id %>").click(function () {
+                    $("#activity_description_<%= activity.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= activity.id%>").toggleClass("lh18");
+                    $("#intro_content_show_<%= activity.id %>").hide();
+                    $("#intro_content_hide_<%= activity.id %>").show();
+                });
+                $("#intro_content_hide_<%= activity.id %>").click(function () {
+                    $("#activity_description_<%= activity.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= activity.id%>").toggleClass("lh18");
+                    $("#intro_content_hide_<%= activity.id %>").hide();
+                    $("#intro_content_show_<%= activity.id %>").show();
+                });
+            });
+        </script>
+        <!--创建-->
+        <% case activity.forge_act_type %>
+        <% when "ProjectCreateInfo" %>
+            <%= render :partial => 'projects/project_create', :locals => {:activity => activity, :user_activity_id => activity.id} %>
+            <!--缺陷动态-->
+        <% when "Issue" %>
+            <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id} %>
+
+            <!--message    -->
+        <% when "Message" %>
+            <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id} %>
+            <!--new 新闻-->
+        <% when "News" %>
+            <% if !activity.forge_act.nil? and activity.forge_act.project %>
+                <%= render :partial => 'projects/project_news', :locals => {:activity=>activity.forge_act, :user_activity_id=>activity.id} %>
+            <% end %>
+            <!--Attachment   -->
+        <% when "Attachment" %>
+            <%= render :partial => 'projects/attachment_acts', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
+            <!--<div class="problem_main">-->
+              <!--<a class="problem_pic fl"><%#= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %></a>-->
+
+              <!--<div class="problem_txt fl mt5 break_word">-->
+                <!--<a class="problem_name fl ">-->
+                  <!--<%#= h(e.project) if @project.nil? || @project.id != e.project_id %>-->
+                  <!--<%#= link_to h(activity.user), user_path(activity.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%#= l(:label_new_activity) %>-->
+                <!--：</span>-->
+                <%#= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id}, :class => "problem_tit fl fb" %>
+                <!--<br/>-->
+
+                <!--<p class="mt5 break_word"><#%= textAreailizable act, :description %><br/>-->
+                  <!--<%#= l :label_create_time %>-->
+                  <!--：<%#= format_activity_day(act.created_on) %> <%#= format_time(act.created_on, false) %></p>-->
+              <!--</div>-->
+              <!--<div class="cl"></div>-->
+            <!--</div>-->
+        <% end %>
+    <% end %>
+<% end %>
+
+<% if forge_acts.count == 10 %>
+    <div id="show_more_forge_activities" class="loadMore mt10 f_grey">展开更多<%= link_to "", project_path(@project.id, :type => type, :page => page), :id => "more_forge_activities_link", :remote => "true", :class => "none" %></div>
+<% end %>
+
+<script type="text/javascript">
+    $("#show_more_forge_activities").mouseover(function () {
+        $("#more_forge_activities_link").click();
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/projects/_project_create.html.erb b/app/views/projects/_project_create.html.erb
new file mode 100644
index 000000000..d966d8e18
--- /dev/null
+++ b/app/views/projects/_project_create.html.erb
@@ -0,0 +1,38 @@
+<% project = Project.find(activity.project_id) %>
+<% user = User.find(project.user_id)%>
+<div class="resources mt10">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if user.try(:realname) == ' ' %>
+            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word" >
+        <%= link_to project.name, project_path(project.id,:host=>Setting.host_course), :class => "postGrey" %>
+      </div>
+      <div class="homepagePostDate">
+        创建时间：<%= format_time(project.created_on) %>
+      </div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
new file mode 100644
index 000000000..919abc11e
--- /dev/null
+++ b/app/views/projects/_project_news.html.erb
@@ -0,0 +1,106 @@
+<div class="resources mt10" id="user_activity_<%= user_activity_id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %> TO
+        <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
+        <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
+      </div>
+      <% if activity.sticky == 1%>
+          <span class="sticky_btn_cir ml10">置顶</span>
+      <% end%>
+      <div class="cl"></div>
+      <div class="homepagePostDate">
+        发布时间：<%= format_time(activity.created_on) %>
+      </div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id %>">
+        <div id="intro_content_<%= user_activity_id %>">
+          <%= activity.description.html_safe %>
+        </div>
+      </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count=activity.comments.count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">
+        回复（<%= count %>）
+      </div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+      <%if count>3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.comments.reorder("created_on desc").each do |comment| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= comment.id %>');
+                    });
+                </script>
+                <% replies_all_i = replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if comment.try(:author).try(:realname) == ' ' %>
+                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(comment.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                      <%= comment.comments.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment[comments]"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index a3a2845f8..a58aeb281 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,114 +1,33 @@
-<%= javascript_include_tag "jquery.infinitescroll.js" %>
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_activity) %></h2>
-</div>
-<!--CONTENT LIST-->
-<% unless @events_pages.empty? %>
-    <% @events_pages.each do |e| -%>
-        <!--创建-->
-        <% if e.forge_act_type == "ProjectCreateInfo"%>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user),  :width => "42", :height => "42") %></a>
-                <div class="problem_txt fl mt5 break_word">
-                    <%= link_to e.user,  user_path(e.user), :class => "problem_name c_orange fl" %> <span class="fl"> <%= l(:label_project_create) %> ：</span>
-                    <%= link_to e.project.name,{} ,:class => "problem_tit fl fb" %></a><br />
-                    <p class="mt5"><br /> <%= l :label_create_time %> ：<%= format_time(e.project.created_on) %></p>
-                </div>
-                <div class="cl"></div>
-            </div>
-        <% end %>
-        <%  next if e.forge_act_type.safe_constantize.nil?
-            act = e.forge_act;
-            next if act.nil? %>
-        <!--缺陷动态-->
-        <% if e.forge_act_type == "Issue" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(act.author), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word list_style">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to act.author, user_path(act.author), :class => "problem_name c_orange fl" %><span class="fl"> <%= l(:label_new_activity) %> ：</span>
-                  <%= link_to format_activity_title("#{act.source_from}##{act.project_issues_index} (#{act.status}): #{act.tracker.name} #{act.subject}"),
-                                {:controller => 'issues',
-                                 :action => 'show',
-                                 :id => act.id},
-                                 :class => "problem_tit fl fb " %>
-                </a><br />
-                <p class="mt5 break_word"><%= act.description.html_safe %><br />
-                  <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>
-                </p>
-              </div>
-              <div class="cl"></div>
-            </div>
-        <!--缺陷 jou留言 -->
-        <% elsif e.forge_act_type == "Journal" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %><span class="fl"> <%= l(:label_new_activity) %> ：</span>
-                  <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"),
-                              {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"}, :class => "problem_tit fl fb" %>
-                </a><br />
-                <p class="mt5 break_word"><%=  act.notes.html_safe %><br />
-                  <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
-              </div>
-              <div class="cl"></div>
-            </div>
-        <!--message    -->
-            <% elsif e.forge_act_type == "Message" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word list_style">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
+<%#= stylesheet_link_tag 'courses' %>
+<script type="text/javascript">
+    $(function () {
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width", "1000px");
+    });
+</script>
+<input type="hidden" value="<%= @type %>" name="type" id="user_activities_type">
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">项目动态</div>
+    <ul class="resourcesSelect" class="resourcesSelect">
+      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+        <ul class="homepagePostType">
+          <li>
+            <ul class="homepagePostTypeHomework fl">
+              <li><%= link_to "全部动态", {:controller => "projects", :action => "show", :type => nil}, :class => "homepagePostTypeAll postTypeGrey" %></li>
+              <li><%= link_to "问题动态", {:controller => "projects", :action => "show", :type => "issue"}, :class => "homepagePostTypeMessage postTypeGrey" %></li>
+              <!--<li><%#= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey" %></li>-->
+              <li><%= link_to "新闻动态", {:controller => "projects", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey" %></li>
+              <!--<li><%#= link_to "资源库动态", {:controller => "projects", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey" %></li>-->
+              <li><%= link_to "讨论区动态", {:controller => "projects", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey" %></li>
+              <!--<li><%#= link_to "问卷动态", {:controller => "courses", :action => "show", :type => "poll"}, :class => "homepagePostTypeQuiz postTypeGrey" %></li>-->
+            </ul>
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <!--CONTENT LIST-->
 
-                  <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
-                                project_boards_path(@project,:topic_id => act.id),
-                               :class => "problem_tit fl fb " %>
-                <br />
-                <p class="mt5 break_word"><%= textAreailizable act,:content %><br />
-                <div class="cl"></div>
-                  <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
-              </div>
-              <div class="cl"></div>
-            </div>
-        <!--new 新闻-->
-        <% elsif e.forge_act_type == "News" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word list_style">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
-                <a class="problem_tit fl fb">
-                  <% unless act.nil? %>
-                      <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id}, :class => "problem_tit fl fb " %>
-                  <% end %>
-                </a><br />
-                <p class="mt5 break_word"><%= textAreailizable act,:description %><br />
-                  <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
-              </div>
-              <div class="cl"></div>
-            </div>
-
-        <!--Attachment   -->
-        <% elsif e.forge_act_type == "Attachment" %>
-            <div class="problem_main">
-              <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
-                <a class="problem_name fl ">
-                  <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
-                  <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
-                  <%= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id}, :class => "problem_tit fl fb" %></a><br />
-                <p class="mt5 break_word"><%= textAreailizable act,:description %><br />
-                  <%= l :label_create_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
-              </div>
-              <div class="cl"></div>
-            </div>
-        <% end %>
-    <% end %>
-<% end %>
-<%= paginate @events_pages, :left => 3, :right => 3 %>
+  </div>
+  <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/show.js.erb b/app/views/projects/show.js.erb
new file mode 100644
index 000000000..384c111d1
--- /dev/null
+++ b/app/views/projects/show.js.erb
@@ -0,0 +1 @@
+$("#show_more_forge_activities").replaceWith("<%= escape_javascript( render :partial =>  'projects/project_activities',:locals => {:forge_acts => @events_pages, :page => @page,:type => @type} )%>");
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index d8b7c4625..259e8c185 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -15,20 +15,22 @@
             版本库地址：<%= @repos_url %>
         <% else %>
             版本库地址：<%= h @repository.url %>
-        <% end %>-
+        <% end %>
         <!-- added by bai -->
         <div class="cl"></div>
       </div>
   <% else %>
       <%= render :partial => 'navigation' %>
       <div class="fl c_grey02 mt5 mr5">克隆网址:</div>
-      <textarea id="copy_rep_content" class="cloneUrl mt5 fl" type="input" placeholder="http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git"><%=@repository.type.to_s=="Repository::Gitlab" ? @repos_url.to_s.lstrip : @repository.url %></textarea>
+      <textarea id="copy_rep_content" class="cloneUrl mt5 fl" type="input" ><%=@repository.type.to_s=="Repository::Gitlab" ? @repos_url.to_s.lstrip : @repository.url %></textarea>
       <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
       <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
       <!--<div class="fr mt5"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_fork"></span>Fork</a> <span href="javascript:void(0);" class="vl_btn_2 fb">0</span> </div>-->
-
-      <div class="fr mt5"><span class="vl_fork"></span><%= link_to "Fork", :controller => 'repositories', :action => 'forked'%>
-        <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span> </div>
+      <% unless User.current.id == @project.user_id %>
+          <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn"%>
+            <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span>
+          </div>
+      <% end %>
       <div class="cl"></div>
       <div class="recordBanner mt10">
         <% if @changesets && !@changesets.empty? %>
@@ -50,12 +52,14 @@
         </span>
 
         <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
-            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font> 提交
-
+            <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project,
+                                            :repository_id => @repository.identifier_param,
+                                            :rev => @rev,:page=>1 ,
+                                            :commit_count =>"#{@changesets_all_count}"} %></font> 提交
         </span>
       </div>
   <% end %>
-</div>
+
 <!--contextual end-->
 
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
@@ -64,14 +68,14 @@
     <%# end %>
     <%= render :partial => 'dir_list' %>
 <% end %>
-<%= render_properties(@properties) %>
+<%#= render_properties(@properties) %>
 
 <!-- 代码修订 -->
-<%= render_properties(@properties) %>
+<%#= render_properties(@properties) %>
 
 
 <a href="https://<%=Setting.host_name %>/forums/1/memos/1232" >如何提交代码</a>
-
+</div>
 <% content_for :header_tags do %>
     <%= stylesheet_link_tag "scm" %>
 <% end %>
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
new file mode 100644
index 000000000..1ec8ed0fa
--- /dev/null
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -0,0 +1,96 @@
+<div id="popbox02">
+  <div>
+    <div class="relateText fl">请添加小组成员</div>
+  </div>
+  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="clickCanel();"></a></div>
+  <div class="cl"></div>
+  <div>
+    <form class="resourcesSearchBox">
+      <input type="text" name="serach" placeholder="输入关键字搜索" class="searchResourcePopup" />
+    </form>
+  </div>
+  <ul class="addMemberC fl" id="all_students_list"></ul>
+  <div class="rightArrow"><img src="/images/course/right-arrow.png" width="16" height="30" /></div>
+  <ul class="addMemberC fr" id="choose_students_list">
+    <li id="choose_student_<%=User.current.id %>"><%=User.current.show_name %>
+      <% unless User.current.user_extensions.student_id == "" %>
+          (<%=User.current.user_extensions.student_id %>)
+      <% end %>
+    </li>
+  </ul>
+  <div class="cl"></div>
+  <div class="courseSendCancel mr15" style="float:right;"><a href="javascript:void(0);" class="sendSourceText" onclick="clickCanel();">取消</a></div>
+  <div class="courseSendSubmit" style="float:right;"><a href="javascript:void(0);" class="sendSourceText" onclick="clickOK()">确定</a></div>
+  <div class="cl"></div>
+</div>
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_stus(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?name='+ e.target.value+'&homework='+<%=@homework.id %>,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询
+    $("input[name='serach']").on('input', function (e) {
+        throttle(search_stus,window,e);
+    });
+
+    function clickOK() {
+        var str="";
+        var show = "合作成员：";
+        var lists = $("#choose_students_list li");
+        if(lists.length > 0) {
+            for(var i=0; i<lists.length; i++) {
+                var id = $(lists[i]).attr("id").replace(/[^0-9]/ig,"");
+                str += id;
+                var show_name = $(lists[i]).html();
+                var index = show_name.indexOf("(");
+                if (index != -1) {
+                    var name = show_name.substring(0,show_name.indexOf("("));
+                } else {
+                    var name = show_name;
+                }
+                show += name;
+                if (i == 0) {
+                    show += "(组长)";
+                }
+                if (i != lists.length -1) {
+                    str += ",";
+                    show += "、";
+                }
+            }
+            $("#group_member_ids").val(str);
+        }
+        hideModal("#popbox02");
+        $("#group_members_show").show().html(show);
+    }
+
+    function delete_student(id) {
+        $("#choose_student_"+id).remove();
+        $("#student_"+id).one("click",function choose_student() {
+            $("#choose_students_list").append("<li id='choose_student_"+id+"' onclick='delete_student("+id+");'>"+$("#student_"+id).html()+"</li>");
+        });
+    }
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?homework='+<%=@homework.id %>,
+            type:'get'
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index cfd9632c2..7398dbee1 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,8 +1,12 @@
 <ul class="hworkUl">
   <li class="hworkList340 hworkH30 width505">
     <span class="HomeworkNameTitle f14 fb fl">作品名称</span>
-    <span class="HomeworkStuTitle f14 fb fl">姓名</span>
-    <span class="HomeworkStuTitle f14 fb fl">学号</span>
+    <% if @homework.homework_type != 3 %>
+        <span class="HomeworkStuTitle f14 fb fl">姓名</span>
+        <span class="HomeworkStuTitle f14 fb fl">学号</span>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
+    <% end %>
   </li>
 
   <li class="hworkList130 hworkH30 fb ml10">
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 4ed0a538a..9988bd6e0 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,8 +1,12 @@
 <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' : 'mr140 ml50'%>">作品名称</span>
-    <span class="c_dark f14 fb fl mr50">姓名</span>
-    <span class="c_dark f14 fb fl">学号</span>
+    <% if @homework.homework_type != 3 %>
+        <span class="c_dark f14 fb fl mr50">姓名</span>
+        <span class="c_dark f14 fb fl">学号</span>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <span class="c_dark f14 fb fl">关联项目</span>
+    <% end %>
   </li>
 
   <li class="hworkList130 hworkH30">
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 2a0962244..641405fe4 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -13,14 +13,22 @@
           </div>
         </li>
         <li>
-          <ul class="mt10 fl">
-            <li class="hworkStName mr10 mt16" title="姓名">
-              <%= student_work.user.show_name%>
-            </li>
-            <li class="hworkStID mt16" title="学号">
-              <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-            </li>
-          </ul>
+          <% if @homework.homework_type != 3 %>
+              <ul class="mt10 fl">
+                <li class="hworkStName mr10 mt16" title="姓名">
+                  <%= student_work.user.show_name%>
+                </li>
+                <li class="hworkStID mt16" title="学号">
+                  <%= 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">
+                <li class="hworkPrName mr10 mt12" title="项目名称">
+                  <%= student_work.project.name %>
+                </li>
+              </ul>
+          <% end %>
         </li>
       </div>
     </ul>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index e336b0282..58f611b55 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -1,6 +1,11 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
 <ul class="hworkListRow" id="student_work_<%= student_work.id%>">
-  <% is_my_work = student_work.user == User.current%>
+  <% if @homework.homework_type != 3 %>
+    <% is_my_work = student_work.user == User.current%>
+  <% else %>
+    <% 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 width525">
     <ul>
       <% if is_my_work%>
@@ -14,14 +19,22 @@
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
-            <ul class="mt10 fl">
-              <li class="hworkStName mr10 mt16" title="姓名">
-                <%= student_work.user.show_name%>
-              </li>
-              <li class="hworkStID mt16" title="学号">
-                <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-              </li>
-            </ul>
+            <% if @homework.homework_type != 3 %>
+                <ul class="mt10 fl">
+                  <li class="hworkStName mr10 mt16" title="姓名">
+                    <%= student_work.user.show_name%>
+                  </li>
+                  <li class="hworkStID mt16" title="学号">
+                    <%= 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">
+                  <li class="hworkPrName mr10 mt12" title="项目名称">
+                    <%= student_work.project.name %>
+                  </li>
+                </ul>
+            <% end %>
           </li>
       <% else%>
           <li class="hworkPortrait mt15 mr10">
@@ -33,14 +46,22 @@
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
-            <ul class="mt10 fl">
-              <li class="hworkStName mr10 mt16" title="姓名">
-                匿名
-              </li>
-              <li class="hworkStID mt16" title="学号">
-                --
-              </li>
-            </ul>
+            <% 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 %>
           </li>
       <% end%>
 
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index fd541c643..fc246ab8b 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -89,6 +89,11 @@
     </li>
   </ul>
 
+  <div id="revise_attachment">
+    <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
+  </div>
+  <div class="cl"></div>
+
   <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
     <%student_work_scores.each do |student_score|%>
         <div id="work_score_<%= student_score.id%>">
@@ -99,4 +104,26 @@
   <!---ping_box end--->
   <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
   <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
+        showModal('ajax-modal', '452px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","46%");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+    function submit_files(){
+        $("#upload_form").submit();
+    }
+    function closeModal(){
+        hideModal($(".uploadBoxContainer"));
+    }
+    function disable_choose(){
+        if ($("#attachments_fields .attachment").size() >= 1) {
+            $("#choose_revise_attach").attr("onclick","return false;").addClass(disable_link);
+        }
+    }
+</script>
diff --git a/app/views/student_work/_relate_project.html.erb b/app/views/student_work/_relate_project.html.erb
new file mode 100644
index 000000000..43f59c9c9
--- /dev/null
+++ b/app/views/student_work/_relate_project.html.erb
@@ -0,0 +1,58 @@
+<div id="popbox02" style="">
+  <span class="f16 fontBlue">关联项目</span>
+  <a href="javascript:void(0);" class="popClose" onclick="clickCanel();"></a>
+  <%=form_tag url_for(:controller=>'student_work',:action=>'student_work_project',:homework=>@homework.id,:user_activity_id=>@user_activity_id,:is_in_course=>@is_in_course,:course_activity =>@course_activity),:id =>'student_work_relate_project',:class=>'resourcesSearchBox',:remote => true do %>
+      <input type="text" name="project" placeholder="输入项目名称进行搜索" class="searchResourcePopup mb10" />
+      <div class="cl"></div>
+      <p id="no_search_result" class="c_red" style="width:220px;display: none">您当前尚未参与任何项目，请先加入项目再关联。</p>
+      <ul id="search_project_list" class="maxHeight100"></ul>
+      <p id="notes" class="c_red"></p>
+      <div class="courseSendSubmit mt10"><a href="javascript:void(0);" class="sendSourceText" onclick="clickOK();">确定</a></div>
+      <div class="courseSendCancel mt10"><a href="javascript:void(0);" class="sendSourceText" onclick="clickCanel();">取消</a></div>
+      <div class="cl"></div>
+  <% end %>
+</div>
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_pros(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_user_projects') %>'+'?name='+ e.target.value,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询项目
+    $("input[name='project']").on('input', function (e) {
+        throttle(search_pros,window,e);
+    });
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_user_projects') %>'+'?first=1',
+            type:'get'
+        });
+    });
+
+    function clickOK() {
+        var radio = $("input[name='projectName']:checked");
+        if(radio.length < 1) {
+            $("#notes").html("请先选择一个项目");
+            return false;
+        } else {
+            $("#student_work_relate_project").submit();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/_revise_attachment.html.erb b/app/views/student_work/_revise_attachment.html.erb
new file mode 100644
index 000000000..968a4853b
--- /dev/null
+++ b/app/views/student_work/_revise_attachment.html.erb
@@ -0,0 +1,28 @@
+<% revise_attachment = work.attachments.where("attachtype = 7").first %>
+<% if @homework.end_time < Date.today %>
+    <% if revise_attachment && @is_teacher %>
+        <div class="resubAtt mb15">
+          <span class="resubTitle">追加修订附件</span>
+        </div>
+        <div class="mb10">
+          <span class="tit_fb"> 追加附件：</span>
+          <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 2} %>
+          <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)
+        </div>
+    <% end %>
+    <% if work.user == User.current %>
+        <div class="resubAtt mb15">
+          <span class="resubTitle">追加修订附件</span>
+        </div>
+        <% if revise_attachment %>
+            <div class="mb10">
+              <span class="tit_fb"> 追加附件：</span>
+              <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 1} %>
+              <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>
+            </div>
+        <% end %>
+        <div class="mb10">
+          <a href="javascript:void(0);" onclick="show_upload();" class="blueCir ml5" title="请选择文件上传">上传附件</a>
+        </div>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/_revise_attachments.html.erb b/app/views/student_work/_revise_attachments.html.erb
deleted file mode 100644
index 1321da368..000000000
--- a/app/views/student_work/_revise_attachments.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="fl">
-  <div class="cl"></div>
-  <span style="font-weight:normal;">
-    <a href="javascript:void(0);" class="blueCir ml5" onclick="$('#_file<%=work.id %>').click();">上传附件</a>
-    <%#= button_tag "上传附件", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'blueCir ml5' %>
-    <%= file_field_tag 'attachments[dummy][file]',
-                       :id => "_file#{work.id}",
-                       :class => 'file_selector',
-                       :multiple => true,
-                       :onchange => "addReviseFiles(this, '#{work.id}');",
-                       :style => '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),
-                               :containerid => "#{work.id}"
-                       } %>
-  </span>
-  <% content_for :header_tags do %>
-      <%= javascript_include_tag 'attachments' %>
-  <% end %>
-</div>
-
diff --git a/app/views/student_work/_set_score_rule.html.erb b/app/views/student_work/_set_score_rule.html.erb
index 26e3b06cb..ce6f12eb8 100644
--- a/app/views/student_work/_set_score_rule.html.erb
+++ b/app/views/student_work/_set_score_rule.html.erb
@@ -3,7 +3,7 @@
         <% render :partial => 'student_work/set_score_rule_detail', :locals => {:homework => homework, :f => f}%>
     <% end%>
 <% else %>
-    <%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course},:method => "post",:remote => true) do |f|%>
+    <%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity},:method => "post",:remote => true) do |f|%>
         <% render :partial => 'student_work/set_score_rule_detail', :locals => {:homework => homework, :f => f}%>
     <% end%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index 894f9fb39..801c252cb 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -1,5 +1,12 @@
 <div class="show_hwork_arrow"></div>
 <div class="showHwork">
+  <% is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin? %>
+  <% if @homework.homework_type != 3 %>
+      <% is_my_work = work.user == User.current%>
+  <% else %>
+      <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+      <% is_my_work = pro && pro.student_work_id == work.id%>
+  <% end %>
   <ul>
     <li class="fl" >
       <span class="tit_fb">上交时间：</span>
@@ -15,7 +22,7 @@
           <%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
         </li>
     <% end%>
-    <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
+    <% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %>
         <!-- 匿评结束阶段，显示点赞按钮 -->
         <li class="fr" id="student_work_praise_<%= work.id%>">
           <%= render :partial => 'student_work_praise' %>
@@ -25,11 +32,24 @@
 
     <!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>-->
 
-    <% if work.project%>
-        <li >
-          <span class="tit_fb"> 关联项目：</span>
-          <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+    <% if @homework.homework_type == 3 && work.student_work_projects && (@homework.homework_detail_manual.comment_status != 2 || is_my_work || is_teacher ) %>
+        <div class="cl"></div>
+        <li>
+          <span class="tit_fb"> 参与人员：</span>
+          <%= link_to(work.user.show_name+"（组长）", user_path(work.user.id), :class => "linkBlue" )%>
+          <% members = work.student_work_projects.where("is_leader = 0") %>
+          <% members.each do |member| if !members.empty? %>
+            、<%=link_to((User.find member.user_id).show_name, user_path(member.user.id), :class => "linkBlue" ) %>
+          <% end %>
+          <% end %>
         </li>
+        <% if @homework.homework_detail_group.base_on_project == 1 %>
+            <li>
+              <span class="tit_fb"> 关联项目：</span>
+              <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+              <span class="ml5">(综合评分：<font class="c_red"><%=work.project.project_score.score.to_i %></font>)</span>
+            </li>
+        <% end %>
     <% end%>
 
     <li >
@@ -41,17 +61,18 @@
     </li>
     <li >
       <span class="tit_fb"> 附件：</span>
-      <% if work.attachments.empty?%>
+      <% com_attachments = work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
+      <% if com_attachments.empty?%>
           <span style="color: #999999">尚未提交附件</span>
       <% else%>
           <div class="fl" style="width: 90%;">
-            <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments, :status => @homework.homework_detail_manual.comment_status} %>
+            <%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %>
           </div>
       <% end%>
       <div class="cl"></div>
     </li>
     <li >
-      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
+      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && !is_my_work)%>
           <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
           <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
             <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
@@ -61,30 +82,10 @@
     </li>
   </ul>
 
-  <!--<div class="resubAtt">
-    <span class="resubTitle">追加修订附件</span>
+  <div id="revise_attachment">
+    <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
   </div>
-  <div class="mt15">
-    <span class="tit_fb"> 追加附件：</span>
-    <a href="javascript:void(0);" class="link_file fl" >socket实验-123456-王强revise.zip</a>
-    <span id="attachments_fields<%= work.id%>" xmlns="http://www.w3.org/1999/html">
-      <span id="attachments_p<%= work.id %>">-->
-          <%#= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename link_file', :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')%>
-        <%#= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %>
-        <%#= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-        <!--</span>
-    </span>
-    <span class="ml5">(123KB)</span><br />
-    <span class="tit_fb">追加时间：</span>2015-12-03 11:00&nbsp;&nbsp;(此时其他同学作品尚未公开)
-  </div>
-  <div class="mt5">
-    <%#= render :partial => 'student_work/revise_attachments', :locals => {:work => work } %>
-    <a href="javascript:void(0);" class="blueCir ml5" title="请选择文件上传">上传附件</a>
-  </div>
-  <div class="cl"></div>-->
+  <div class="cl"></div>
 
   <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
     <%student_work_scores.each do |student_score|%>
@@ -96,4 +97,26 @@
   <!---ping_box end--->
   <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
   <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
+        showModal('ajax-modal', '452px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","46%");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+    function submit_files(){
+        $("#upload_form").submit();
+    }
+    function closeModal(){
+        hideModal($(".uploadBoxContainer"));
+    }
+    function disable_choose(){
+        if ($("#attachments_fields .attachment").size() >= 1) {
+            $("#choose_revise_attach").attr("onclick","return false;").addClass(disable_link);
+        }
+    }
+</script>
\ 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 e9b056c84..5598092e9 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -40,12 +40,17 @@
     <% end%>
     <div class="cl"></div>
     <div id="about_hwork_<%= student_work.id%>">
-      <% if student_work.user == User.current && !@is_evaluation %>
+      <% if @homework.homework_type != 3 && student_work.user == User.current && !@is_evaluation %>
         <% if @homework.homework_type == 2%>
             <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
         <% else %>
             <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
         <% end %>
+      <% elsif @homework.homework_type == 3 %>
+          <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+          <% if pro && pro.student_work_id == student_work.id && !@is_evaluation %>
+            <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
+          <% end %>
       <% end %>
     </div>
     <div class="cl"></div>
diff --git a/app/views/student_work/_upload_attachment.html.erb b/app/views/student_work/_upload_attachment.html.erb
new file mode 100644
index 000000000..d9c69fc17
--- /dev/null
+++ b/app/views/student_work/_upload_attachment.html.erb
@@ -0,0 +1,50 @@
+<!--<div class="resourceUploadPopup">-->
+<span class="uploadDialogText">上传附件</span>
+<!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
+<div class="uploadBoxContainer">
+  <%= form_tag(revise_attachment_student_work_path(work.id), :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
+      <div>
+        <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+        </span>
+      </div>
+      <div class="uploadBox" id="uploadReviseBox">
+        <input type="hidden" name="attachment_type" value="7">
+        <a href="javascript:void(0);" class="uploadIcon f14" name="button" id="choose_revise_attach"  onclick="_file.click();" onmouseover="" style="<%= ie8? ? 'display:none' : ''%>">
+          <span class="chooseFile">选择文件</span></a>
+        <%= file_field_tag 'attachments[dummy][file]',
+                           :id => '_file',
+                           :class => ie8? ? '':'file_selector',
+                           :multiple => true,
+                           :onchange => 'addReviseInputFiles(this,"'+'upload_files_submit_btn'+'");',
+                           :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)
+                           } %>
+        <div class="cl"></div>
+        <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
+        <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
+      </div>
+      <div class="uploadResourceIntr">
+        <div class="uploadResourceName">最多只能上传一个小于<span class="c_red">50MB</span>的附件</div>
+      </div>
+      <div class="cl"></div>
+      <div style="margin-top: 10px" >
+        <div class="courseSendSubmit">
+          <%= submit_tag '确定',:onclick=>'submit_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
+        </div>
+        <div class="courseSendCancel">
+          <a href="javascript:void(0);" id="upload_files_cancle_btn" class="sendSourceText" onclick="closeModal();">取消</a>
+        </div>
+      </div>
+  <% end %>
+</div>
+  <div class="cl"></div>
diff --git a/app/views/student_work/_work_edit_information.html.erb b/app/views/student_work/_work_edit_information.html.erb
new file mode 100644
index 000000000..38670d9e4
--- /dev/null
+++ b/app/views/student_work/_work_edit_information.html.erb
@@ -0,0 +1,33 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
+    <p class="f14 mt5">
+      <span class="fb">作品名称：</span><%=@student_work.name%>
+    </p>
+    <p class="f14 mt5">
+      <span class="fb">作品描述：</span><%=@student_work.description%>
+    </p>
+    <p class="mt5">
+      <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
+      <% if @student_work.attachments.empty? %>
+          <span class="fl c_red"><%= "无附件"%></span>
+      <% else %>
+          <div class="fl grey_c">
+            <%= render :partial => 'work_attachments_status', :locals => {:attachments => @student_work.attachments, :status => 2} %>
+          </div>
+      <% end %>
+      </p>
+      <div class="cl"></div>
+      <div class="ni_btn mt10">
+        <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px; margin-left: 55px;" >
+          确&nbsp;&nbsp;定
+        </a>
+      </div>
+      </div>
+</div>
+
+<script type="text/javascript">
+    function clickOK() {
+        window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/cancel_relate_project.js.erb b/app/views/student_work/cancel_relate_project.js.erb
new file mode 100644
index 000000000..3aa853a00
--- /dev/null
+++ b/app/views/student_work/cancel_relate_project.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,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% else%>
+$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index d506b5542..bfdf8c316 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -48,7 +48,7 @@
         </div>
 
         <div id="homework_attachments">
-          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false} %>
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false,:has_group=>false} %>
         </div>
 
         <div class="mt5">
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index ee0dd7e9b..c3a61d4c8 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -34,6 +34,44 @@
           )
       }
   }
+  // 添加组成员
+  function show_group_member() {
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/choose_group_member',:locals => {:homework=>@homework}) %>');
+      showModal('ajax-modal', '528px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').parent().css("top","").css("left","");
+      $('#ajax-modal').parent().addClass("addMemberCP");
+  }
+  // 关联项目
+  function show_project() {
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/relate_project',:locals => {:homework=>@homework}) %>');
+      showModal('ajax-modal', '320px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').parent().css("top","").css("left","");
+      $('#ajax-modal').parent().addClass("groupPopUp");
+  }
+  // 作品校验
+  function popupRegex(){
+      if(regexStudentWorkName()&&regexStudentWorkDescription())
+      {
+          if($("#group_member_ids").length > 0) {
+              if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
+                  $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+                  showModal('ajax-modal', '500px');
+                  $('#ajax-modal').siblings().remove();
+                  $('#ajax-modal').parent().css("top","").css("left","");
+                  $('#ajax-modal').parent().addClass("anonymos");
+              }
+          } else {
+              $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+              showModal('ajax-modal', '500px');
+              $('#ajax-modal').siblings().remove();
+              $('#ajax-modal').parent().css("top","").css("left","");
+              $('#ajax-modal').parent().addClass("anonymos");
+          }
+      }
+  }
+
 </script>
 
 <div class="homepageRightBanner mb10">
@@ -78,7 +116,11 @@
           提示：作品名称和描述中不要出现真实的姓名信息
         </div>
         <div class="cl"></div>
-
+        <% if @homework.homework_type == 3 %>
+            <span id="min_num_member" style="display: none"><%=@homework.homework_detail_group.min_num %></span>
+            <span id="max_num_member" style="display: none"><%=@homework.homework_detail_group.max_num %></span>
+            <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>User.current.id %>
+        <% end %>
         <div>
           <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请简洁的概括作品的功能或特性", :onkeyup => "regexStudentWorkName();" %>
           <div class="cl"></div>
@@ -95,20 +137,29 @@
         </div>
 
         <div id="homework_attachments">
-          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false} %>
         </div>
-
-        <div class="mt5 fl">
-          <a href="javascript:void(0);" class="RalationIcon fl  mt3" onclick="show_project();">关联项目</a>
+        <div id="group_member">
         </div>
-        <div class="cl"></div>
+        <div id="relate_project">
+        </div>
+
+        <% if @homework.homework_type == 3 %>
+            <div class="mt5 fl">
+              <a href="javascript:void(0);" class="memberBtn fl mt3 mr15" title="请添加小组的其他成员" onclick="show_group_member();">合作成员</a>
+            </div>
+        <% end %>
 
-        <div class="mt10 none" id="about_project">
-          <%= select_tag :project_id, options_for_select(user_projects_option, @student_work.project_id), {:class => "InputBox  W680 fl"} %>
+        <!--<div class="mt5 fl">
+            <a href="javascript:void(0);" class="RalationIcon fl  mt3" title="请选择作业的关联项目" onclick="show_project();">关联项目</a>
+        </div>-->
+
+        <!--<div class="mt10 none" id="about_project">
+          <%#= select_tag :project_id, options_for_select(user_projects_option, @student_work.project_id), {:class => "InputBox  W680 fl"} %>
           <%#=link_to "", new_project_path, :class => "ml5 mt5 SetUpIcon fl", :title => "快速创建"%>
           <a class=" ml5 mt5 SetUpIcon fl" href="javascript:void(0)" title="快速创建" onclick="new_project();"></a>
           <div class="cl"></div>
-        </div>
+        </div>-->
 
         <div class="mt5">
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">提交</a>
@@ -118,16 +169,4 @@
         <div class="cl"></div>
     <% end%>
   </div><!----HomeWorkCon end-->
-</div>
-<script type="text/javascript">
-  function popupRegex(){
-      if(regexStudentWorkName()&&regexStudentWorkDescription())
-      {
-          $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-          showModal('ajax-modal', '500px');
-          $('#ajax-modal').siblings().remove();
-          $('#ajax-modal').parent().css("top","").css("left","");
-          $('#ajax-modal').parent().addClass("anonymos");
-      }
-  }
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/student_work/new_student_work_project.js.erb b/app/views/student_work/new_student_work_project.js.erb
new file mode 100644
index 000000000..51df45f13
--- /dev/null
+++ b/app/views/student_work/new_student_work_project.js.erb
@@ -0,0 +1,5 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/relate_project') %>');
+showModal('ajax-modal', '320px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("groupPopUp");
\ No newline at end of file
diff --git a/app/views/student_work/retry_work.js.erb b/app/views/student_work/retry_work.js.erb
index c5fca76d4..c6f354875 100644
--- a/app/views/student_work/retry_work.js.erb
+++ b/app/views/student_work/retry_work.js.erb
@@ -1,2 +1,2 @@
 hideModal('#popbox02');
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false})%>");
\ No newline at end of file
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false})%>");
\ No newline at end of file
diff --git a/app/views/student_work/revise_attachment.js.erb b/app/views/student_work/revise_attachment.js.erb
new file mode 100644
index 000000000..74813d27b
--- /dev/null
+++ b/app/views/student_work/revise_attachment.js.erb
@@ -0,0 +1,2 @@
+closeModal();
+$("#revise_attachment").html('<%= escape_javascript( render :partial => 'revise_attachment' ,:locals=>{ :work => @work})%>');
\ No newline at end of file
diff --git a/app/views/student_work/search_course_students.js.erb b/app/views/student_work/search_course_students.js.erb
new file mode 100644
index 000000000..fb595e51f
--- /dev/null
+++ b/app/views/student_work/search_course_students.js.erb
@@ -0,0 +1,33 @@
+$("#all_students_list").empty();
+<% @users.each do |user|%>
+    var link = "<li id='student_<%=user.id %>'><%=user.show_name %>";
+    <% unless user.user_extensions.student_id == "" %>
+        link += "(<%=user.user_extensions.student_id %>)";
+    <% end %>
+    link += "</li>";
+    $("#all_students_list").append(link);
+
+    var str = "";
+    var lists = $("#choose_students_list li");
+    if(lists.length > 0) {
+        for(var i=0; i<lists.length; i++) {
+            var id = $(lists[i]).attr("id").replace(/[^0-9]/ig,"");
+            str += id;
+            if (i != lists.length -1) {
+                str += ",";
+        }
+    }
+}
+    <% if user.id.to_i != User.current.id.to_i %>
+        if (str.indexOf(<%=user.id.to_s %>) < 0) {
+            $("#student_<%=user.id %>").one("click",function choose_student() {
+                var li = "<li id='choose_student_<%=user.id %>'";
+                <% if user.id.to_i != User.current.id.to_i %>
+                    li += " onclick='delete_student(<%=user.id %>);'";
+                <% end %>
+                li += ">" + $("#student_<%=user.id %>").html()+"</li>";
+                $("#choose_students_list").append(li);
+            });
+        }
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/search_user_projects.js.erb b/app/views/student_work/search_user_projects.js.erb
new file mode 100644
index 000000000..7751821a5
--- /dev/null
+++ b/app/views/student_work/search_user_projects.js.erb
@@ -0,0 +1,9 @@
+<% if @first == 1 && @project_ids.empty? %>
+    $("#no_search_result").show();
+<% else %>
+    $("#search_project_list").html("");
+    <% @project_ids.each do |project|%>
+    link = "<li><label><input type='radio' class='courseSendCheckbox' name='projectName' value='<%=project.id%>'/><span class='sendCourseName'> <%=project.name %> </span></label></li>";
+    $("#search_project_list").append(link );
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/set_score_rule.js.erb b/app/views/student_work/set_score_rule.js.erb
index ff3a0e7ed..b33610089 100644
--- a/app/views/student_work/set_score_rule.js.erb
+++ b/app/views/student_work/set_score_rule.js.erb
@@ -1,6 +1,6 @@
 clickCanel();
 <% if @user_activity_id %>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
     init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
 <% else %>
     $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
diff --git a/app/views/student_work/student_work_project.js.erb b/app/views/student_work/student_work_project.js.erb
new file mode 100644
index 000000000..405dccca4
--- /dev/null
+++ b/app/views/student_work/student_work_project.js.erb
@@ -0,0 +1,8 @@
+hideModal("#popbox02");
+<% if @user_activity_id != -1 %>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% else%>
+    $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
+    init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/update.js.erb b/app/views/student_work/update.js.erb
index 79733db31..f485cb8cc 100644
--- a/app/views/student_work/update.js.erb
+++ b/app/views/student_work/update.js.erb
@@ -1,5 +1,5 @@
 <% if @submit_result%>
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_edit_information') %>');
 showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index d02cea104..b38a17bea 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -44,7 +44,27 @@
               <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
+      <div class="cl"></div>
+      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
+          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+      <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
+          <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
+      <% end %>
       <div class="homepagePostSubmitContainer">
+        <% if activity.homework_type == 3 && !is_teacher && activity.homework_detail_group.base_on_project == 1 %>
+            <% projects = cur_user_projects_for_homework activity %>
+            <% works = cur_user_works_for_homework activity %>
+            <% if works.nil? && projects.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目' %>
+                  <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
+                </div>
+            <% elsif works.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %>
+                </div>
+            <% end %>
+        <% end %>
         <div class="homepagePostSubmit">
           <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
           <%= user_for_homework_common activity,is_teacher %>
@@ -77,6 +97,26 @@
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
         <div class="cl"></div>
       </div>
+      <% if activity.homework_type == 3 && !activity.student_work_projects.empty? && activity.homework_detail_group.base_on_project == 1 %>
+      <div class="mt10">
+        <div class="fl mr5 fontGrey3">
+          <!--<img src="/images/course/proRelated.png" width="25" height="25" class="borderRadius mt7 ml7" title="已关联项目" />-->
+          已关联项目：
+        </div>
+        <% activity.student_work_projects.where("is_leader = 1").each do |pro| %>
+            <div class="mr10 mb10 fl">
+              <% project = Project.find pro.project_id || User.current.member_of?(project) || User.current.admin? %>
+              <% if project.is_public || project.user_id == User.current.id %>
+                <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:alt =>"项目头像" %>
+              <% else %>
+                <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
+              <% end %>
+              <p class="c_red tac" title="综合评分"><%=project.project_score.score.to_i %></p>
+            </div>
+        <% end %>
+      </div>
+      <% end %>
+      <div class="cl"></div>
       <% if is_teacher%>
           <% comment_status = activity.homework_detail_manual.comment_status %>
           <div class="homepagePostSetting">
@@ -90,7 +130,7 @@
                     <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
-                    <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => 0),:class => "postOptionLink", :remote => true) %>
+                    <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true) %>
                   </li>
                   <% if activity.anonymous_comment == 0 %>
                       <li>
@@ -142,7 +182,7 @@
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
                   </div>
@@ -154,6 +194,12 @@
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
+                      <div id="message_edit_<%=comment.id %>" style="display: none" class="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 class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
new file mode 100644
index 000000000..aa8166a04
--- /dev/null
+++ b/app/views/users/_user_group_attr.html.erb
@@ -0,0 +1,31 @@
+<span class="f16 fontBlue">分组设置</span>
+<a href="javascript:void(0);" class="popClose" title="关闭弹框"></a>
+<div class="mt10">
+  <span class="f14 fontGrey3 mr5">每组最小人数：</span>
+  <input id="min_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.min_num : 2 %>" />人
+</div>
+<div class="mt10">
+  <span class="f14 fontGrey3 mr5">每组最大人数：</span>
+  <input id="max_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.max_num : 10 %>" />人
+</div>
+<div class="mb10 mt10">
+  <label>
+    <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 0 %>" id="base_on_project"/>
+    <span class="f14 fontGrey3 mr10">是否基于项目实施</span>
+  </label>
+  <p class="c_red">提醒：勾选后各小组必须在Trustie平台创建项目，教师可随时观察平台对各小组最新进展的实时统计。</p>
+</div>
+<div class="courseSendSubmit">
+  <a href="javascript:void(0);" class="group_btn sendSourceText">确定</a>
+</div>
+<div class="courseSendCancel">
+  <a href="javascript:void(0);" class="sendSourceText linkGrey6" id="cancel_group">取消</a>
+</div>
+<div class="cl"></div>
+<script type="text/javascript">
+  $(function(){
+      if($.trim($("#base_on_project").val()) == 1) {
+          $("#base_on_project").attr('checked','checked');
+      }
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 24d37ae63..7aefbd0b0 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -43,16 +43,38 @@
                              :lebel_file_uploding => l(:lebel_file_uploding),
                              :delete_all_files => l(:text_are_you_sure_all)
                      } %>
+  <span class="fl fontGrey2 group_detail_info"></span>
+  <div class="cl"></div>
+  <span class="fl fontGrey2" id="group_members"></span>
+  <div class="cl"></div>
+  <% if @homework && @homework.homework_type == 3 %>
+    <sapn class="fl fontGrey2" id="group_members_show">
+      合作成员：<%=User.current.show_name %>(组长)
+    </sapn>
+    <span id="student_work_group_textarea" class="ml10 c_red fl"></span>
+  <% end %>
+  <div class="cl"></div>
+  <span class="fl fontGrey2" id="relate_project_show">
+    <% if @homework %>
+        <% unless @homework.student_work_projects.where("user_id = #{User.current.id}").empty? %>
+            <% project = Project.find @homework.student_work_projects.where("user_id = #{User.current.id}").first.project_id %>
+            关联项目：<%=project.name %>
+        <% end %>
+    <% end %>
+  </span>
 </div>
 <div class="cl"></div>
 
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
-  <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr20" onclick="$('#_file').click();">上传附件</a>
-  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr20",:remote => true%>
+  <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
+  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr15",:title=>"请从资源库中选择文件作为作品的附件",:remote => true%>
   <% if defined?(has_program) && has_program %>
-    <a href="javascript:void(0);" class="ProBtn fl mt3">编程</a>
-    <span class="fl C_lgrey mt3 program_detail_info"></span>
+    <a href="javascript:void(0);" class="ProBtn fl mt3" title="请设置编程语言和输入测试集">编程</a>
+    <span class="fl C_lgrey mt3 program_detail_info mr15"></span>
+  <% end %>
+  <% if defined?(has_group) && has_group %>
+    <a href="javascript:void(0);" class="groupBtn fl mt3" title="请设置分组作业的相关参数">分组</a>
   <% end %>
 </div>
 
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 539b8b603..57fe57c07 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -44,8 +44,25 @@
               <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
-
+      <div class="cl"></div>
+      <% if homework_common.homework_type == 3%>
+          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+      <% end %>
       <div class="homepagePostSubmitContainer">
+        <% if homework_common.homework_type == 3 && !is_teacher && homework_common.homework_detail_group.base_on_project == 1%>
+            <% projects = cur_user_projects_for_homework homework_common %>
+            <% works = cur_user_works_for_homework homework_common %>
+            <% if works.nil? && projects.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework_common.id,:is_in_course=>is_in_course,:user_activity_id=>-1,:course_activity=>-1),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目' %>
+                  <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
+                </div>
+            <% elsif works.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => homework_common.id,:is_in_course=>is_in_course,:user_activity_id=>-1,:course_activity=>-1), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %>
+                </div>
+            <% end %>
+        <% end %>
         <div class="homepagePostSubmit">
           <%= user_for_homework_common homework_common,is_teacher %>
         </div>
@@ -82,6 +99,26 @@
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
         <div class="cl"></div>
       </div>
+      <% if homework_common.homework_type == 3 && !homework_common.student_work_projects.empty?  && homework_common.homework_detail_group.base_on_project == 1 %>
+          <div class="mt10">
+            <div class="fl mr5 fontGrey3">
+              <!--<img src="/images/course/proRelated.png" width="25" height="25" class="borderRadius mt7 ml7" title="已关联项目" />-->
+              已关联项目：
+            </div>
+            <% homework_common.student_work_projects.where("is_leader = 1").each do |pro| %>
+                <div class="mr10 mb10 fl">
+                  <% project = Project.find pro.project_id %>
+                  <% if project.is_public == 1 || User.current.member_of?(project) || User.current.admin? %>
+                      <%=link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name) %>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
+                  <% end %>
+                  <p class="c_red tac" title="综合评分"><%=project.project_score.score.to_i %></p>
+                </div>
+            <% end %>
+          </div>
+      <% end %>
+      <div class="cl"></div>
       <% if is_teacher%>
           <% comment_status = homework_common.homework_detail_manual.comment_status%>
           <div class="homepagePostSetting">
@@ -95,7 +132,7 @@
                     <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => is_in_course,:course_activity=>-1),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
-                    <%= link_to("评分设置", score_rule_set_homework_common_path(homework_common, :is_in_course => is_in_course),:class => "postOptionLink", :remote => true) %>
+                    <%= link_to("评分设置", score_rule_set_homework_common_path(homework_common, :is_in_course => is_in_course,:course_activity=>-1),:class => "postOptionLink", :remote => true) %>
                   </li>
                   <% if homework_common.anonymous_comment == 0 &&(comment_status == 0 || comment_status == 1)%>
                     <li>
@@ -149,7 +186,7 @@
                     });
                 </script>
                 <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
                   </div>
@@ -161,6 +198,12 @@
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
+                      <div class="fr" id="message_edit_<%=comment.id %>" style="display: none">
+                          <% 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))  %>
+                          <% end %>
+                      </div>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index cfc098645..40c8ac5bd 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -4,6 +4,9 @@
     <script type="text/javascript">
       $(function(){
         $("#BluePopupBox a.BlueCirBtn").click();
+        <% if edit_mode && homework.is_group_homework? %>
+            $("#GroupPopupBox a.group_btn").click();
+        <% end %>
       });
     </script>
 <% end %>
@@ -54,7 +57,7 @@
 
     <div id="homework_attachments">
       <!-- 编辑作业 && 作业类型为匿评作业   时没有编程选项-->
-      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type == 1)} %>
+      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type != 2), :has_group=>!(edit_mode && homework.homework_type != 3)} %>
     </div>
 
 
@@ -97,7 +100,18 @@
   </div>
 </script>
 
-
+<script id="t:group-input-list" type="text/html">
+  <div class="group-input">
+    <input type="hidden" name="min_num" value="<!= min_num !>" />
+    <input type="hidden" name="max_num" value="<!= max_num !>" />
+    <input type="hidden" name="base_on_project" value="<!= base_on_project !>" />
+  </div>
+</script>
+  
 <div class="BluePopupBox" id="BluePopupBox" style="display:none">
   <%= render :partial => 'users/user_programing_attr', :locals => {:edit_mode => edit_mode, :homework=>homework} %>
 </div><!----BluePopupBox end-->
+
+<div class="BluePopupBox" style="display:none" id="GroupPopupBox">
+  <%= render :partial => 'users/user_group_attr', :locals => {:edit_mode => edit_mode, :homework=>homework}%>
+</div>
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 121450d4d..7be803720 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -4,7 +4,7 @@
       $("#homework_publish_time").val("");
       $("#homework_end_time").val("");
       $("#course_id").val($("#option_select").val());
-      $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
+      $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true })%>");
       homework_description_editor.html("");
       $("#homework_editor").toggle();
   }
diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index 1d9cc8d70..cd94a6816 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -5,7 +5,7 @@ $("#homework_end_time").val("<%= @homework.end_time%>");
 <% if @select_course == "0"%>
     $("#course_id").val("<%= @homework.course_id%>");
 <% end%>
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true })%>");
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true,:has_group => true })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
 $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
 //$("input[name='homework_type']").val("<%#= @homework.homework_type%>");
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index c138a7ea7..7194a16a4 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -1,6 +1,6 @@
 <% if @journal_destroyed.nil? %>
 	alert('<%=l(:notice_failed_delete)%>');
-<% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication'].include? @journal_destroyed.jour_type)%>
+<% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication','HomeworkCommon'].include? @journal_destroyed.jour_type)%>
   <% if @is_user%>
     var destroyedItem = $('#<%=@journal_destroyed.id%>');
     destroyedItem.fadeOut(600,function(){
@@ -13,6 +13,14 @@
         $('#course_jour_count').html("(<%= @jours_count %>)");
       <% elsif @user && @jours_count%>
         $('#jour_count').html("<%= @jours_count %>");
+      <% elsif @homework%>
+        <% if @user_activity_id == -1 %>
+            $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+            init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+        <% else %>
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+            init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+        <% end %>
       <% end %>
       var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
       destroyedItem.fadeOut(600,function(){
diff --git a/config/locales/mailers/zh.yml b/config/locales/mailers/zh.yml
index 1d432cbff..7b56011b1 100644
--- a/config/locales/mailers/zh.yml
+++ b/config/locales/mailers/zh.yml
@@ -26,6 +26,6 @@ zh:
   mail_attention: "请您关注!"
   mail_homework_endtime: "作业截止时间快到了！"
   mail_homework: "作业："
-  mail_anonymous_comment_close: "作业匿评已经关闭！"
-  mail_anonymous_comment_open: "作业匿评已经开启！"
-  mail_anonymous_comment_failed: "作业匿评开启失败!"
\ No newline at end of file
+  mail_anonymous_comment_close: "作业匿评已经关闭，请您关注！"
+  mail_anonymous_comment_open: "作业匿评已经开启，请您关注！"
+  mail_anonymous_comment_failed: "作业匿评开启失败，请您关注!"
\ No newline at end of file
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index aebdebd2c..3f86b4b60 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -91,6 +91,7 @@ zh:
   project_gitlab_create_repository: 新版本库
   project_gitlab_create_double_message: 亲，您已经创建了一个同名的版本库，换个特别点的名字同名的概率就会变小哦~
   project_gitlab_fork_double_message: 亲，您已经有了一个相同名字的版本库，所以不能fork改版本库~
+  project_gitlab_fork_own: 您好，您当前所fork的项目为您自己创建的项目，平台暂时不提供fork自己项目的功能，敬请谅解！
 
 
   label_project_more: 更多
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ea172b554..7ccbb8410 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -387,6 +387,7 @@ zh:
   label_organization_list: 组织列表
   label_school_plural: 学校列表
   label_organization_new: 新建组织
+  label_edit_organization: 编辑组织
   label_organization_edit: 修改组织
   label_project_plural: 项目列表
 
diff --git a/config/routes.rb b/config/routes.rb
index 623a42f38..0ef113d18 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -36,6 +36,7 @@ RedmineApp::Application.routes.draw do
       get 'setting'#, :action => 'settings', :as => 'settings'
       get 'clear_org_avatar_temp'
       put 'set_homepage'
+      put 'cancel_homepage'
       get 'members'
       get 'more_org_projects'
       get 'more_org_courses'
@@ -69,6 +70,10 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  resources :org_subfields do
+
+  end
+
   resources :org_document_comments do
     member do
       post 'add_reply'
@@ -206,12 +211,18 @@ RedmineApp::Application.routes.draw do
   resources :student_work do
     member do
       post 'add_score'
+      post 'revise_attachment'
       get 'retry_work'
       get 'praise_student_work'
       get 'forbidden_anonymous_comment'
     end
     collection do
       post 'add_score_reply'
+      post 'student_work_project'
+      get 'new_student_work_project'
+      get 'search_user_projects'
+      get 'search_course_students'
+      get 'cancel_relate_project'
       get 'delete_work'
       get 'destroy_score_reply'
       get 'student_work_absence_penalty'
diff --git a/db/migrate/20151130032658_create_org_docume_editor.rb b/db/migrate/20151130032658_create_org_docume_editor.rb
new file mode 100644
index 000000000..0dc9857ba
--- /dev/null
+++ b/db/migrate/20151130032658_create_org_docume_editor.rb
@@ -0,0 +1,12 @@
+class CreateOrgDocumeEditor < ActiveRecord::Migration
+  def up
+    create_table :editor_of_documents do |t|
+      t.integer :editor_id
+      t.integer :org_document_comment_id
+      t.timestamp :created_at
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151130064556_copy_document_created_at_for_editor_of_document.rb b/db/migrate/20151130064556_copy_document_created_at_for_editor_of_document.rb
new file mode 100644
index 000000000..2361db3dd
--- /dev/null
+++ b/db/migrate/20151130064556_copy_document_created_at_for_editor_of_document.rb
@@ -0,0 +1,12 @@
+class CopyDocumentCreatedAtForEditorOfDocument < ActiveRecord::Migration
+  def up
+    OrgDocumentComment.all.each do |doc|
+      if doc.parent.nil?
+        EditorOfDocument.create(:editor_id => doc.creator_id, :org_document_comment_id => doc.id, :created_at => doc.updated_at)
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151202064455_create_homework_detail_groups.rb b/db/migrate/20151202064455_create_homework_detail_groups.rb
new file mode 100644
index 000000000..a77e50f01
--- /dev/null
+++ b/db/migrate/20151202064455_create_homework_detail_groups.rb
@@ -0,0 +1,14 @@
+class CreateHomeworkDetailGroups < ActiveRecord::Migration
+  def change
+    create_table :homework_detail_groups do |t|
+      t.integer :homework_common_id
+      t.integer :min_num
+      t.integer :max_num
+      t.integer :base_on_project
+      t.references :homework_common
+
+      t.timestamps
+    end
+    add_index :homework_detail_groups, :homework_common_id
+  end
+end
diff --git a/db/migrate/20151204030143_create_org_subfields.rb b/db/migrate/20151204030143_create_org_subfields.rb
new file mode 100644
index 000000000..2727cdef0
--- /dev/null
+++ b/db/migrate/20151204030143_create_org_subfields.rb
@@ -0,0 +1,13 @@
+class CreateOrgSubfields < ActiveRecord::Migration
+  def up
+    create_table :org_subfields do |t|
+      t.integer :organization_id
+      t.integer :priority
+      t.string :name
+      t.timestamps
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151208025236_create_student_work_projects.rb b/db/migrate/20151208025236_create_student_work_projects.rb
new file mode 100644
index 000000000..134823377
--- /dev/null
+++ b/db/migrate/20151208025236_create_student_work_projects.rb
@@ -0,0 +1,13 @@
+class CreateStudentWorkProjects < ActiveRecord::Migration
+  def change
+    create_table :student_work_projects do |t|
+      t.integer :homework_common_id
+      t.integer :student_work_id
+      t.integer :project_id
+      t.integer :user_id
+      t.integer :is_leader
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20151208032013_add_index_to_student_work_project.rb b/db/migrate/20151208032013_add_index_to_student_work_project.rb
new file mode 100644
index 000000000..b55c313ff
--- /dev/null
+++ b/db/migrate/20151208032013_add_index_to_student_work_project.rb
@@ -0,0 +1,8 @@
+class AddIndexToStudentWorkProject < ActiveRecord::Migration
+  def change
+    add_index :student_work_projects, :homework_common_id
+    add_index :student_work_projects, :user_id
+    add_index :student_work_projects, :project_id
+    add_index :student_work_projects, :student_work_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6cc6b90c4..4aeed2409 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 => 20151204062220) do
+ActiveRecord::Schema.define(:version => 20151208032013) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -543,23 +543,32 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :force => true do |t|
-    t.string   "IPLineCode"
-    t.string   "Description"
-    t.string   "Num"
-    t.string   "Variable"
-    t.string   "TraceInfo"
-    t.string   "Method"
+  create_table "dts", :primary_key => "Num", :force => true do |t|
+    t.string   "Defect",        :limit => 50
+    t.string   "Category",      :limit => 50
     t.string   "File"
-    t.string   "IPLine"
-    t.string   "Review"
-    t.string   "Category"
-    t.string   "Defect"
-    t.string   "PreConditions"
-    t.string   "StartLine"
+    t.string   "Method"
+    t.string   "Module",        :limit => 20
+    t.string   "Variable",      :limit => 50
+    t.integer  "StartLine"
+    t.integer  "IPLine"
+    t.string   "IPLineCode",    :limit => 200
+    t.string   "Judge",         :limit => 15
+    t.integer  "Review",        :limit => 1
+    t.string   "Description"
+    t.text     "PreConditions", :limit => 2147483647
+    t.text     "TraceInfo",     :limit => 2147483647
+    t.text     "Code",          :limit => 2147483647
     t.integer  "project_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "id",                                  :null => false
+  end
+
+  create_table "editor_of_documents", :force => true do |t|
+    t.integer  "editor_id"
+    t.integer  "org_document_comment_id"
+    t.datetime "created_at"
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -735,6 +744,17 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
 
   add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
 
+  create_table "homework_detail_groups", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "min_num"
+    t.integer  "max_num"
+    t.integer  "base_on_project"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
+
   create_table "homework_detail_manuals", :force => true do |t|
     t.float    "ta_proportion"
     t.integer  "comment_status"
@@ -891,16 +911,6 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"
@@ -970,7 +980,6 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.integer  "course_group_id",   :default => 0
   end
 
-  add_index "members", ["course_id"], :name => "index_members_on_course_id"
   add_index "members", ["project_id"], :name => "index_members_on_project_id"
   add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
   add_index "members", ["user_id"], :name => "index_members_on_user_id"
@@ -1171,6 +1180,14 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.datetime "created_at"
   end
 
+  create_table "org_subfields", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "priority"
+    t.string   "name"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
   create_table "organizations", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1491,6 +1508,21 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.integer  "project_id"
   end
 
+  create_table "student_work_projects", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "student_work_id"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.integer  "is_leader"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
+  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
+  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
+  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
+
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
     t.datetime "created_at",                     :null => false
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index 84082eb9b..585d91737 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -14,14 +14,33 @@ namespace :homework_evaluation do
       if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
         student_works = homework_common.student_works
         if student_works && student_works.size >= 2
-          student_works.each_with_index do |work, index|
-            user = work.user
-            n = homework_detail_manual.evaluation_num
-            n = n < student_works.size ? n : student_works.size - 1
-            assigned_homeworks = get_assigned_homeworks(student_works, n, index)
-            assigned_homeworks.each do |h|
-              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
-              student_works_evaluation_distributions.save
+          if homework_common.homework_type == 3
+            student_work_projects = homework_common.student_work_projects.where("student_work_id is not null")
+            student_work_projects.each_with_index do |pro_work, pro_index|
+              n = homework_detail_manual.evaluation_num
+              n = n < student_works.size ? n : student_works.size - 1
+              work_index = -1
+              student_works.each_with_index do |stu_work, stu_index|
+                if stu_work.id.to_i == pro_work.student_work_id.to_i
+                  work_index = stu_index
+                end
+              end
+              assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
+              assigned_homeworks.each do |h|
+                student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
+                student_works_evaluation_distributions.save
+              end
+            end
+          else
+            student_works.each_with_index do |work, index|
+              user = work.user
+              n = homework_detail_manual.evaluation_num
+              n = n < student_works.size ? n : student_works.size - 1
+              assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+              assigned_homeworks.each do |h|
+                student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+                student_works_evaluation_distributions.save
+              end
             end
           end
           homework_detail_manual.update_column('comment_status', 2)
diff --git a/public/images/course/proRelated.png b/public/images/course/proRelated.png
new file mode 100644
index 000000000..2cc1252cc
Binary files /dev/null and b/public/images/course/proRelated.png differ
diff --git a/public/images/home_logo.png b/public/images/home_logo.png
new file mode 100644
index 000000000..b1270a242
Binary files /dev/null and b/public/images/home_logo.png differ
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index d7b49c8be..b60b6ad28 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -154,6 +154,73 @@ function addFile(inputEl, file, eagerUpload,btnId) {
 }
 addFile.nextAttachmentId = 1;
 
+function addReviseFile(inputEl, file, eagerUpload,btnId) {
+
+    var attachments_frame = '#attachments_fields';
+    if ($(attachments_frame).children().length < 30) {
+        deleteallfiles = $(inputEl).data('deleteAllFiles');
+        var attachmentId = addFile.nextAttachmentId++;
+
+        var fileSpan = $('<span>', {
+            'id': 'attachments_' + attachmentId,
+            'class': 'attachment'
+        });
+
+        fileSpan.append(
+            $('<input>', {
+                'type': 'text',
+                'class': 'upload_filename readonly',
+                'name': 'attachments[' + attachmentId + '][filename]',
+                'readonly': 'readonly'
+            }).val(file.name),
+//            $('<input>', {
+//                'type': 'text',
+//                'class': 'description',
+//                'name': 'attachments[' + attachmentId + '][description]',
+//                'maxlength': 254,
+//                'placeholder': $(inputEl).data('descriptionPlaceholder')
+//            }).toggle(!eagerUpload),
+//            $('<span >' + $(inputEl).data('fieldIsPublic') + ':</span>').attr({
+//                'class': 'ispublic-label'
+//            }),
+//            $('<input>', {
+//                'type': 'checkbox',
+//                'class': 'is_public_checkbox',
+//                'value': 1,
+//                'name': 'attachments[' + attachmentId + '][is_public_checkbox]',
+//                checked: 'checked'
+//            }).toggle(!eagerUpload),
+            $('<a>&nbsp</a>').attr({
+                'href': "#",
+                'class': 'remove-upload'
+            }).click(function() {
+                if (confirm($(inputEl).data('areYouSure'))) {
+                    removeReviseFile();
+                    if (!eagerUpload) {
+                        (function(e) {
+                            reload(e);
+                        })(fileSpan);
+                    }
+                }
+
+            }).toggle(!eagerUpload),
+            $('<div>', {
+                'class': 'div_attachments',
+                'name': 'div_' + 'attachments_' + attachmentId
+            })
+        ).appendTo('#attachments_fields');
+
+        $("#uploadReviseBox").addClass('disable_link');
+        $("#choose_revise_attach").attr("onclick","return false;");
+
+        if (eagerUpload) {
+            ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId);
+        }
+        return attachmentId;
+    }
+    return null;
+}
+
 function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) {
     //上传开始调用函数
     function onLoadstart(e) {
@@ -293,6 +360,13 @@ function removeFile() {
     return false;
 }
 
+function removeReviseFile() {
+    $(this).parent('span').remove();
+    $("#uploadReviseBox").removeClass('disable_link');
+    $("#choose_revise_attach").attr("onclick","_file.click();");
+    return false;
+}
+
 //gcm delete all file
 //modify by yutao 2015-5-14  ��1��ҳ����ڶ���ϴ��ؼ�ʱ�˿�������bug  �ʸ�֮  start
 function removeAll(containerid) {
@@ -346,6 +420,30 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
     });
 }
 
+function addReviseInputFiles(inputEl,btnId) {
+    // var clearedFileInput = $(inputEl).clone().val('');
+    if (inputEl.files) {
+        uploadAndAttachReviseFiles(inputEl.files, inputEl,btnId);
+        //   $(inputEl).remove();
+    } else {
+        // browser not supporting the file API, upload on form submission
+        var attachmentId;
+        var aFilename = inputEl.value.split(/\/|\\/);
+        var count = $('#attachments_fields>span').length;
+        attachmentId = addReviseFile(inputEl, {
+            name: aFilename[aFilename.length - 1]
+        }, false);
+        if (attachmentId) {
+            $(inputEl).attr({
+                name: 'attachments[' + attachmentId + '][file]'
+            }).hide();
+            if (count <= 0) count = 1;
+        }
+    }
+
+    //clearedFileInput.insertAfter('#attachments_fields');
+}
+
 function addInputFiles(inputEl,btnId) {
     // var clearedFileInput = $(inputEl).clone().val('');
     if (inputEl.files) {
@@ -405,6 +503,26 @@ function addInputFiles_board(inputEl, id,btnId) {
     //clearedFileInput.insertAfter('#attachments_fields');
 }
 
+function uploadAndAttachReviseFiles(files, inputEl,btnId) {
+
+    var maxFileSize = $(inputEl).data('max-file-size');
+    var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
+
+    var sizeExceeded = false;
+    $.each(files, function() {
+        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {
+            sizeExceeded = true;
+        }
+    });
+    if (sizeExceeded) {
+        window.alert(maxFileSizeExceeded);
+    } else {
+        $.each(files, function() {
+            addReviseFile(inputEl, this, true,btnId);
+        });
+    }
+}
+
 function uploadAndAttachFiles(files, inputEl,btnId) {
 
     var maxFileSize = $(inputEl).data('max-file-size');
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 15968772f..655847fa1 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -960,13 +960,31 @@ function regexStudentWorkDescription()
     }
 }
 
+function regexStudentWorkMember(min, max) {
+    var members = $.trim($("#group_member_ids").val()).split(',');
+    if ( min <= members.length  && members.length <= max ){
+        $("#student_work_group_textarea").text("");
+        return true;
+    } else {
+        $("#student_work_group_textarea").text("合作成员人数应为:"+min+"-"+max+"人");
+        return false;
+    }
+}
+
 //提交新建作品
 function new_student_work()
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
     {
-        $("#new_student_work").submit();
-        $("#ajax-indicator").hide();
+        if($("#group_member_ids").length > 0) {
+            if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
+                $("#new_student_work").submit();
+                $("#ajax-indicator").hide();
+            }
+        } else {
+            $("#new_student_work").submit();
+            $("#ajax-indicator").hide();
+        }
     }
 }
 
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 468548179..373cce51c 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -124,7 +124,6 @@ $(function(){
         $('#textarea_input_test').focus();
     });
 
-
     var saveProgramAnswers = function() {
         var test_numbers = 0;
         var valid = true;  
@@ -198,6 +197,68 @@ $(function(){
         $(this).parent('.mt10').remove();
     });
 
+    //分组作业
+    $("#GroupPopupBox").dialog({
+        modal: true,
+        autoOpen: false,
+        dialogClass: 'BluePopupBox',
+        minWidth: 290
+    });
+
+    $('a.groupBtn').live('click', function(){
+        $("#GroupPopupBox").dialog("open");
+        $(".ui-dialog-titlebar").hide();
+        $("a.popClose").on('click', function(){
+            $("#GroupPopupBox" ).dialog("close");
+        });
+        $("#cancel_group").on('click', function(){
+            $("#GroupPopupBox" ).dialog("close");
+        });
+        $('#min_num').focus();
+    });
+
+    var saveGroupAttr = function() {
+        var valid = true;
+        var base_on_project = 0;
+        var min = $.trim($("#min_num").val());
+        var max = $.trim($("#max_num").val());
+        if(min.length <= 0) {
+            $("#min_num").focus();
+            valid = false;
+            return false;
+        }
+        if(max.length <= 0) {
+            $("#max_num").focus();
+            valid = false;
+            return false;
+        }
+        if ($("#base_on_project").is(":checked")) {
+            base_on_project = 1;
+        }
+        if (valid) {
+            $("input[name=homework_type]").val(3);
+            $('span.group_detail_info').text('分组人数：'+min+'-'+max+' 人');
+            //保存js值
+            var data = {
+                base_on_project: base_on_project,
+                min_num: min,
+                max_num: max
+            };
+            //构建到form中
+            $('.group-input').remove();
+            var html=bt('t:group-input-list',data);
+            $("input[name=homework_type]").after(html);
+        }
+        return valid;
+    };
+
+    $("#GroupPopupBox a.group_btn").live('click', function(){
+        if(saveGroupAttr()){
+            if($( "#GroupPopupBox" ).dialog( "isOpen" )){
+                $("#GroupPopupBox").dialog( "close" );
+            }
+        }
+    });
 
     //代码编辑器
     if (typeof CodeMirror != "undefined") {
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index a0647b592..d375a90ee 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -251,8 +251,15 @@ function new_student_work()
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
     {
-        $("#new_student_work").submit();
-        $("#ajax-indicator").hide();
+        if($("#group_member_ids").length > 0) {
+            if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
+                $("#new_student_work").submit();
+                $("#ajax-indicator").hide();
+            }
+        } else {
+            $("#new_student_work").submit();
+            $("#ajax-indicator").hide();
+        }
     }
 }
 
@@ -298,12 +305,36 @@ function regexStudentWorkDescription()
     }
 }
 
+function regexStudentWorkMember(min, max) {
+    var members = $.trim($("#group_member_ids").val()).split(',');
+    if ( min <= members.length  && members.length <= max ){
+        $("#student_work_group_textarea").text("");
+        return true;
+    } else {
+        $("#student_work_group_textarea").text("合作成员人数应为:"+min+"-"+max+"人");
+        return false;
+    }
+}
+
 //学生作品
 function show_project()
 {
     $("#about_project").slideToggle();
 }
 
+//添加分组成员
+function show_group_member(){
+    $("#chooseGroupMember").dialog("open");
+    $(".ui-dialog-titlebar").hide();
+    $("a.popClose").on('click', function(){
+        $("#chooseGroupMember" ).dialog("close");
+    });
+    $("#cancel_add").on('click', function(){
+        $("#chooseGroupMember" ).dialog("close");
+    });
+    //$('#min_num').focus();
+}
+
 //textarea自适应高度 纯js写的 有浏览器判断
 /**
  * 文本框根据输入内容自适应高度
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 584a49a4f..f13e6ef84 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1182,18 +1182,46 @@ a:hover.testBtn{background: url(/images/course/hwork_icon.png) -81px -5px no-rep
 a.groupBtn{  background: url(/images/course/hwork_icon.png) -2px -61px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.groupBtn{background: url(/images/course/hwork_icon.png) -80px -61px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:50px; color:#3d3c3c; margin-right:5px; text-align:center; padding-left:0px;}
-.groupPopUp {width:290px; height:auto;  padding:15px; background-color:#ffffff; z-index:1000; position:relative;}
+.groupPopUp {border:3px solid #269ac9; width:290px; height:auto;  padding:15px; background-color:#ffffff; position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .popClose {background:url(/images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:2px; top:3px;}
 a.memberBtn{  background: url(/images/course/hwork_icon.png) -7px -90px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.memberBtn{background: url(/images/course/hwork_icon.png) -80px -90px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .addMemberC {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:227px; background-color:#f1f1f1; min-height:150px; padding-top:10px;}
 .addMemberC li {padding-left:10px; line-height:18px;}
 .addMemberC li:hover {cursor:pointer; background-color:#cccccc;}
-.addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
+.addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .rightArrow {margin:50px 15px 0px 15px; float:left;}
 .relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
-
+.maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
 .resubAtt {border-top:1px solid #dddddd; position:relative; margin-top:15px;}
 .resubTitle {position:absolute; top:-10px; left:5px; background-color:#ffffff; display:block; font-weight:bold; padding:0px 2px;}
 a.blueCir{ display:inline-block; padding:2px 5px; background-color:#ffffff;border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.blueCir{ background:#3598db; color:#fff;}
+.proList {background-color:#eaeaea; padding:5px 10px; display:block; max-width:655px; float:left;}
+
+.borderRadius {border-radius:5px;}
+.maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
+.proRelateWrap {width:38px; height:38px; border:1px solid #cecece; border-radius:3px; background-color:#f1f1f1;}
+.mt7 {margin-top:7px;}
+.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;}
+.mr150 {margin-right:150px;}
+
+/*上传资源弹窗*/
+.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+.uploadDialogText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block; font-weight: bold;}
+.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative}
+.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;}
+a.uploadBoxIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;}
+a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}
+.chooseFile {color:#ffffff; display:block; margin-left:32px;}
+.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}
+.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}
+.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}
+.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}
+.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
+.mb10 {margin-bottom: 10px}
+.mb15 {margin-bottom: 15px}
+div.disable_link {background-color: #c1c1c1 !important;}
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index ad07259d3..0ed4df627 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -484,7 +484,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 /*发送资源弹窗*/
 /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
 /*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
-.resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
+.resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:110px; display:inline-block; font-weight: bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
 .boxContainer {height:33px; line-height:33px; position:relative}
@@ -1355,13 +1355,29 @@ a:hover.testBtn{background: url(/images/course/hwork_icon.png) -81px -5px no-rep
 a.groupBtn{  background: url(/images/course/hwork_icon.png) -2px -61px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.groupBtn{background: url(/images/course/hwork_icon.png) -80px -61px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:50px; color:#3d3c3c; margin-right:5px; text-align:center; padding-left:0px;}
-.groupPopUp {width:290px; height:auto;  padding:15px; background-color:#ffffff; z-index:1000; position:relative;}
+.groupPopUp {border:3px solid #269ac9; width:290px; height:auto;  padding:15px; background-color:#ffffff;position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .popClose {background:url(/images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:2px; top:3px;}
 a.memberBtn{  background: url(/images/course/hwork_icon.png) -7px -90px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.memberBtn{background: url(/images/course/hwork_icon.png) -80px -90px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .addMemberC {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:227px; background-color:#f1f1f1; min-height:150px; padding-top:10px;}
 .addMemberC li {padding-left:10px; line-height:18px;}
 .addMemberC li:hover {cursor:pointer; background-color:#cccccc;}
-.addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
+.addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .rightArrow {margin:50px 15px 0px 15px; float:left;}
 .relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
+.maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
+.resubAtt {border-top:1px solid #dddddd; position:relative; margin-top:15px;}
+.resubTitle {position:absolute; top:-10px; left:5px; background-color:#ffffff; display:block; font-weight:bold; padding:0px 2px;}
+a.blueCir{ display:inline-block; padding:2px 5px; background-color:#ffffff;border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.blueCir{ background:#3598db; color:#fff;}
+.proList {background-color:#eaeaea; padding:5px 10px; display:block; max-width:655px; float:left;}
+
+.borderRadius {border-radius:5px;}
+.maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
+.proRelateWrap {width:38px; height:38px; border:1px solid #cecece; border-radius:3px; background-color:#f1f1f1;}
+.mt7 {margin-top:7px;}
+.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;}
+.mr150 {margin-right:150px;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index a0118b263..220120346 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -54,4 +54,18 @@ a.cancelBtn:hover {background-color:#717171; color:#ffffff;}
 
 /*关联项目弹窗*/
 .projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden; width:288px;}
-.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
\ No newline at end of file
+.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
+
+/*组织首页新151204Tim*/
+.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;}
+.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;}
+.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;}
+.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;}
+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;}
+.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; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
+#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index a1dfe3f4d..70aad2cbe 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -410,7 +410,7 @@ a:hover.search_btn{ background: #0fa9bb;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
-.resourceClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}
+.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
 .courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css
index db2d021d9..c60adf460 100644
--- a/public/stylesheets/public_new.css
+++ b/public/stylesheets/public_new.css
@@ -566,7 +566,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:100px; display:inline-block;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
-.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}
+.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
 .searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}
diff --git a/spec/controllers/org_subfields_controller_spec.rb b/spec/controllers/org_subfields_controller_spec.rb
new file mode 100644
index 000000000..4bc89dae0
--- /dev/null
+++ b/spec/controllers/org_subfields_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe OrgSubfieldsController, :type => :controller do
+
+end
diff --git a/spec/factories/homework_detail_groups.rb b/spec/factories/homework_detail_groups.rb
new file mode 100644
index 000000000..86897c68e
--- /dev/null
+++ b/spec/factories/homework_detail_groups.rb
@@ -0,0 +1,11 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :homework_detail_group do
+    homework_common_id 1
+    min_num 1
+    max_num 1
+    base_on_project 1
+    homework_common nil
+  end
+end
diff --git a/spec/factories/student_work_projects.rb b/spec/factories/student_work_projects.rb
new file mode 100644
index 000000000..d6ecb2657
--- /dev/null
+++ b/spec/factories/student_work_projects.rb
@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :student_work_project do
+  end
+end
diff --git a/spec/models/homework_detail_group_spec.rb b/spec/models/homework_detail_group_spec.rb
new file mode 100644
index 000000000..2217ad28d
--- /dev/null
+++ b/spec/models/homework_detail_group_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe HomeworkDetailGroup, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/student_work_project_spec.rb b/spec/models/student_work_project_spec.rb
new file mode 100644
index 000000000..42a65b35e
--- /dev/null
+++ b/spec/models/student_work_project_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe StudentWorkProject, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end