Merge branch 'develop' into ouyangxuhua

app/controllers/admin_controller.rb

@@ -32,18 +32,20 @@ class AdminController < ApplicationController
   end
 
   def projects
+=begin
     @status = params[:status] || 1
 
-    scope = Project.status(@status).order('id asc')
+    scope = Project.status(@status)
     scope = scope.like(params[:name]) if params[:name].present?
-    @projects = scope.where(project_type: Project::ProjectType_project).all
+    @projects = scope.where(project_type: Project::ProjectType_project).reorder("created_on desc").all
-
+=end
+    @projects = Project.like(@name).order('created_on desc')
     render :action => "projects", :layout => false if request.xhr?
   end
 
   def courses
     @name = params[:name]
-    @courses = Course.like(@name)
+    @courses = Course.like(@name).order('created_at desc')
     respond_to do |format|
       format.html
     end
@@ -469,6 +471,23 @@ class AdminController < ApplicationController
     end
   end
 
+  #最近登录老师列表
+  def latest_login_teachers
+    scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 ORDER BY last_login_on DESC")
+    if params[:startdate].present?
+      scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 and last_login_on>= '#{params[:startdate]} 00:00:00' ORDER BY last_login_on DESC")
+    end
+    if params[:enddate].present?
+      scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 and last_login_on <= '#{params[:enddate]} 23:59:59' ORDER BY last_login_on DESC")
+    end
+    @teachers = scope
+    @teachers = paginateHelper @teachers,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
   #作业
   def homework
     @homework = HomeworkCommon.order('end_time desc')

app/controllers/blogs_controller.rb

@@ -29,7 +29,7 @@ class BlogsController < ApplicationController
   def set_homepage
     @blog = Blog.find(params[:id])
     @blog.update_attribute(:homepage_id, params[:article_id])
-    redirect_to user_blogs_path(params[:user_id])
+    redirect_to user_path(params[:user_id])
   end
 
   def cancel_homepage

app/controllers/courses_controller.rb

@@ -450,6 +450,93 @@ class CoursesController < ApplicationController
       #copy avatar
       copy_avatar(@course, copy_course)
 
+      if params[:course_content_type]
+        params[:course_content_type].each do |type|
+          case type
+            when "0"
+              homeworks = copy_course.homework_commons
+              homeworks.each do |homework|
+                new_homework = HomeworkCommon.new
+                new_homework.name = homework.name
+                new_homework.user_id = User.current.id
+                new_homework.description = homework.description
+                new_homework.publish_time = Date.today + 30
+                new_homework.end_time = Date.today + 60
+                new_homework.homework_type = homework.homework_type
+                new_homework.late_penalty = homework.late_penalty
+                new_homework.course_id = @course.id
+                new_homework.teacher_priority = homework.teacher_priority
+                new_homework.anonymous_comment = homework.anonymous_comment
+                new_homework.quotes = 0
+                new_homework.is_open = homework.is_open
+                homework.attachments.each do |attachment|
+                  att = attachment.copy
+                  att.container_id = nil
+                  att.container_type = nil
+                  att.copy_from = attachment.id
+                  att.save
+                  new_homework.attachments << att
+                end
+                homework_detail_manual = homework.homework_detail_manual
+                homework_detail_programing = homework.homework_detail_programing
+                homework_detail_group = homework.homework_detail_group
+                if homework_detail_manual
+                  new_homework.homework_detail_manual = HomeworkDetailManual.new
+                  new_homework_detail_manual =  new_homework.homework_detail_manual
+                  new_homework_detail_manual.ta_proportion = homework_detail_manual.ta_proportion
+                  new_homework_detail_manual.comment_status = 0
+                  new_homework_detail_manual.evaluation_start = Date.today + 67
+                  new_homework_detail_manual.evaluation_end = Date.today + 74
+                  new_homework_detail_manual.evaluation_num = homework_detail_manual.evaluation_num
+                  new_homework_detail_manual.absence_penalty = homework_detail_manual.absence_penalty
+                end
+                if homework_detail_programing
+                  new_homework.homework_detail_programing = HomeworkDetailPrograming.new
+                  new_homework.homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+                  new_homework.homework_detail_programing.language = homework_detail_programing.language
+                  homework.homework_tests.each_with_index do |homework_test|
+                    new_homework.homework_tests << HomeworkTest.new(
+                        input: homework_test.input,
+                        output: homework_test.output
+                    )
+                  end
+                end
+
+                if homework_detail_group
+                  new_homework.homework_detail_group = HomeworkDetailGroup.new
+                  new_homework.homework_detail_group.min_num = homework_detail_group.min_num
+                  new_homework.homework_detail_group.max_num = homework_detail_group.max_num
+                  new_homework.homework_detail_group.base_on_project = homework_detail_group.base_on_project
+                end
+                if new_homework.save
+                  new_homework_detail_manual.save if new_homework_detail_manual
+                  new_homework.homework_detail_programing.save if new_homework.homework_detail_programing
+                  new_homework.homework_detail_group.save if new_homework.homework_detail_group
+                end
+                homework.update_attribute(:quotes, homework.quotes+1)
+              end
+            when "1"
+              attachments = copy_course.attachments
+              attachments.each do |attachment|
+                attach_copied_obj = attachment.copy
+                attach_copied_obj.tag_list.add(attachment.tag_list) # tag关联
+                attach_copied_obj.container = @course
+                attach_copied_obj.created_on = Time.now
+                attach_copied_obj.author_id = User.current.id
+                attach_copied_obj.copy_from = attachment.copy_from.nil? ? attachment.id : attachment.copy_from
+                attach_copied_obj.is_publish = 0
+                attach_copied_obj.publish_time = Date.today + 30
+                if attach_copied_obj.attachtype == nil
+                  attach_copied_obj.attachtype = 4
+                end
+                attach_copied_obj.save
+                update_quotes attach_copied_obj
+              end
+          end
+        end
+      end
+
+=begin
       if params[:checkAll]
         attachments = copy_course.attachments
         attachments.each do |attachment|
@@ -513,6 +600,7 @@ class CoursesController < ApplicationController
           end
         end
       end
+=end
     end
     if @course
       respond_to do |format|

app/controllers/files_controller.rb

@@ -533,6 +533,7 @@ class FilesController < ApplicationController
            if attachment.publish_time > Date.today
              attachment.is_publish = 0
            end
+           attachment.description = params[:description]
            attachment.save
          end
        end
@@ -632,16 +633,14 @@ class FilesController < ApplicationController
   end
 
   def update_contributor_score(course, file )
-    unless  file.author.allowed_to?(:as_teacher, course)
+    course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course.id,  file.author.id).first
-      course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course.id,  file.author.id).first
+    if  course_contributor_score.nil?
-      if  course_contributor_score.nil?
+      CourseContributorScore.create(:course_id => course.id, :user_id => file.author.id, :message_num => 0, :message_reply_num => 0,
-        CourseContributorScore.create(:course_id => course.id, :user_id => file.author.id, :message_num => 0, :message_reply_num => 0,
+                                    :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0, :total_score => 5)
-                                      :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0, :total_score => 5)
+    else
-      else
+      score = course_contributor_score.resource_num + 5
-        score = course_contributor_score.resource_num + 5
+      total_score = course_contributor_score.total_score + 5
-        total_score = course_contributor_score.total_score + 5
+      course_contributor_score.update_attributes(:resource_num => score, :total_score => total_score)
-        course_contributor_score.update_attributes(:resource_num => score, :total_score => total_score)
-      end
     end
   end
 

app/controllers/homework_common_controller.rb

@@ -6,8 +6,8 @@ class HomeworkCommonController < ApplicationController
 
   include StudentWorkHelper
   before_filter :find_course, :only => [:index,:new,:create]
-  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
-  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
   before_filter :member_of_course, :only => [:index]
 
   def index
@@ -261,6 +261,30 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  def open_student_works
+    if @homework.is_open == 0
+      @homework.update_attribute(:is_open, 1)
+    else
+      @homework.update_attribute(:is_open, 0)
+    end
+    @user_activity_id = params[:user_activity_id]
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+  end
+
+  def alert_open_student_works
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def programing_test
     test = {language:params[:language],src:Base64.encode64(params[:src]),input:[params[:input]],output:[params[:output]]}
     @index = params[:index]

app/controllers/projects_controller.rb

@@ -66,6 +66,7 @@ class ProjectsController < ApplicationController
   helper :words
   helper :project_score
   helper :user_score
+  include UsersHelper
   ### added by william
   include ActsAsTaggableOn::TagsHelper
 
@@ -405,11 +406,16 @@ class ProjectsController < ApplicationController
       end
       flash.now[:error] = html if !html.to_s.blank?
     end
-      scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
+    scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
-      @repository = Repository.factory(scm)
+    @repository = Repository.factory(scm)
-      @repository.is_default = @project.repository.nil?
+    @repository.is_default = @project.repository.nil?
-      @repository.project = @project
+    @repository.project = @project
-
+    unless @project.gpid.nil?
+      g = Gitlab.client
+      @gitlab_branches = g.branches(@project.gpid)
+      @branch_names = g.branches(@project.gpid).map{|b| b.name}
+      @gitlab_default_branch = g.project(@project.gpid).default_branch
+    end
   end
 
   # 项目邀请用户加入实现过程
@@ -670,8 +676,7 @@ class ProjectsController < ApplicationController
     # 更新公开私有时同步gitlab公开私有
     unless @project.gpid.nil?
       g = Gitlab.client
-      gproject = g.project(@project.gpid)
+      params[:project][:is_public] ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
-      params[:project][:is_public] ? g.edit_project(gproject.id, 20) : g.edit_project(gproject.id, 0)
     end
     # end
     if validate_parent_id && @project.save

app/controllers/repositories_controller.rb

@@ -34,7 +34,7 @@ class RepositoriesController < ApplicationController
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -521,6 +521,13 @@ update
     end
   end
 
+  # 每次提交对应的文件差异
+  def commit_diff
+    @commit_diff = $g.commit_diff(@project.gpid, params[:changeset])
+    @commit_details = $g.commit(@project.gpid, params[:changeset])
+    render :layout => 'base_projects'
+  end
+
   def diff
     if params[:format] == 'diff'
       @diff = @repository.diff(@path, @rev, @rev_to)
@@ -626,9 +633,10 @@ update
     end
     (render_404; return false) unless @repository
     @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s
-    @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip
+    # gitlab端获取默认分支
+    gitlab_branchs = $g.project(@project.gpid).default_branch
+    @project.gpid.nil? ? (@rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip) : (@rev = params[:rev].blank? ? gitlab_branchs : params[:rev].to_s.strip)
     @rev_to = params[:rev_to]
-
     unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE)
       if @repository.branches.blank?
         raise InvalidRevisionParam

app/controllers/student_work_controller.rb

@@ -6,9 +6,10 @@ class StudentWorkController < ApplicationController
   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,: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 :member_of_course, :only => [: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]
+  before_filter :is_logged, :only => [:index]
 
   ### 
   def program_test
@@ -91,101 +92,119 @@ class StudentWorkController < ApplicationController
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
       #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      if @is_teacher || @homework.homework_detail_manual.nil? ||
+      if @homework.is_open == 1
-          (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
         @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  #学生 && 未开启匿评 只看到自己的
+      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
-        if @homework.homework_type == 3
+        if @is_teacher || @homework.homework_detail_manual.nil? ||
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
-          if pro.nil?
+          @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
-            @stundet_works = []
+          @show_all = true
+        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+          if @homework.homework_type == 3
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            if pro.nil?
+              @stundet_works = []
+            else
+              @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)
+            end
           else
-            @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)
+            @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
-        else
+        elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-          @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
-        end
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
+            if pro.nil?
-        if @homework.homework_type == 3
+              my_work = []
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            else
-          if pro.nil?
+              my_work = @homework.student_works.where(:id => pro.student_work_id)
-            my_work = []
+            end
           else
-            my_work = @homework.student_works.where(:id => pro.student_work_id)
+            my_work = @homework.student_works.where(:user_id => User.current.id)
           end
-        else
+          @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
-          my_work = @homework.student_works.where(:user_id => User.current.id)
+        elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        end
+          if @homework.homework_type == 3
-        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
+            if pro.nil?
-        if @homework.homework_type == 3
+              my_work = []
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            else
-          if pro.nil?
+              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)
-            my_work = []
+            end
           else
-            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)
+            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
+            @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
           end
         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
-          @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
         end
       else
-        @stundet_works = []
+        render_403
+        return
       end
+
       @student_work_count = (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).count
     else
-      if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
+      if @homework.is_open == 1
         @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  #学生 && 未开启匿评 只看到自己的
+      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
-        if @homework.homework_type == 3
+        if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          @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
-          if pro.nil?
+          @show_all = true
-            @stundet_works = []
+        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+          if @homework.homework_type == 3
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            if pro.nil?
+              @stundet_works = []
+            else
+              @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)
+            end
           else
-            @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)
+            @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
-        else
+        elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-          @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
-        end
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
+            if pro.nil?
-        if @homework.homework_type == 3
+              my_work = []
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            else
-          if pro.nil?
+              my_work = @homework.student_works.where(:id => pro.student_work_id)
-            my_work = []
+            end
           else
-            my_work = @homework.student_works.where(:id => pro.student_work_id)
+            my_work = @homework.student_works.where(:user_id => User.current.id)
           end
-        else
+          @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
-          my_work = @homework.student_works.where(:user_id => User.current.id)
+        elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        end
+          if @homework.homework_type == 3
-        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
+            if pro.nil?
-        if @homework.homework_type == 3
+              my_work = []
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            else
-          if pro.nil?
+              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)
-            my_work = []
+            end
           else
-            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)
+            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
+            @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
           end
         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
-          @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
         end
       else
-        @stundet_works = []
+        render_403
+        return
       end
+
       @student_work_count = (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).count
     end
 
@@ -802,6 +821,10 @@ class StudentWorkController < ApplicationController
     render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
   end
 
+  def is_logged
+    redirect_to signin_path unless User.current.logged?
+  end
+
   #根据条件过滤作业结果
   def search_homework_member homeworks,name
     if name == ""

app/controllers/users_controller.rb

@@ -26,6 +26,7 @@ class UsersController < ApplicationController
   menu_item :user_information, :only => :info
   menu_item :user_course, :only => :user_courses
   menu_item :user_homework, :only => :user_homeworks
+  menu_item :student_homework, :only => :student_homeworks
   menu_item :user_project, :only => [:user_projects, :watch_projects]
   menu_item :requirement_focus, :only => :watch_contests
   menu_item :user_newfeedback, :only => :user_newfeedback
@@ -35,12 +36,12 @@ class UsersController < ApplicationController
   #
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
-                                      :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
+                                      :user_homeworks,:student_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
                                       :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
                                       :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                       :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                       :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages]
+                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -106,7 +107,7 @@ class UsersController < ApplicationController
       redirect_to signin_url
       return
     elsif @user != User.current && !User.current.admin?
-     return render_403
+      return render_403
     end
     # 初始化/更新 点击按钮时间
     # 24小时内显示系统消息
@@ -374,32 +375,131 @@ class UsersController < ApplicationController
 
   #用户作业列表
   def user_homeworks
-    if User.current == @user
+    @user = User.current
-      @page = params[:page] ? params[:page].to_i + 1 : 0
+    if(params[:type].blank? || params[:type] == "1") #公共题库
-      user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+      visible_course = Course.where("is_public = 1 && is_delete = 0")
-
+      visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-      #判断当前用户在当前课程的身份
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
-      visibleCourse = @user.courses.empty? ? [] : @user.courses.visible
+    elsif params[:type] == "2" #我的题库
-      homework_ids = []
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
-      visibleCourse.each do |course|
+    end
-        if User.current.allowed_to?(:as_teacher,course)
+    @type = params[:type]
-          homeworks = HomeworkCommon.where("course_id = #{course.id}")
+    @limit = 15
-          homework_ids << homeworks.pluck(:id) unless homeworks.empty?
+    @is_remote = true
-        else
+    @hw_count = @homeworks.count
-          homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'")
+    @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
-          homework_ids << homeworks.pluck(:id) unless homeworks.empty?
+    @offset ||= @hw_pages.offset
+    @homeworks = paginateHelper @homeworks,15
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'static_base'}
+    end
+  end
+
+  def student_homeworks
+      if User.current == @user
+        @page = params[:page] ? params[:page].to_i + 1 : 0
+        user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+
+        #判断当前用户在当前课程的身份
+        visibleCourse = @user.courses.empty? ? [] : @user.courses.visible
+        homework_ids = []
+        visibleCourse.each do |course|
+            homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'")
+            homework_ids << homeworks.pluck(:id) unless homeworks.empty?
         end
+        visible_homework_ids = homework_ids.size == 0 ? "(-1)" :"(" + homework_ids.join(",") + ")"
+        @homework_commons = HomeworkCommon.where("id in #{visible_homework_ids}").order("created_at desc").limit(10).offset(@page * 10)
+        @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
+        @is_in_course = params[:is_in_course].to_i || 0
+        respond_to do |format|
+          format.js
+          format.html {render :layout => 'new_base_user'}
+        end
+      else
+        render_403
       end
-      visible_homework_ids = homework_ids.size == 0 ? "(-1)" :"(" + homework_ids.join(",") + ")"
+  end
-      @homework_commons = HomeworkCommon.where("id in #{visible_homework_ids}").order("created_at desc").limit(10).offset(@page * 10)
+
-      @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
+  def choose_user_course
-      @is_in_course = params[:is_in_course].to_i || 0
+    homework = HomeworkCommon.find params[:homework].to_i
-      respond_to do |format|
+    if !params[:search].nil?
-        format.js
+      search = "%#{params[:search].to_s.strip.downcase}%"
-        format.html {render :layout => 'new_base_user'}
+      @course = @user.courses.where("#{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
-      end
     else
-      render_403
+      @course = @user.courses.where("#{Course.table_name}.id != #{homework.course_id}").select { |course|  @user.allowed_to?(:as_teacher,course)}
+    end
+    @search = params[:search]
+    #这里仅仅是传递需要发送的资源id
+    @send_id = params[:send_id]
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def send_homework_to_course
+    homework = HomeworkCommon.find params[:send_id].to_i
+    course_ids = params[:course_ids]
+    course_ids.each do |course_id|
+      course = Course.find course_id.to_i
+      new_homework = HomeworkCommon.new
+      new_homework.name = homework.name
+      new_homework.user_id = User.current.id
+      new_homework.description = homework.description
+      new_homework.homework_type = homework.homework_type
+      new_homework.late_penalty = homework.late_penalty
+      new_homework.course_id = course.id
+      new_homework.teacher_priority = homework.teacher_priority
+      new_homework.anonymous_comment = homework.anonymous_comment
+      new_homework.quotes = 0
+      new_homework.is_open = homework.is_open
+      homework.attachments.each do |attachment|
+        att = attachment.copy
+        att.container_id = nil
+        att.container_type = nil
+        att.copy_from = attachment.id
+        att.save
+        new_homework.attachments << att
+      end
+      homework_detail_manual = homework.homework_detail_manual
+      homework_detail_programing = homework.homework_detail_programing
+      homework_detail_group = homework.homework_detail_group
+      if homework_detail_manual
+        new_homework.homework_detail_manual = HomeworkDetailManual.new
+        new_homework_detail_manual =  new_homework.homework_detail_manual
+        new_homework_detail_manual.ta_proportion = homework_detail_manual.ta_proportion
+        new_homework_detail_manual.comment_status = 0
+        new_homework_detail_manual.evaluation_num = homework_detail_manual.evaluation_num
+        new_homework_detail_manual.absence_penalty = homework_detail_manual.absence_penalty
+      end
+      if homework_detail_programing
+        new_homework.homework_detail_programing = HomeworkDetailPrograming.new
+        new_homework.homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+        new_homework.homework_detail_programing.language = homework_detail_programing.language
+        homework.homework_tests.each_with_index do |homework_test|
+          new_homework.homework_tests << HomeworkTest.new(
+              input: homework_test.input,
+              output: homework_test.output
+          )
+        end
+      end
+
+      if homework_detail_group
+        new_homework.homework_detail_group = HomeworkDetailGroup.new
+        new_homework.homework_detail_group.min_num = homework_detail_group.min_num
+        new_homework.homework_detail_group.max_num = homework_detail_group.max_num
+        new_homework.homework_detail_group.base_on_project = homework_detail_group.base_on_project
+      end
+      if new_homework.save
+        new_homework_detail_manual.save if new_homework_detail_manual
+        new_homework.homework_detail_programing.save if new_homework.homework_detail_programing
+        new_homework.homework_detail_group.save if new_homework.homework_detail_group
+      end
+      homework.update_attribute(:quotes, homework.quotes+1)
+    end
+    @homework = homework
+    respond_to do |format|
+      format.js
     end
   end
 
@@ -432,13 +532,22 @@ class UsersController < ApplicationController
     elsif params[:type] == "2" #我的题库
       @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
     end
+    if params[:property] && params[:property] == "1"
+      @homeworks = @homeworks.where("homework_type = 1").reorder("created_at desc")
+    elsif params[:property] && params[:property] == "2"
+      @homeworks = @homeworks.where("homework_type = 2").reorder("created_at desc")
+    elsif params[:property] && params[:property] == "3"
+      @homeworks = @homeworks.where("homework_type = 3").reorder("created_at desc")
+    end
     @type = params[:type]
+    @property = params[:property]
     @limit = 15
     @is_remote = true
     @hw_count = @homeworks.count
     @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
     @offset ||= @hw_pages.offset
     @homeworks = paginateHelper @homeworks,15
+    @is_import = params[:is_import]
     respond_to do |format|
       format.js
     end
@@ -446,6 +555,7 @@ class UsersController < ApplicationController
 
   def show_homework_detail
     @homework = HomeworkCommon.find params[:homework].to_i
+    @is_import = params[:is_import]
     respond_to do |format|
       format.js
     end
@@ -458,10 +568,21 @@ class UsersController < ApplicationController
     if(params[:type].blank? || params[:type] == "1") #全部
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("created_at desc")
+      all_homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'")
+      all_user_ids = all_homeworks.map{|hw| hw.user_id}
+      user_str_ids = search_user_by_name all_user_ids, search
+      user_ids = user_str_ids.empty? ? "(-1)" : "(" + user_str_ids.join(",") + ")"
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%' or user_id in #{user_ids})").order("created_at desc")
     elsif params[:type] == "2" #课程资源
       @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("created_at desc")
     end
+    if params[:property] && params[:property] == "1"
+      @homeworks = @homeworks.where("homework_type = 1").reorder("created_at desc")
+    elsif params[:property] && params[:property] == "2"
+      @homeworks = @homeworks.where("homework_type = 2").reorder("created_at desc")
+    elsif params[:property] && params[:property] == "3"
+      @homeworks = @homeworks.where("homework_type = 3").reorder("created_at desc")
+    end
     @type = params[:type]
     @limit = 15
     @is_remote = true
@@ -469,6 +590,7 @@ class UsersController < ApplicationController
     @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
     @offset ||= @hw_pages.offset
     @homeworks = paginateHelper @homeworks,15
+    @is_import = params[:is_import]
     respond_to do |format|
       format.js
     end
@@ -532,9 +654,10 @@ class UsersController < ApplicationController
       if @student_work.nil?
         @student_work = StudentWork.new
       end
+      @course = @homework.course
       respond_to do |format|
         format.js
-        format.html {render :layout => 'new_base_user'}
+        format.html {render :layout => 'base_courses'}
       end
     else
       render_403
@@ -683,19 +806,23 @@ class UsersController < ApplicationController
       render_403
       return
     end
+    user_course_ids = User.current.courses.map { |c| c.id}
+    user_project_ids = User.current.projects.map {|p| p.id}
+    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") #全部
-      user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
-                                          "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    elsif params[:type] == "2" # 课程资源
-    elsif params[:type] == "2" #课程资源
+      @attachments = get_course_resources(params[:id], user_course_ids)
-      user_course_ids = User.current.courses.map { |c| c.id}
+    elsif params[:type] == "3" # 项目资源
-      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
+      @attachments = get_project_resources(params[:id], user_project_ids)
-    elsif params[:type] == "3" #项目资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
     elsif params[:type] == "4" #附件
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+      @attachments = get_attch_resources params[:id]
     elsif params[:type] == "5" #用户资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal'").order("created_on desc")
+      @attachments = get_principal_resources params[:id]
+    elsif params[:type] == "6" # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources(user_course_ids, user_project_ids)
     end
     @type = params[:type]
     @limit = 7
@@ -728,6 +855,8 @@ class UsersController < ApplicationController
       @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
     elsif params[:type] == "5" #用户资源
       @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "6" #公共资源
+      @attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
     end
     @type = params[:type]
     @limit = 7
@@ -768,7 +897,7 @@ class UsersController < ApplicationController
   def store_selected_resource
     session[:seleted_resource_ids] = [] if session[:seleted_resource_ids].nil?
     if params[:save] == 'y'
-     session[:seleted_resource_ids] <<  params[:res_id]
+      session[:seleted_resource_ids] <<  params[:res_id]
     else
       session[:seleted_resource_ids].delete( params[:res_id])
     end
@@ -1074,12 +1203,12 @@ class UsersController < ApplicationController
         else
           blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-                                                   "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+                                                    "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
                                                     "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-                                                   "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
+                                                    "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
       end
     else
-    #  @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
+      #  @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
       blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
                                                 "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
@@ -1402,50 +1531,51 @@ class UsersController < ApplicationController
 
   # 上传用户资源
   def user_resource_create
+    user_course_ids = User.current.courses.map { |c| c.id}
+    user_project_ids = User.current.projects.map {|p| p.id}
+    # user_org_ids = User.current.organizations.map {|o| o.id}
     @user = User.find(params[:id])
     #@user.save_attachments(params[:attachments],User.current)
     # Container_type为Principal
     Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
-    if(params[:type].blank?|| params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
-      if User.current.id.to_i == params[:id].to_i
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+      if params[:status] == 2
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+        @attachments = get_course_resources(params[:id], user_course_ids)
-                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      elsif params[:status] == "3"
-      else
+        @attachments = get_project_resources(params[:id], user_project_ids)
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #Ta的资源库的话，应该是他上传的公开资源 加上 他加入的所有我可见课程里的公开资源
+      elsif params[:status] == "4"
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 " +
+        @attachments = get_attch_resources params[:id]
-                                            "and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) " +
+      elsif params[:status] == "5"
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+        @attachments = get_principal_resources params[:id]
-      end
-    elsif params[:type] == "2" #课程资源
-      if User.current.id.to_i == params[:id].to_i
-        user_course_ids = User.current.courses.map { |c| c.id}
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
       else
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
+        # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course')"+
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
-      end
-    elsif params[:type] == "3" #项目资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project' ").order("created_on desc")
       end
+    elsif params[:type] == "2" # 课程资源
+      @attachments = get_course_resources(params[:id], user_course_ids)
+    elsif params[:type] == "3" # 项目资源
+      @attachments = get_project_resources(params[:id], user_project_ids)
     elsif params[:type] == "4" #附件
-      if User.current.id.to_i == params[:id].to_i
+      @attachments = get_attch_resources params[:id]
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
-      else
+      @attachments = get_principal_resources params[:id]
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+    elsif params[:type] == "6" # 公共资源
-      end
+      if params[:status] == "2"
-    elsif params[:type] == "5" #附件
+        @attachments = get_course_resources_public( user_course_ids)
-      if User.current.id.to_i == params[:id].to_i
+      elsif params[:status] == "3"
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type ='Principal'").order("created_on desc")
+        @attachments = get_project_resources_public(user_project_ids)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public
       else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type ='Principal'").order("created_on desc")
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids)
       end
     end
-    @type = params[:type] || 1
+    @status = params[:status]
+    @type = params[:type]
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
@@ -1467,46 +1597,46 @@ class UsersController < ApplicationController
         Attachment.where("author_id = #{User.current.id}").delete(id)
       end
     end
-
+    user_course_ids = User.current.courses.map { |c| c.id}
-    if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') #全部
+    user_project_ids = User.current.projects.map {|p| p.id}
-      if User.current.id.to_i == params[:id].to_i
+    # user_org_ids = User.current.organizations.map {|o| o.id}
-        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      if params[:status] == 2
+        @attachments = get_course_resources(params[:id], user_course_ids)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources params[:id]
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources params[:id]
       else
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #Ta的资源库的话，应该是他上传的公开资源 加上 他加入的所有我可见课程里的公开资源
+        # 公共资源库：所有公开资源或者我上传的私有资源
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 " +
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
-                                            "and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) " +
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
-      end
-    elsif params[:type] == "2" #课程资源
-      if User.current.id.to_i == params[:id].to_i
-        user_course_ids = User.current.courses.map { |c| c.id}
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
-      else
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course')"+
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
-      end
-    elsif params[:type] == "3" #项目资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project' ").order("created_on desc")
       end
+    elsif params[:type] == "2" # 课程资源
+      @attachments = get_course_resources(params[:id], user_course_ids)
+    elsif params[:type] == "3" # 项目资源
+      @attachments = get_project_resources(params[:id], user_project_ids)
     elsif params[:type] == "4" #附件
-      if User.current.id.to_i == params[:id].to_i
+      @attachments = get_attch_resources params[:id]
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
-      end
     elsif params[:type] == "5" #用户资源
-      if User.current.id.to_i == params[:id].to_i
+      @attachments = get_principal_resources params[:id]
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type ='Principal'").order("created_on desc")
+    elsif params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public
       else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type ='Principal'").order("created_on desc")
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids)
       end
     end
+    @status = params[:status]
     @type = params[:type]
     @limit = 25
     @is_remote = true
@@ -1592,6 +1722,9 @@ class UsersController < ApplicationController
             attach_copied_obj.attachtype = 4
           end
           if attach_copied_obj.save
+            # 更新引用次数
+            quotes = ori.quotes.to_i + 1
+            ori.update_attribute(:quotes, quotes) unless ori.nil?
             ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
           end
           @save_message = attach_copied_obj.errors.full_messages
@@ -1604,10 +1737,11 @@ class UsersController < ApplicationController
         @flag = false
       end
       send_ids.each do |send_id|
+        quotes = 0
         ori = Attachment.find_by_id(send_id)
-
         unless course_ids.nil?
           course_ids.each do |id|
+            quotes = 0
             next if ori.blank?
             @exist = false
             Course.find(id).attachments.each do |att|  #如果课程中包含该资源
@@ -1630,6 +1764,9 @@ class UsersController < ApplicationController
               attach_copied_obj.attachtype = 4
             end
             if attach_copied_obj.save
+              # 更新引用次数
+              quotes = ori.quotes.to_i + 1
+              ori.update_attribute(:quotes, quotes) unless ori.nil?
               ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
             end
             @save_message = attach_copied_obj.errors.full_messages
@@ -1690,6 +1827,9 @@ class UsersController < ApplicationController
             attach_copied_obj.attachtype = 1
           end
           if attach_copied_obj.save
+            # 更新引用次数
+            quotes = ori.quotes.to_i + 1
+            ori.update_attribute(:quotes, quotes) unless ori.nil?
             ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
           end
           unless Project.find(project_id).project_score.nil?
@@ -1705,10 +1845,11 @@ class UsersController < ApplicationController
         @flag = false
       end
       send_ids.each do |send_id|
-
+        quotes = 0
         ori = Attachment.find_by_id(send_id)
         unless project_ids.nil?
           project_ids.each do |project_id|
+            quotes = 0
             next if ori.blank?
             @exist = false
             Project.find(project_id).attachments.each do |att|  #如果课程中包含该资源
@@ -1731,6 +1872,9 @@ class UsersController < ApplicationController
               attach_copied_obj.attachtype = 1
             end
             if attach_copied_obj.save
+              # 更新引用次数
+              quotes = ori.quotes.to_i + 1
+              ori.update_attribute(:quotes, quotes) unless ori.nil?
               ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
             end
             unless Project.find(project_id).project_score.nil?
@@ -1769,30 +1913,33 @@ class UsersController < ApplicationController
       end
       ori = Attachment.find_by_id(send_id)
       unless subfield_id.nil?
-          attach_copied_obj = ori.copy
+        attach_copied_obj = ori.copy
-          @exist = false
+        @exist = false
-          OrgSubfield.find(subfield_id).attachments.each do |att|  #如果课程中包含该资源
+        OrgSubfield.find(subfield_id).attachments.each do |att|  #如果课程中包含该资源
-            if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
+          if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
-              att.created_on = Time.now
+            att.created_on = Time.now
-              att.save
+            att.save
-              @exist = true
+            @exist = true
-              break
+            break
-            end
           end
-          if @exist == false #如果不存在该资源
+        end
-            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+        if @exist == false #如果不存在该资源
-            attach_copied_obj.container = OrgSubfield.find(subfield_id)
+          attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
-            attach_copied_obj.created_on = Time.now
+          attach_copied_obj.container = OrgSubfield.find(subfield_id)
-            attach_copied_obj.author_id = User.current.id
+          attach_copied_obj.created_on = Time.now
-            attach_copied_obj.is_public = 0
+          attach_copied_obj.author_id = User.current.id
-            attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
+          attach_copied_obj.is_public = 0
-            if attach_copied_obj.attachtype == nil
+          attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
-              attach_copied_obj.attachtype = 1
+          if attach_copied_obj.attachtype == nil
-            end
+            attach_copied_obj.attachtype = 1
-            if attach_copied_obj.save
+          end
-              ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+          if attach_copied_obj.save
-            end
+            # 更新引用次数
+            quotes = ori.quotes.to_i + 1
+            ori.update_attribute(:quotes, quotes) unless ori.nil?
+            ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
           end
+        end
       end
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(" ")
@@ -1801,33 +1948,36 @@ class UsersController < ApplicationController
         @flag = false
       end
       send_ids.each do |send_id|
-
+        quotes = 0
         ori = Attachment.find_by_id(send_id)
         unless subfield_id.nil?
-            next if ori.blank?
+          next if ori.blank?
-            @exist = false
+          @exist = false
-            OrgSubfield.find(subfield_id).attachments.each do |att|  #如果课程中包含该资源
+          OrgSubfield.find(subfield_id).attachments.each do |att|  #如果课程中包含该资源
-              if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
+            if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
-                att.created_on = Time.now
+              att.created_on = Time.now
-                att.save
+              att.save
-                @exist = true
+              @exist = true
-                break
+              break
-              end
-            end
-            next if @exist
-            attach_copied_obj = ori.copy
-            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
-            attach_copied_obj.container = OrgSubfield.find(subfield_id)
-            attach_copied_obj.created_on = Time.now
-            attach_copied_obj.author_id = User.current.id
-            attach_copied_obj.is_public = 0
-            attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
-            if attach_copied_obj.attachtype == nil
-              attach_copied_obj.attachtype = 1
-            end
-            if attach_copied_obj.save
-              ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
             end
+          end
+          next if @exist
+          attach_copied_obj = ori.copy
+          attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+          attach_copied_obj.container = OrgSubfield.find(subfield_id)
+          attach_copied_obj.created_on = Time.now
+          attach_copied_obj.author_id = User.current.id
+          attach_copied_obj.is_public = 0
+          attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
+          if attach_copied_obj.attachtype == nil
+            attach_copied_obj.attachtype = 1
+          end
+          if attach_copied_obj.save
+            # 更新引用次数
+            quotes = ori.quotes.to_i + 1
+            ori.update_attribute(:quotes, quotes) unless ori.nil?
+            ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+          end
         end
       end
     else
@@ -1862,8 +2012,8 @@ class UsersController < ApplicationController
         end
         news.attachments.each do |attach|
           course_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
-                                                 :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                                                    :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
-                                                 :is_public => attach.is_public,  :quotes => 0)
+                                                    :is_public => attach.is_public,  :quotes => 0)
         end
       end
     end
@@ -1882,8 +2032,8 @@ class UsersController < ApplicationController
         end
         news.attachments.each do |attach|
           message.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
-                                                     :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                                                :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
-                                                     :is_public => attach.is_public,  :quotes => 0)
+                                                :is_public => attach.is_public,  :quotes => 0)
         end
       end
     end
@@ -1899,8 +2049,8 @@ class UsersController < ApplicationController
     end
     news.attachments.each do |attach|
       org_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
-                                        :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                                             :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
-                                        :is_public => attach.is_public,  :quotes => 0)
+                                             :is_public => attach.is_public,  :quotes => 0)
     end
     OrgActivity.create(:container_type => 'OrgSubfield', :container_id => field_id.to_i, :org_act_type=>'News', :org_act_id => org_news.id, :user_id => User.current.id)
   end
@@ -2168,54 +2318,107 @@ class UsersController < ApplicationController
     end
   end
 
+  # 获取公共资源
+  def get_public_resources user_course_ids, user_project_ids
+    attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) "+
+                                       "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
+                                       "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("created_on desc")
+  end
+
+  # 获取我的资源
+  def get_my_resources author_id, user_course_ids, user_project_ids
+    attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                       "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
+                                       "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("created_on desc")
+  end
+
+  # 获取我的课程资源
+  def get_course_resources author_id, user_course_ids
+    attchments = Attachment.where("(author_id = #{author_id} and container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+  end
+
+  # 获取公共资源课程
+  def get_course_resources_public user_course_ids
+    attchments = Attachment.where("(container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+  end
+
+  # 获取我的项目资源
+  def get_project_resources author_id, user_project_ids
+    attchments = Attachment.where("(author_id = #{author_id} and container_type = 'Project') or (container_type = 'Course'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+  end
+
+  # 获取公共资源的项目资源
+  def get_project_resources_public  user_project_ids
+    attchments = Attachment.where("(container_type = 'Project') or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+  end
+
+  # 获取我上传的附件
+  def get_attch_resources author_id
+    attchments = Attachment.where("author_id = #{author_id} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
+  end
+
+  # 获取公共资源中我上传的附件
+  def get_attch_resources_public
+    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
+  end
+
+  # 获取我的用户类型资源
+  def get_principal_resources author_id
+    attchments = Attachment.where("author_id = #{author_id} and container_type = 'Principal'").order("created_on desc")
+  end
+
+  # 获取我的用户类型资源
+  def get_principal_resources_public
+    attchments = Attachment.where("container_type = 'Principal'").order("created_on desc")
+  end
+
   # 资源库 分为全部  课程资源 项目资源 附件
   def user_resource
-    #确定container_type
-    # @user = User.find(params[:id])
     # 别人的资源库是没有权限去看的
     if User.current.id.to_i != params[:id].to_i
       render_403
       return
     end
-    if(params[:type].blank? || params[:type] == "1") #全部
+    user_course_ids = User.current.courses.map { |c| c.id}
-      if User.current.id.to_i == params[:id].to_i
+    user_project_ids = User.current.projects.map {|p| p.id}
-        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    # user_org_ids = User.current.organizations.map {|o| o.id}
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_publish = 1 and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
-                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1)").order("created_on desc")
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      else
+      if params[:status] == "2"
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #Ta的资源库的话，应该是他上传的公开资源 加上 他加入的所有我可见课程里的公开资源
+        @attachments = get_course_resources(params[:id], user_course_ids)
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and is_publish = 1 " +
+      elsif params[:status] == "3"
-                                            "and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) " +
+        @attachments = get_project_resources(params[:id], user_project_ids)
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1)").order("created_on desc")
+      elsif params[:status] == "4"
-      end
+        @attachments = get_attch_resources params[:id]
-    elsif params[:type] == "2" #课程资源
+      elsif params[:status] == "5"
-      if User.current.id.to_i == params[:id].to_i
+        @attachments = get_principal_resources params[:id]
-        user_course_ids = User.current.courses.map { |c| c.id}
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
-      else
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course' and is_publish = 1)"+
-                                            "or (container_type = 'Course' and is_public = 1 and is_publish = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
-      end
-    elsif params[:type] == "3" #项目资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
       else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project' ").order("created_on desc")
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
       end
+    elsif params[:type] == "2" # 课程资源
+      @attachments = get_course_resources(params[:id], user_course_ids)
+    elsif params[:type] == "3" # 项目资源
+      @attachments = get_project_resources(params[:id], user_project_ids)
     elsif params[:type] == "4" #附件
-      if User.current.id.to_i == params[:id].to_i
+      @attachments = get_attch_resources params[:id]
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
-      end
     elsif params[:type] == "5" #用户资源
-      if User.current.id.to_i == params[:id].to_i
+      @attachments = get_principal_resources params[:id]
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal'").order("created_on desc")
+    elsif params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public
       else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'").order("created_on desc")
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids)
       end
     end
+    @status = params[:status]
     @type = params[:type]
     @limit = 25
     @is_remote = true
@@ -2226,18 +2429,141 @@ class UsersController < ApplicationController
     @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
-      format.html {render :layout => 'new_base_user'}
+      format.html {render :layout => 'new_base'}
+    end
+  end
+
+  # 导入资源
+  def import_resources
+    # 别人的资源库是没有权限去看的
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    user_course_ids = User.current.courses.map { |c| c.id}
+    user_project_ids = User.current.projects.map {|p| p.id}
+    # user_org_ids = User.current.organizations.map {|o| o.id}
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids)
+    elsif params[:type] == "6" # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources(user_course_ids, user_project_ids)
+    end
+    @type = params[:type]
+    @limit = 10
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,10
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base'}
+    end
+  end
+
+  def import_resources_search
+    search = "%#{params[:search].strip.downcase}%"
+    # 别人的资源库是没有权限去看的
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    user_course_ids = User.current.courses.map { |c| c.id}
+    user_project_ids = User.current.projects.map {|p| p.id}
+    # user_org_ids = User.current.organizations.map {|o| o.id}
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      user_course_ids = User.current.courses.map { |c| c.id}
+      user_project_ids = User.current.projects.map {|p| p.id}
+      # user_org_ids = User.current.organizations.map {|o| o.id}
+      @attachments = Attachment.where("((author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                          "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
+                                          "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("created_on desc")
+    elsif params[:type] == "6" # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources(user_course_ids, user_project_ids)
+    end
+    @type = params[:type]
+    @limit = 10
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,10
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base'}
+    end
+  end
+
+  # 内容导入到对象中
+  def import_into_container
+    send_ids = params[:checkbox1]
+    # mul_id为当前课程id、项目id、组织id的多种形态
+    mul_id = params[:mul_id]
+    if params[:mul_type] == "Course"
+      mul_container = Course.find(mul_id)
+    elsif params[:mul_type] == "Project"
+      mul_container = Project.find(mul_id)
+    elsif params[:mul_type] == "SubfieldFile"
+      mul_container = OrgSubfield.find(mul_id)
+    end
+    unless params[:checkbox1].blank?
+      send_ids.each do |send_id|
+        ori = Attachment.find_by_id(send_id)
+        # 如果该附件已经存课程中，则只更新附件创建时间
+        mul_container.attachments.each do |att|
+          if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
+            att.created_on = Time.now
+            att.save
+            @exist = true
+            break
+          end
+        end
+        next if @exist
+        attach_copied_obj = ori.copy
+        attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+        attach_copied_obj.container = mul_container
+        attach_copied_obj.created_on = Time.now
+        attach_copied_obj.author_id = User.current.id
+        attach_copied_obj.is_public = 0
+        attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
+        if attach_copied_obj.attachtype == nil
+          attach_copied_obj.attachtype = 4
+        end
+        attach_copied_obj.save
+        @save_message = attach_copied_obj.errors.full_messages
+      end
+    end
+    respond_to do |format|
+      format.html {
+        if params[:mul_type] == "Course"
+          redirect_to course_files_url(mul_container) unless mul_container.nil?
+        elsif params[:mul_type] == "Project"
+          redirect_to project_files_url(mul_container) unless mul_container.nil?
+        elsif params[:mul_type] == "SubfieldFile"
+          redirect_to org_subfield_files_url(mul_container) unless mul_container.nil?
+        end
+      }
     end
   end
 
   # 根据资源关键字进行搜索
   def resource_search
     search = "%#{params[:search].strip.downcase}%"
+    user_course_ids = User.current.courses.map { |c| c.id}
+    user_project_ids = User.current.projects.map {|p| p.id}
+    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') #全部
       if User.current.id.to_i == params[:id].to_i
-        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
+
-        @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+        @attachments = Attachment.where("((author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                            " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like :p) ",:p=>search).order("created_on desc")
+                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
+                                            "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("created_on desc")
       else
         user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
         @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type in" +
@@ -2273,6 +2599,11 @@ class UsersController < ApplicationController
       else
         @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'  and (filename like :p)",:p=>search).order("created_on desc")
       end
+    elsif  params[:type] == "6" #全部资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = Attachment.where("((is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) "+
+                                          "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
+                                          "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and  (filename like :p)" ,:p => search).order("created_on desc")
     end
     @type = params[:type]
     @limit = 25

app/controllers/zipdown_controller.rb

@@ -134,8 +134,11 @@ class ZipdownController < ApplicationController
     homework_common.student_works.each do |work|
       unless work.attachments.empty?
         out_file = zip_student_work_by_user(work)
-        bid_homework_path << out_file.file_path
+
-        digests << out_file.file_digest
+          bid_homework_path << out_file.file_path
+          digests << out_file.file_digest
+
+
       end
     end
     homework_id = homework_common.id
@@ -172,7 +175,11 @@ class ZipdownController < ApplicationController
     }
   end
 
-  def zip_student_work_by_user work
+  def make_zip_name(work)
+    "#{work.user.show_name}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}"
+  end
+
+  def zip_student_work_by_user(work)
     homeworks_attach_path = []
     not_exist_file = []
     # 需要将所有homework.attachments遍历加入zip
@@ -186,10 +193,23 @@ class ZipdownController < ApplicationController
         digests << 'not_exist_file'
       end
     end
-    out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+
-      zipping("#{work.user.show_name}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
+    #单个文件的话,不需要压缩,只改名
-              homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
+    out_file = nil
-    }
+    if homeworks_attach_path.size == 1
+      out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+        des_path = "#{OUTPUT_FOLDER}/#{make_zip_name(work)}_#{File.basename(homeworks_attach_path.first)}"
+        FileUtils.cp homeworks_attach_path.first, des_path
+        des_path
+      }
+    else
+      out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+        zipping("#{make_zip_name(work)}.zip",
+                homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
+      }
+    end
+    out_file
+
   end
 
 

app/helpers/application_helper.rb

@@ -110,11 +110,19 @@ module ApplicationHelper
     end
   end
 
-  # 更新课程英雄榜得分
+  # 更新课程活跃度得分
-  # user传过来必须是学生
   def course_member_score(course_id,user_id,type)
     course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course_id, user_id).first
     case type
+      when "HomeworkCommon"
+        if  course_contributor_score.nil?
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
+                                        :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :homework_journal_num => 1 , :total_score => 1)
+        else
+          score = course_contributor_score.homework_journal_num + 1
+          total_score = course_contributor_score.total_score + 1
+          course_contributor_score.update_attributes(:homework_journal_num => score, :total_score => total_score)
+        end
       when "JournalForMessage"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
@@ -151,6 +159,15 @@ module ApplicationHelper
           total_score = course_contributor_score.total_score + 1
           course_contributor_score.update_attributes(:news_reply_num => score, :total_score => total_score)
         end
+      when "News"
+        if  course_contributor_score.nil?
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
+                                        :news_reply_num => 0, :news_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+        else
+          score = course_contributor_score.news_num + 1
+          total_score = course_contributor_score.total_score + 1
+          course_contributor_score.update_attributes(:news_num => score, :total_score => total_score)
+        end
     end
   end
 
@@ -2512,7 +2529,7 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
-    if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+    if homework.homework_detail_manual.comment_status == 0 ||Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status

app/helpers/courses_helper.rb

@@ -25,7 +25,7 @@ module CoursesHelper
     # 获取tag匹配结果ID
     a_tags = []
     # kc = keywords.to_a
-    Course.visible.where("is_excellent =?", 1).each do |ec|
+    Course.visible.where("is_excellent =? and is_public =?", 1, 1).each do |ec|
       if ec.tags.any?{|value| current_course.name.include?(value.to_s)}
         a_tags << ec.id
       end
@@ -44,7 +44,7 @@ module CoursesHelper
     excellent_ids = a_courses.flatten.uniq.delete_if{|i| i == current_course.id}
     limit = 5 - excellent_ids.length.to_i
     sql = "SELECT distinct c.id FROM course_activities cs, courses c where cs.course_id = c.id
-         and c.is_excellent =1 and c.id != #{current_course.id} order by cs.updated_at desc;"
+         and c.is_excellent =1 and c.is_public = 1 and c.id != #{current_course.id} order by cs.updated_at desc;"
     default_ecourse_ids = Course.find_by_sql(sql).flatten
     # REDO:时间紧，待优化
     default_ids =[]
@@ -116,7 +116,7 @@ module CoursesHelper
     @course.journals_for_messages.where('m_parent_id IS NULL').count
   end
 
-  #当前学期
+  #当前学期(2015春季学期)
   def current_time_and_term course
     str = ""
     term = cur_course_term
@@ -144,6 +144,22 @@ module CoursesHelper
     val
   end
 
+  #当前学期(2015春)
+  def current_time_and_term_short course
+    str = ""
+    term = cur_course_term
+    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
+      str = course.time.to_s + course.term[0]
+    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
+      str = course.time.to_s + course.term[0]
+    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
+      str = course.end_time.to_s + course.end_term[0]
+    else
+      str = Time.now.year.to_s + cur_course_term[0]
+    end
+    str
+  end
+
   # 返回学生数量，即roles表中定义的Reporter
   #def studentCount project
    # searchStudent(project).count
@@ -840,7 +856,9 @@ module CoursesHelper
   end
 
   def contributor_course_scor(course_id)
-    ccs = CourseContributorScore.where("course_id =?", course_id).order("total_score desc") .limit(9)
+    ccs = CourseContributorScore.find_by_sql("SELECT * FROM `course_contributor_scores` where course_id = #{course_id} order by
+        (message_num*2 + message_reply_num + news_reply_num + news_num +
+         resource_num*5 + journal_num + homework_journal_num ) desc limit 9;")
   end
 
 end

app/helpers/exercise_helper.rb

@@ -86,6 +86,31 @@ module ExerciseHelper
     return result
   end
 
+  def convert_to_chi_num num
+    result = ""
+    case num.to_i
+      when 1
+        result = '一'
+      when 2
+        result = '二'
+      when 3
+        result = '三'
+      when 4
+        result = '四'
+      when 5
+        result = '五'
+      when 6
+        result = '六'
+      when 7
+        result = '七'
+      when 8
+        result = '八'
+      when 9
+        result = '九'
+    end
+    return result
+  end
+
   def get_current_score exercise
     score = 0
     unless exercise.nil?

app/helpers/issues_helper.rb

@@ -80,7 +80,7 @@ module IssuesHelper
       issuetype << "support fl"
       issuetype << "支持"
     elsif value == "功能" || value == 2
-      issuetype << "function fl"
+      issuetype << "issues-function fl"
       issuetype << "功能"
     else
       issuetype << "weekly fl"

app/helpers/repositories_helper.rb

@@ -41,6 +41,16 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取diff内容行号
+  def diff_line_num content
+    content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
+  end
+
+  # 处理内容
+  def diff_content content
+    content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'')
+  end
+
   def format_revision(revision)
     if revision.respond_to? :format_identifier
       revision.format_identifier

app/helpers/users_helper.rb

@@ -54,6 +54,61 @@ module UsersHelper
     end
   end
 
+  def get_resource_origin attach
+    type = attach.container_type
+    content = attach.container
+    unless content.nil?
+      case type
+        when 'Course'
+          result = current_time_and_term_resource content
+        when 'Project'
+          result = content.name
+        when 'Issue'
+          result = content.subject
+        when 'Message'
+          result = content.subject
+        when 'News'
+          result = content.title
+        when 'HomewCommon'
+          result = content.name
+        when 'StudentWorkScore'
+          result = content.name
+        when 'Principal'
+          result = content.name
+        when 'OrgSubfield'
+          result = content.name
+      end
+    end
+  end
+
+  def current_time_and_term_resource course
+    str = ""
+    term = cur_course_term_resource
+    name = course.name
+    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
+      str = name + "(" + course.time.to_s + course.term.to_s + ")"
+    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
+      str = name + "(" + course.time.to_s + course.term.to_s + ")"
+    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
+      str = name + "(" + course.end_time.to_s + course.end_term.to_s + ")"
+    else
+      str = name + "(" + Time.now.year.to_s + cur_course_term_resource.to_s + ")"
+    end
+    str
+  end
+
+  def cur_course_term_resource
+    month = Time.now.month
+    if month >= 9 || month < 2
+      term = "秋"
+    elsif (month >= 7 && Time.now.day >= 15) || month == 8
+      term = "夏"
+    else
+      term = "春"
+    end
+    term
+  end
+
   def title_for_message type
     case type
       when nil
@@ -85,6 +140,11 @@ module UsersHelper
     end
   end
 
+  def link_to_user_version(version, options = {})
+    return '' unless version && version.is_a?(Version)
+    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => "linkBlue"
+  end
+
   # 统计未读消息数
   def unviewed_message(user)
     course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
@@ -601,4 +661,16 @@ module UsersHelper
     type
   end
 
+  #根据姓名搜索用户
+  def search_user_by_name user_ids, name
+    result_ids = []
+    user_ids.each do |user_id|
+      user = User.find user_id
+      username = user.lastname.to_s.downcase + user.firstname.to_s.downcase
+      if username.include?(name)
+        result_ids << user_id
+      end
+    end
+    result_ids
+  end
 end

app/models/attachment.rb

@@ -88,7 +88,8 @@ class Attachment < ActiveRecord::Base
   cattr_accessor :thumbnails_storage_path
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
-  before_save :files_to_final_location,:act_as_course_activity
+  before_save :files_to_final_location
+  after_save :act_as_course_activity
   after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index
   after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index
   after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count
@@ -606,8 +607,14 @@ class Attachment < ActiveRecord::Base
 
   #课程动态公共表记录
   def act_as_course_activity
-    if self.container_type == "Course" && self.course_acts.empty?
+    if self.container_type == "Course"
-      self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
+      if self.is_publish == 0
+        self.course_acts.destroy_all
+      else
+        if self.is_publish == 1 && self.course_acts.empty?
+          self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
+        end
+      end
     end
   end
 
@@ -644,8 +651,8 @@ class Attachment < ActiveRecord::Base
 
   def decrease_attchments_count
     if self.container_type == "Project" && !self.project.project_score.nil?
-      aatach_count = self.container.project_score.attach_num - 1
+      attach_count = self.container.project_score.attach_num - 1
-      self.container.project_score.update_attribute(:attach_num, aatach_count)
+      self.container.project_score.update_attribute(:attach_num, attach_count < 0 ? 0 : attach_count)
     end
   end
 end

app/models/comment.rb

@@ -82,9 +82,7 @@ class Comment < ActiveRecord::Base
   # 课程成员得分（英雄榜）
   def act_as_student_score
     if self.commented.course
-      unless self.author.allowed_to?(:as_teacher, self.commented.course)
+      course_member_score(self.commented.course.id, self.author_id, "NewReply")
-        course_member_score(self.commented.course.id, self.author_id, "NewReply")
-      end
     end
   end
 

app/models/course_contributor_score.rb

@@ -1,5 +1,6 @@
 class CourseContributorScore < ActiveRecord::Base
-  attr_accessible :course_id, :journal_num, :journal_reply_num, :message_num, :message_reply_num, :news_reply_num, :resource_num, :user_id, :total_score
+  attr_accessible :course_id, :journal_num, :journal_reply_num, :message_num, :message_reply_num, :news_reply_num,
+                  :resource_num, :user_id, :total_score, :homework_journal_num, :news_num
   belongs_to :course
   belongs_to :user
 end

app/models/issue.rb

@@ -184,7 +184,7 @@ class Issue < ActiveRecord::Base
   def decrease_issues_count
     unless self.project.project_score.nil?
       issue_count = self.project.project_score.issue_num - 1
-      self.project.project_score.update_attribute(:issue_num, issue_count)
+      self.project.project_score.update_attribute(:issue_num, issue_count < 0 ? 0 : issue_count)
     end
   end
 

app/models/journal.rb

@@ -219,8 +219,9 @@ class Journal < ActiveRecord::Base
   # 减少留言数量统计
   def decrease_issues_journal_count
     unless self.issue.project.nil?
-      project = self.issue.project
+      journal_count = self.issue.project.project_score.issue_journal_num - 1
-      project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num - 1)
+      # project = self.issue.project
+       self.issue.project.project_score.update_attribute(:issue_journal_num, journal_count < 0 ? 0 : journal_count)
     end
   end
 

app/models/journals_for_message.rb

@@ -283,10 +283,12 @@ class JournalsForMessage < ActiveRecord::Base
     end
   end
 
-  # 课程成员得分（英雄榜）
+  # 课程成员得分（活跃度）
   def act_as_student_score
-    if !self.user.allowed_to?(:as_teacher, self.jour) && self.jour_type == "Course"
+    if self.jour_type == "Course"
       course_member_score(self.jour_id, self.user_id, "JournalForMessage")
+    elsif self.jour_type == "HomeworkCommon"
+      course_member_score(self.jour.course_id, self.user_id, "HomeworkCommon")
     end
   end
 

app/models/message.rb

@@ -148,10 +148,10 @@ class Message < ActiveRecord::Base
       # 讨论区
       if self.parent_id.nil?
         count = self.project.project_score.board_num - 1
-        self.project.project_score.update_attribute(:board_num, count)
+        self.project.project_score.update_attribute(:board_num, count < 0 ? 0 : count)
       else # 回复
         count = self.project.project_score.board_message_num - 1
-        self.project.project_score.update_attribute(:board_message_num, count)
+        self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count)
       end
     end
   end
@@ -341,17 +341,15 @@ class Message < ActiveRecord::Base
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
   end
 
-  # 课程成员得分（英雄榜）
+  # 课程成员得分（活跃度）
   def act_as_student_score
     if self.course
-      unless  self.author.allowed_to?(:as_teacher, self.course)
+      if self.parent_id.nil?
-        if self.parent_id.nil?
+        # 发帖
-          # 发帖
+        course_member_score(self.course.id, self.author_id, "Message")
-          course_member_score(self.course.id, self.author_id, "Message")
+      else
-        else
+        # 回帖
-          # 回帖
+        course_member_score(self.course.id, self.author_id, "MessageReply")
-          course_member_score(self.course.id, self.author_id, "MessageReply")
-        end
       end
     end
   end

app/models/news.rb

@@ -59,7 +59,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities
 
@@ -129,7 +129,7 @@ class News < ActiveRecord::Base
   def decrease_news_count
     if self.project && !self.project.project_score.nil?
       count = self.project.project_score.news_num - 1
-      self.project.project_score.update_attribute(:news_num, count)
+      self.project.project_score.update_attribute(:news_num, count < 0 ? 0 : count)
     end
   end
 
@@ -195,4 +195,10 @@ class News < ActiveRecord::Base
     OrgActivity.where("container_type='OrgSubfield' and org_act_type='News' and org_act_id=?", self.id).destroy_all
   end
 
+  def act_as_student_score
+    if self.course
+      course_member_score(self.course.id, self.author_id, "News")
+    end
+  end
+
 end

app/views/admin/_tab_users.erb

@@ -0,0 +1,7 @@
+<div class="tabs">
+  <ul>
+    <li><%= link_to '用户', {:action => 'latest_login_users'},   class: "#{current_page?(latest_login_users_path)? 'selected' : nil }" %></li>
+    <li><%= link_to '老师',  {:action => 'latest_login_teachers'},  class: "#{current_page?(latest_login_teachers_path)? 'selected' : nil }" %></li>
+
+  </ul>
+</div>

app/views/admin/latest_login_teachers.html.erb

@@ -0,0 +1,84 @@
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %>
+<h3>
+  <%=l(:label_latest_login_user_list)%>
+</h3>
+<%= render 'tab_users' %>
+
+<h3>
+  最近登录老师列表
+</h3>
+<%= form_tag({}, :method => :get) do %>
+    <fieldset>
+      <legend>
+        <%= l(:label_filter_plural) %>
+      </legend>
+      <label style="float:left">开始日期：</label>
+      <%= text_field_tag 'startdate', params[:startdate], :size => 15, :onchange=>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('startdate')%><span style="float: left ">&nbsp;&nbsp;&nbsp;</span>
+      <label style="float:left">结束日期：</label>
+      <%= text_field_tag 'enddate', params[:enddate], :size => 15, :onchange =>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('enddate')%> &nbsp;
+      <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'latest_login_teachers'}, :class => 'icon icon-reload' %>
+    </fieldset>
+<% end %>
+&nbsp;
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 70px;">
+        登录时间
+      </th>
+      <th style="width: 30px;">
+        用户id
+      </th>
+      <th style="width: 50px;">
+        用户姓名
+      </th>
+      <th style="width: 50px;">
+        用户登录名
+      </th>
+      <th style="width: 50px;">
+        用户身份
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @count=@page * 30 %>
+    <% for teacher in @teachers do %>
+        <tr>
+          <% @count +=1 %>
+          <td align="center">
+            <%=@count %>
+          </td>
+          <td align="center">
+            <%=format_time(teacher.last_login_on) %>
+          </td>
+          <td align="center">
+            <%=teacher.user_id %>
+          </td>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if teacher.try(:realname) == ' '%><%= teacher.login%><% else %><%=teacher.try(:realname) %><% end %>'>
+            <% if teacher.try(:realname) == ' '%>
+                <%= link_to(teacher.login, user_path(teacher.user_id)) %>
+            <% else %>
+                <%= link_to(teacher.try(:realname), user_path(teacher.user_id)) %>
+            <% end %>
+          </td>
+          <td align="center">
+            <%=link_to(teacher.login, user_path(teacher.user_id)) %>
+          </td>
+          <td align="center">
+            老师
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>

app/views/admin/latest_login_users.html.erb

@@ -2,7 +2,10 @@
 <h3>
   <%=l(:label_latest_login_user_list)%>
 </h3>
-
+<%= render 'tab_users' %>
+<h3>
+  <%=l(:label_latest_login_user_list)%>
+</h3>
 <%= form_tag({}, :method => :get) do %>
     <fieldset>
       <legend>

app/views/admin/projects.html.erb

@@ -45,8 +45,8 @@
     </tr>
     </thead>
     <tbody>
-    <% project_tree(@projects) do |project, level| %>
+    <% @projects.each do |project| %>
-        <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+        <tr class="<%= cycle("odd", "even") %>">
           <td style="text-align: center;">
             <%= project.id %>
           </td>

app/views/boards/_course_show.html.erb

@@ -22,7 +22,7 @@
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">
-      课程讨论区
+      课程问答区
     </div>
   </div>
   <% if User.current.logged? %>

app/views/common/_file.html.erb

@@ -8,7 +8,7 @@
       <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
     </th>
     <td class="line-code">
-      <pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre>
+      <pre style="width:auto;white-space: nowrap;overflow: auto; "><%= line.html_safe %></pre>
     </td>
   </tr>
   <% line_num += 1 %>

app/views/courses/_copy_course.html.erb

@@ -1,4 +1,11 @@
 <script type="text/javascript">
+    function submit_copy_course() {
+        if(regex_course_name()&&regex_course_class_period()&&regex_time_term()&&regex_course_password())
+        {
+            $("#new_course").submit();
+            document.getElementById("submit_copy_course").onclick = "";
+        }
+    }
     $(document).ready(function(){
         $("#time").change(function(){
             document.getElementById("end_time").options[document.getElementById("time").selectedIndex].selected = true;
@@ -92,16 +99,23 @@
       <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
       <div class="cl"></div>
     </li>
-    <li class="ml58">
+    <li class="ml85">
-      <label class="fl">复制资源&nbsp;&nbsp;：</label>
+      <label class="fl">复制&nbsp;&nbsp;：</label>
-      <ul class="fl" id="copyResource">
+      <ul class="fl" id="copyResource" style="width:544px;">
-        <li class="sendCourseName fl mr15 ml5">
+        <li class="sendCourseName fl ml5">
-          <label>
+          <label class="fl">
-            <input name="checkAll" type="checkbox" id="allResource" value="0" class="resourceCopy"/>
+            <input name="course_content_type[]" type="checkbox" value="0" class="resourceCopy"/>
-            全部</label>
+            作业</label>
+            <span class="c_red ml5 fl mb10 w490">复制到新课中的作业将在1个月后发布、2个月后提交截止，请您调整作业的发布时间、截止时间等时间节点。</span>
+        </li>
+        <li class="sendCourseName fl ml5">
+          <label class="fl">
+            <input name="course_content_type[]" type="checkbox" value="1" class="resourceCopy"/>
+            资源</label>
+            <span class="c_red ml5 fl mb10">复制到新课的资源将在1个月后发布，请您调整资源的发布时间，否则学生可能看不到资源。</span>
         </li>
       </ul>
-      <ul class="fl" id="copyResource2">
+      <!--<ul class="fl" id="copyResource2">
         <li class="sendCourseName fl mr15">
           <label>
             <input name="course_attachment_type[]" type="checkbox" value="1" class="resourceCopy"/>
@@ -134,13 +148,13 @@
         </li>
         <div class="cl"></div>
       </ul>
-      <span class="c_red ml5 fl mb10">您可以通过选择资源类型，将对应资源复制到新课程中。</span>
+      <span class="c_red ml5 fl mb10">您可以通过选择类型，将对应类型复制到新课程中。</span>-->
       <div class="cl"></div>
     </li>
   <% end %>
 </ul>
 <div>
- <a href="javascript:void(0);" class="greyBtn fr mr40 f12" onclick="submit_new_course();">完成</a>
+ <a href="javascript:void(0);" class="greyBtn fr mr40 f12" id="submit_copy_course" onclick="submit_copy_course();">完成</a>
  <a href="javascript:void(0);" class="greyBtn fr mr10 f12" onclick="hideResource();">取消</a>
 </div>
 <div class="cl"></div>

app/views/courses/_tool_expand.html.erb

@@ -24,7 +24,7 @@
 <% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
     <div class="subNav">
       <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f12 c_blue02 ml10 fn" %>
-      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
+      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
     </div>
 <% end %>
 <% if show_nav?(course_feedback_count) %>

app/views/courses/copy_course.js.erb

@@ -3,7 +3,7 @@ if(document.getElementById("popbox02")) {
 }
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'copy_course') %>');
 showModal('ajax-modal', '730px');
-$('#ajax-modal').css('height','530px').css('width','730px');
+$('#ajax-modal').css('height','auto').css('width','730px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" +
 "<a href='javascript:void(0)' class='resourceClose' onclick='hideResource();'></a></div>");

app/views/courses/member.html.erb

@@ -2,7 +2,7 @@
   <h2 class="project_h2 fl"><%= @subPage_title%></h2>
   <% if User.current.allowed_to?(:as_teacher,@course) %>
     <span class="fr f14 fontGrey2" style="height: 40px; line-height: 40px; margin-right: 15px;">
-      <%=link_to "修改角色", :controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member' %>
+      <%=link_to "成员管理", :controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member' %>
     </span>
   <% end %>
 </div>

app/views/exercise/_edit_MC.html.erb

@@ -8,7 +8,7 @@
             $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
                     "<li class='ur_item'>" +
-                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<label name='select_items' class='w56'>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
                     "<input maxlength='200' type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
                     "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
                     "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
@@ -34,7 +34,7 @@
           <div id="poll_answers_<%=exercise_question.id%>">
               <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
                   <li class="ur_item">
-                    <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                    <label name='select_items' class='w56'>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
                     <input maxlength="200" type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
                     <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
                     <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>

app/views/exercise/_edit_MCQ.html.erb

@@ -8,7 +8,7 @@
             $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
                     "<li class='ur_item'>" +
-                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<label name='select_items' class='w56'>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
                     "<input maxlength='200' type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
                     "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
                     "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
@@ -34,7 +34,7 @@
           <div id="poll_answers_<%=exercise_question.id%>">
             <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
                 <li class="ur_item">
-                  <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                  <label name='select_items' class='w56'>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
                   <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
                   <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
                   <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>

app/views/exercise/_edit_single.html.erb

@@ -7,7 +7,7 @@
             $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>" +
                     "<li class='ur_item'>" +
-                    "<label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<label name='candiate_items'>候选答案<%=convert_to_chi_num(index+1) %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
                     "<input class='candiate_answer' name='exercise_choice[<%=exercise_choice.id %>]' placeholder='请输入候选答案' type='text' value='<%=exercise_choice.answer_text %>'/>" +
 
                     "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a>" +
@@ -34,7 +34,7 @@
           <div id="poll_answers_<%=exercise_question.id%>">
             <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
                 <li class="ur_item">
-                  <label>候选答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                  <label name='candiate_items'>候选答案<%=convert_to_chi_num(index+1) %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
                   <input class="candiate_answer" name="exercise_choice[<%=exercise_choice.id %>]" placeholder="请输入候选答案" type="text" value="<%=exercise_choice.answer_text %>"/>
                   <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
                   <a class="icon_remove" title="删除" onclick="remove_single_answer($(this));"></a>

app/views/exercise/_exercise_form.html.erb

@@ -162,15 +162,38 @@
     //单选题
     function add_single_answer(doc)
     {
-        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
+        var li = doc.parent().after("<li class='ur_item'><label name='select_items' class='w56'>选项&nbsp;<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
                 "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
                 "</li><div class='cl'></div>");
+        var select_items =$("label[name='select_items']",li.parent());
+        for(var i=0; i<select_items.length; i++){
+            $(select_items[i]).html("选项"+String.fromCharCode(64 + parseInt(i+1))+"<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;");
+        }
     }
     function add_candidate_answer(doc)
     {
-        doc.parent().after("<li class='ur_item'><label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
+        doc.parent().after("<li class='ur_item'><label name='candiate_items'>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
                 "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
                 "</li><div class='cl'></div>");
+        var select_items =$("label[name='candiate_items']",doc.parent().parent());
+        for(var i=0; i<select_items.length; i++){
+            $(select_items[i]).html("候选答案"+revert_to_chinese_num(i + 1)+"<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;");
+        }
+    }
+    function revert_to_chinese_num(num){
+        var s_num = "";
+        switch (num) {
+            case 1: s_num = '一'; break;
+            case 2: s_num = '二'; break;
+            case 3: s_num = '三'; break;
+            case 4: s_num = '四'; break;
+            case 5: s_num = '五'; break;
+            case 6: s_num = '六'; break;
+            case 7: s_num = '七'; break;
+            case 8: s_num = '八'; break;
+            case 9: s_num = '九'; break;
+        }
+        return s_num;
     }
     function remove_single_answer(doc)
     {
@@ -180,7 +203,16 @@
         }
         else
         {
+            var parent = doc.parent().parent();
             doc.parent().remove();
+            var select_items =$("label[name='select_items']",parent);
+            var candiate_items =$("label[name='candiate_items']",parent);
+            for(var i=0; i<select_items.length; i++){
+                $(select_items[i]).html("选项"+String.fromCharCode(64 + parseInt(i+1))+"<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;");
+            }
+            for(var i=0; i<candiate_items.length; i++){
+                $(candiate_items[i]).html("候选答案"+revert_to_chinese_num(i + 1)+"<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;");
+            }
         }
     }
 </script>

app/views/exercise/_new_MC.html.erb

@@ -18,28 +18,28 @@
       <div class="cl"></div>
       <div>
           <li class="ur_item">
-            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w56'>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w56'>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w56'>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w56'>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>

app/views/exercise/_new_MCQ.html.erb

@@ -18,28 +18,28 @@
       <div class="cl"></div>
       <div>
           <li class="ur_item">
-            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w56'>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w56'>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w56'>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w56'>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>

app/views/exercise/_new_single.html.erb

@@ -18,22 +18,22 @@
       <div class="cl"></div>
       <div>
           <li class="ur_item">
-            <label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='candiate_items'>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input  class="candiate_answer" name="exercise_choice[0]" placeholder="请输入候选答案一" type="text">
+            <input  class="candiate_answer" name="exercise_choice[0]" placeholder="请输入候选答案" type="text">
             <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='candiate_items'>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input  class="candiate_answer" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）" type="text">
+            <input  class="candiate_answer" name="exercise_choice[1]" placeholder="请输入候选答案（选填）" type="text">
             <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='candiate_items'>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input  class="candiate_answer" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）" type="text">
+            <input  class="candiate_answer" name="exercise_choice[2]" placeholder="请输入候选答案（选填）" type="text">
             <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>

app/views/exercise/_show_MC.html.erb

@@ -55,28 +55,28 @@
                                 '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
                                 '</li><div>'+
                                 '<li class="ur_item">'+
-                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w56">选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w56">选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w56">选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w56">选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+

app/views/exercise/_show_MCQ.html.erb

@@ -54,28 +54,28 @@
                                 '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
                                 '</li><div>'+
                                 '<li class="ur_item">'+
-                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w56">选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w56">选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w56">选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w56">选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+

app/views/exercise/_show_single.html.erb

@@ -9,7 +9,7 @@
   <div class="cl"></div>
   <div>
     <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
-        候选答案：<%= exercise_choice.answer_text%><br />
+        候选答案<%= convert_to_chi_num(index+1) %>：<%= exercise_choice.answer_text%><br />
     <% end %>
   </div>
 </div>
@@ -42,22 +42,22 @@
                                 '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
                                 '</li><div>'+
                                 '<li class="ur_item">'+
-                                '<label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="candiate_items">候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input class="candiate_answer" type="text" name="exercise_choice[0]" placeholder="请输入候选答案一"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[0]" placeholder="请输入候选答案"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="candiate_items">候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input class="candiate_answer" type="text" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[1]" placeholder="请输入候选答案（选填）"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="candiate_items">候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input class="candiate_answer" type="text" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）"/>'+
+                                '<input class="candiate_answer" type="text" name="exercise_choice[2]" placeholder="请输入候选答案（选填）"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li></div>'+

app/views/files/_course_file.html.erb

@@ -91,9 +91,10 @@
       <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
           <%= submit_tag "课内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %>
-          <%= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %>
+          <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %>
           <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>
-                <input class="blueBtn fr mr5" value="上传资源" onclick="course_files_upload();">
+              <input class="blueBtn fr mr5" value="上传资源" onclick="course_files_upload();">
+              <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :course_id => @course.id), :class => "blue-btn fr mr5", :remote => true) %>
           <% end %>
       <% end %>
 

app/views/files/_import_files.html.erb

@@ -0,0 +1,138 @@
+<%#= render :partial => 'users/user_resource_info' %>
+<div class="f16 fb fontBlue mb10">选用资源库中的资源</div>
+<div class="subjectList fl mr10"> <a href="javascript:void(0);" class="subjectChoose chooseActive fl">公共资源</a> <a href="javascript:void(0);" class="subjectChoose fl">我的资源</a>
+  <input type="text" name="serach" placeholder="输入关键词进行搜索" class="subjectSearch fr" />
+  <div class="cl"></div>
+  <div style="height:441px; min-height:441px; max-height:441px;">
+    <ul class="subjectBanner mt10">
+      <li class="subjectName fl hidden"><span style="padding-left:15px;">资源名称</span></li>
+      <li class="subjectType fl">类别</li>
+      <li class="subjectCount fl">大小</li>
+      <li class="subjectPublisher fl">上传者</li>
+      <li class="fl subjectDate">上传时间</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">课程资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">项目资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">附件</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">课程资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">课程资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">课程资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">课程资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">课程资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">课程资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label>
+          <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
+          <span>123456.jpg</span></label>
+      </li>
+      <li class="subjectType fl">课程资源</li>
+      <li class="subjectCount fl">123.0KB</li>
+      <li class="subjectPublisher fl">尹刚</li>
+      <li class="fl subjectDate">2016-01-21</li>
+    </ul>
+  </div>
+  <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText">选用</a></div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText">取消</a></div>
+  <div class="pageRoll mt0">
+    <div class="pageCell"><a href="javascript:void(0);" class="linkBlue">上一页</a></div>
+    <div class="pageCell pageCellActive"><a href="javascript:void(0);" class="c_white">1</a></div>
+    <div class="pageCell"><a href="javascript:void(0);" class="fontBlue">2</a></div>
+    <div class="pageCell"><a href="javascript:void(0);" class="fontBlue">3</a></div>
+    <div class="pageCell"><a href="javascript:void(0);" class="fontBlue">...</a></div>
+    <div class="pageCell"><a href="javascript:void(0);" class="fontBlue">14</a></div>
+    <div class="pageCell"><a href="javascript:void(0);" class="linkBlue">下一页</a></div>
+  </div>
+  <div class="cl"></div>
+</div>
+<div class="cl"></div>

app/views/files/_org_subfield_list.html.erb

@@ -10,7 +10,7 @@
         <div class="homepagePostTitle break_word mt-4">
           <%= link_to truncate(file.filename,length: 35, omission: '...'),
                       download_named_attachment_path(file.id, file.filename),
-                      :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+                      :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14 f_l"  %>
           <%= file_preview_eye(file, class: 'preview') %>
           <span id="image_private_<%= file.id%>">
             <% if file.is_public? == false%>

app/views/files/_project_file.html.erb

@@ -62,10 +62,12 @@
       <%= form_tag( search_project_project_files_path(@project), method: 'get',:class => "re_search",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
           <%= submit_tag "项目内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()", :style =>"width:72px;" %>
-          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+          <%#= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
           <!--REDO: 权限测试-->
           <% if User.current.member_of?(@project) %>
               <input class="blueBtn fr mr5" value="上传资源" onclick="project_files_upload();">
+              <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :project_id => @project.id), :class => "blue-btn fr mr5", :remote => true) %>
+              <!--<input class="blueBtn fr mr5" value="导入资源" onclick="project_files_import();">-->
           <% end %>
       <% end %>
     </div>

app/views/files/_project_list.html.erb

@@ -10,7 +10,7 @@
               <div class="homepagePostTitle break_word mt-4">
                 <%= link_to truncate(file.filename,length: 35, omission: '...'),
                             download_named_attachment_path(file.id, file.filename),
-                            :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkBlue f_14 f_b"  %>
+                            :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
                 <%= file_preview_eye(file, class: 'preview') %>
                 <span id="image_private_<%= file.id%>">
                         <% if file.is_public? == false%>

app/views/files/_resource_detail.html.erb

@@ -8,7 +8,7 @@
       <div class="homepagePostTitle break_word mt-4">
         <%= link_to truncate(file.filename,length: 35, omission: '...'),
                     download_named_attachment_path(file.id, file.filename),
-                    :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkBlue f_14 f_b"  %>
+                    :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14"  %>
         <%= file_preview_eye(file, class: 'preview') %>
         <span id="image_private_<%= file.id%>">
                         <% if file.is_public? == false%>
@@ -27,6 +27,10 @@
         <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
         <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
       </div>
+      <% unless file.description.blank? %>
+          <div class="cl"></div>
+          <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
+      <% end %>
       <div class="cl"></div>
       <div class="tag_h">
         <!-- container_type = 1 代表是课程里的资源 -->

app/views/files/_subfield_files.html.erb

@@ -40,8 +40,9 @@
       <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
           <%= submit_tag "栏目内搜索", :class => "blueBtn mr5 fl",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
-          <%= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+          <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
           <input class="blueBtn fr mr5" value="上传资源" onclick="org_upload_files(<%= org_subfield.id %>);">
+          <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :subfield_file_id => @org_subfield.id), :class => "blue-btn fr mr5", :remote => true) %>
           <%#= link_to "上传资源",subfield_upload_file_org_subfield_files_path(@org_subfield.id, :in_org => 1),:method => "post",:class=>"blueBtn fr mr5",:remote => true %>
       <% end %>
     </div><!---re_top end-->

app/views/files/_upload_course_files.erb

@@ -22,6 +22,14 @@
           <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
           </div>
           <div class="cl"></div>
+          <div class="mb5">
+            <label class="fl c_dark f14" style="margin-top: 4px;">附件描述：</label>
+            <div class="fl">
+              <input  type="text" name="description"  placeholder="文件描述" class="fl W120 ">
+            </div>
+            <div class="cl"></div>
+          </div>
+
           <% if User.current.allowed_to?(:as_teacher,course) %>
               <div class="mb5">
                 <label class="fl c_dark f14" style="margin-top: 4px;">延迟发布：</label>

app/views/files/index.html.erb

@@ -13,7 +13,6 @@
       </div>
   <% end %>
 
-
 <script type='text/javascript'>
     var slideHeight = 29;
     function readmore(aNode) {

app/views/homework_common/_alert_open_student_works.html.erb

@@ -0,0 +1,23 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <% if @homework.is_open == 0 %>
+        <h2>公开作品</h2>
+        <p>
+          本次作业的所有作品将对Trustie平台所有注册用户开放，请问是否确定公开作品？
+        </p>
+    <% else %>
+        <h2>取消公开作品</h2>
+        <p>
+          您将取消“公开作品”的功能，本次作业的作品将不对Trustie平台其他未加入本课程的用户开放，请问是否确定？
+        </p>
+    <% end %>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= open_student_works_homework_common_path(@homework, :user_activity_id => @user_activity_id,:is_in_course=>@is_in_course, :course_activity => @course_activity)%>');" style="margin-bottom: 20px;" >
+        确&nbsp;&nbsp;定
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+  </div>
+</div>

app/views/homework_common/alert_open_student_works.js.erb

@@ -0,0 +1,6 @@
+$("#ajax-modal").html("<%=escape_javascript(render :partial => 'alert_open_student_works') %>");
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");

app/views/homework_common/open_student_works.js.erb

@@ -0,0 +1,7 @@
+<% if @user_activity_id.to_i == -1 %>
+$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
+<% 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}) %>");
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
+<% end %>

app/views/issues/_detail.html.erb

@@ -8,7 +8,7 @@
       <% when 1%>
           <span class="issues fl" title="缺陷"></span>
       <% when 2%>
-          <span class="function fl" title="功能"></span>
+          <span class="issues-function fl" title="功能"></span>
       <% when 3%>
           <span class="support fl" title="支持"></span>
       <% when 4%>

app/views/layouts/_logined_header.html.erb

@@ -8,10 +8,16 @@
         <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db p10", :title => "回到个人首页"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="c_white f16 db p10">资源库</a></li>
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource', :id => User.current.id, :type => 6) %>" class="c_white f16 db p10">资源库</a></li>
+      <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
       <li class="navHomepageMenu fl">
-        <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
+            <%= link_to "题库",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
       </li>
+      <% else %>
+          <li class="navHomepageMenu fl">
+            <%= link_to "我的作业",  student_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
+          </li>
+      <% end %>
       <li class="navHomepageMenu fl mr30">
         <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
       </li>

app/views/layouts/base_courses.html.erb

@@ -1,8 +1,13 @@
 <%# course_model %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
+<% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
+    <% homework_num = @course.homework_commons.count %>
+<% else %>
+    <% homework_num = @course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
+<% end %>
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns="http://www.w3.org/1999/html">
 <head>
   <meta charset="utf-8">
   <title>
@@ -74,7 +79,7 @@
         <% unless show_nav?(@course.homework_commons.count) %>
         <div class="subNav">
           <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
-          <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
+          <%= link_to "(#{homework_num})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
           <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
         </div>
         <% end %>
@@ -99,7 +104,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
+          <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
         </div>
         <% end %>
         <% unless show_nav?(course_feedback_count) %>
@@ -137,29 +142,60 @@
       <div class="cl"></div>
       <% unless contributor_course_scor(@course.id).count == 0 %>
         <ul class="rankList">
-        <h4>课程活跃度</h4>
+        <h4>课程活跃度
+          <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a>
+        </h4>
+          <div  style="display: none;padding: 5px;" class="numIntro color_888">
+            <div class="contributor_course_innor">积分规则</div>
+            资源发布：资源数 x 5 </br>
+            问答发布：发帖数 x 2 </br>
+            通知发布：通知数 x 1 </br>
+            问答回复：回复数 x 1 </br>
+            作业留言：留言数 x 1 </br>
+            通知留言：留言数 x 1 </br>
+            课程留言：留言数 x 1  </br>
+            总得分为以上得分之和
+         </div>
+
         <% contributor_course_scor(@course.id).each do |contributor_score| %>
-          <% unless contributor_score.total_score ==0 %>
+           <% total_score = contributor_score.resource_num.to_i * 5 + contributor_score.message_num.to_i * 2 +
+                  contributor_score.message_reply_num.to_i * 1 + contributor_score.journal_num.to_i * 1 +
+                  + contributor_score.homework_journal_num.to_i * 1 + contributor_score.news_reply_num.to_i * 1 +
+                  contributor_score.news_num.to_i * 1 %>
+          <% unless total_score ==0 %>
             <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %></a>
               <p><a href="javascript:void:(0);"><%=link_to contributor_score.user.show_name, user_path(contributor_score.user), :title => contributor_score.user.show_name %></a></p>
               <p><span class="c_green" style="cursor:pointer">
-                <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green"><%= contributor_score.total_score.to_i %></a></span></p>
+                <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
-              <div  style="display: none" class="numIntro">
+                  <%=total_score %></a></span></p>
-                <% unless contributor_score.resource_num == 0 %>
+              <div  style="display: none" class="numIntro color_888">
-                    课程资源：<%= contributor_score.resource_num %><br />
+                <div class="contributor_course_calculate">积分计算</div>
-                <% end %>
+                <%# unless  contributor_score.resource_num.to_i == 0 %>
-                <% unless contributor_score.message_num == 0 %>
+                <div style="padding-left: 2px;padding-bottom: 2px;padding-right: 2px">
-                    课程讨论：<%= contributor_score.message_num %><br />
+                  资源发布数 x 5 = <%= contributor_score.resource_num.to_i %> x 5 = <%= contributor_score.resource_num.to_i * 5 %></br>
-                <% end %>
+                  <%# end %>
-                <% unless contributor_score.message_reply_num == 0 %>
+                  <%# unless  contributor_score.message_num.to_i == 0 %>
-                    评论回复：<%= contributor_score.message_reply_num %><br />
+                  问答发布数 x 2 = <%= contributor_score.message_num.to_i %> x 2 = <%= contributor_score.message_num.to_i * 2 %></br>
-                <% end %>
+                  通知发布数 x 1 = <%= contributor_score.news_num.to_i %> x 1 = <%= contributor_score.news_num.to_i %></br>
-                <% unless contributor_score.journal_num == 0 %>
+                  <%# end %>
-                    课程留言：<%= contributor_score.journal_num %><br />
+                  <%# unless  contributor_score.message_reply_num.to_i == 0 %>
-                <% end %>
+                  问答回帖数 x 1 = <%= contributor_score.message_reply_num.to_i %> x 1 = <%= contributor_score.message_reply_num.to_i %></br>
-                <% unless contributor_score.news_reply_num == 0 %>
+                  作业留言数 x 1 = <%= contributor_score.homework_journal_num.to_i %> x 1 = <%= contributor_score.homework_journal_num.to_i %></br>
-                    课程通知：<%= contributor_score.news_reply_num %><br />
+                  通知留言数 x 1 = <%= contributor_score.news_reply_num.to_i %> x 1 = <%= contributor_score.news_reply_num.to_i %></br>
-                <% end %>
+                  <%# end %>
+                  <%# unless  contributor_score.journal_num.to_i == 0 %>
+                  课程留言数  x 1 = <%= contributor_score.journal_num.to_i %> x 1 = <%= contributor_score.journal_num.to_i %></br>
+                  <%# end %>
+                  <%# unless  contributor_score.homework_journal_num.to_i == 0 %>
+
+                  <%# end %>
+                  <%# unless  contributor_score.news_reply_num.to_i == 0 %>
+
+
+                  <%# end %>
+                  总得分：<%=total_score %>
+                </div>
+
               </div>
             </li>
           <% end %>
@@ -171,12 +207,17 @@
       <% hero_homework_scores = hero_homework_score(@course, "desc") %>
       <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
         <ul class="rankList">
-          <h4>课程英雄榜</h4>
+          <h4><span>课程英雄榜</span>
+            <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a></h4>
+          <div  style="display: none" class="numIntro color_888">
+            <div class="hero_course_innor">积分规则</div>
+            英雄榜的得分是每个同学作业的得分总和
+          </div>
           <% hero_homework_scores.each do |student_score| %>
               <% if student_score.score.to_i != 0 %>
                   <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %></a>
                     <p><a href="javascript:void:(0);"><%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %></a></p>
-                    <p><span class="c_red" style="cursor:pointer" title="作业总分：<%= student_score.score  %>"><%= student_score.score.to_i %></span></p>
+                    <p><span class="c_red" style="cursor:pointer" ><%= student_score.score<0 ? 0 : student_score.score.to_i %></span></p>
                   </li>
               <% end %>
           <% end %>
@@ -295,6 +336,16 @@
         obj.parent().parent().next("div").hide();
     }
 
+    function message_titile_show2(obj,e)
+    {
+        obj.parent().next("div").show();
+        obj.parent().next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute");
+    }
+    function message_titile_hide2(obj)
+    {
+        obj.parent().next("div").hide();
+    }
+
     $("#expand_tools_expand").click(function(){
        $("#navContentCourse").toggle();
     });

app/views/layouts/base_projects.html.erb

@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'header','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
+  <%= stylesheet_link_tag 'header','scm','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>
@@ -66,7 +66,7 @@
         <!-- 项目得分 -->
         <div class="cl"></div>
         <div>
-          <%= link_to l(:label_project_name)+"#{@project.name}", project_path(@project.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+          <%= link_to "#{@project.name}", project_path(@project.id), :class=>"pr_info_name fl c_dark fb break_word" %>
           <% if @project.is_public? %>
             <span class="img_private"><%= l(:label_public)%></span>
           <% else %>

app/views/layouts/static_base.html.erb

@@ -47,7 +47,10 @@
 <div class="cl"></div>
 <%= render :partial => 'layouts/footer' %>
 <div class="cl"></div>
-
+<div id="ajax-modal" style="display:none;"></div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>

app/views/org_document_comments/_new.html.erb

@@ -1,8 +1,12 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor"  %>
 <% end %>
 
 <script>
+    $(function(){
+        init_des_data(150);
+    });
     function check_org_title()
     {
         if($("#document_title").val().trim() == "")
@@ -26,14 +30,14 @@
     }
     function cancel_create_org_document(){
         $("#document_title").val("");
-        org_document_description_editor.html("");
+        //org_document_description_editor.html("");
-        org_document_description_editor.sync();
+        //org_document_description_editor.sync();
         $('#org_document_editor').hide();
         $('#doc_title_hint').hide();
     }
 </script>
-<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
+    <div class="resources" nhname="new_topic_form">
-    <div class="resources">
+      <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
       <div>
         <input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题" />
       </div>
@@ -41,10 +45,10 @@
       <div class="cl"></div>
       <div id="org_document_editor" class="mt10" style="display: none">
         <div>
-          <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
+          <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
         </div>
         <div class="cl"></div>
-
         <p id="homework_course_id_span" class="c_red mt5"></p>
         <div class="cl"></div>
         <div class="mt10">
@@ -54,12 +58,11 @@
         </div>
         <div class="cl"></div>
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
           <span class="fr mr10 mt3">或</span>
-          <a href="javascript:void(0);" onclick="cancel_create_org_document();" class="fr mr10 mt3">取消</a>
+          <a href="javascript:void(0);" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
           <div class="cl"></div>
         </div>
-
       </div>
+      <% end %>
     </div>
-<% end %>

app/views/org_document_comments/edit.html.erb

@@ -31,7 +31,7 @@
       </div>
       <div id="doc_title_hint"></div>
       <div class="cl"></div>
-      <div id="org_document_editor" >
+      <div>
         <div class="mt10">
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"><%=@org_document.content.html_safe %></textarea>
           <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>

app/views/org_document_comments/new.html.erb

@@ -39,7 +39,7 @@
     </div>
     <div id="doc_title_hint">
     </div>
-    <div id="org_document_editor" class="mt15" >
+    <div class="mt15" >
       <div class="mt10">
         <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
         <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>

app/views/org_subfields/_show_details.html.erb

@@ -42,7 +42,7 @@
             });
         </script>
         <% if act.container_type == 'Organization' %>
-            <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
+            <% if act.org_act_type == 'OrgDocumentComment' %>
                 <%= render :partial => 'organizations/show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
             <% end %>
         <% end %>

app/views/organizations/_org_course_homework.html.erb

@@ -89,7 +89,7 @@
         <% end %>
         <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %>
             <div class="homepagePostDeadline">提交截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
-        <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 %>
+        <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2  && activity.anonymous_comment == 0%>
             <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
         <% end %>
       </div>
@@ -114,9 +114,11 @@
       </div>
       <div class="cl"></div>
       <div>
-        <div class="homepagePostDeadline">
+        <% if activity.anonymous_comment == 0%>
-          缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
+            <div class="homepagePostDeadline">
-        </div>
+              缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
+            </div>
+        <% end %>
         <% if activity.anonymous_comment == 0%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
               匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
@@ -126,7 +128,7 @@
       <div class="cl"></div>
       <% if activity.student_works.count != 0 %>
           <% sw = activity.student_works.reorder("created_at desc").first %>
-          <div class="mt10 homepagePostDeadline">
+          <div class="mt10 homepagePostDeadline mb10">
             #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
           </div>
       <% end %>
@@ -137,30 +139,36 @@
         <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
-            <div class="mt10">
+            <div>
               <p class="mb10 fontGrey2">#&nbsp;<%=time_from_now last_score.created_at %>
                 <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
               </p>
-              <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
-              <% student_works.each_with_index do |sw, i| %>
-                  <div class="fl mr10 w100" style="text-align:center;">
-                    <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                      <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
-                    </a>
-                    <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
-                    <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
-                  </div>
-                  <% if i == 4 %>
-                      <% break %>
-                  <% end %>
-              <% end %>
-              <% if student_works.count > 5 %>
-                  <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
-              <% end %>
-              <div class="cl"></div>
             </div>
         <% end %>
+        <div>
+          <% if activity.homework_type != 2 %>
+              <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
+              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+          <% else %>
+              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+          <% end %>
+          <% student_works.each_with_index do |sw, i| %>
+              <div class="fl mr10 w100" style="text-align:center;">
+                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
+                </a>
+                <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
+                <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
+              </div>
+              <% if i == 4 %>
+                  <% break %>
+              <% end %>
+          <% end %>
+          <% if student_works.count > 5 %>
+              <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+          <% end %>
+          <div class="cl"></div>
+        </div>
     <% end %>
       <div class="cl"></div>
         <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
@@ -237,7 +245,17 @@
                   <% end %>
                   <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
                       <li>
-                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink",
+                                    :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品",:remote => true)%>
+                      </li>
+                  <% end %>
+                  <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
+                      <li>
+                        <%= link_to("公开作品", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% elsif activity.is_open == 1 %>
+                      <li>
+                        <%= link_to("取消公开", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
                       </li>
                   <% end %>
                 </ul>

app/views/organizations/_org_course_message.html.erb

@@ -12,7 +12,7 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->

app/views/projects/member.html.erb

@@ -1,5 +1,10 @@
 <div class="project_r_h">
-  <h2 class="project_h2"><%= @subPage_title %></h2>
+  <h2 class="project_h2 fl"><%= @subPage_title%></h2>
+  <% if is_project_manager?(User.current, @project) %>
+    <span class="fr f14 fontGrey2" style="height: 40px; line-height: 40px; margin-right: 15px;">
+      <%=link_to "成员管理", :controller => 'projects', :action => 'settings', :id => @project.id, :tab => 'members' %>
+    </span>
+  <% end %>
 </div>
 <div class="member_content">
 	<%= error_messages_for 'member' %>

app/views/projects/settings.html.erb

@@ -1,17 +1,17 @@
 <script type="text/javascript">
     $(function(){
-        <%if @select_tab%>
+        <%if @select_tab %>
-          <%if @select_tab == "modules"%>
+          <% if @select_tab == "modules" %>
             project_setting(2);
-          <% elsif @select_tab == "members"%>
+          <% elsif @select_tab == "members" %>
             project_setting(3);
-          <% elsif @select_tab == "versions"%>
+          <% elsif @select_tab == "versions" %>
             project_setting(4);
             $("#pro_st_edit_ban").toggle();
           <% elsif @select_tab == "repositories" %>
             project_setting(6);
             $("#pro_st_edit_ku").toggle();
-          <%else%>
+          <% else %>
              project_setting(5);
           <% end%>
         <% end%>

app/views/projects/settings/_new_edit.html.erb

@@ -18,6 +18,13 @@
           <textarea class="w543" id="project_description" name="project[description]" rows="8" placeholder="最多3000个汉字(或6000个英文字符)"><%= @project.description%></textarea>
           <div class="cl"></div>
         </li>
+        <% if !@project.gpid.nil? && !@gitlab_branches.blank? %>
+          <li>
+            <label class="label02">&nbsp;默认分支&nbsp;&nbsp;：</label>
+            <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %>
+          </li>
+        <% end %>
+        <div class="cl"></div>
         <li >
           <label class="label02">公开&nbsp;&nbsp;：</label>
           <input id="project_is_public" name="project[is_public]" type="checkbox" <%= @project.is_public ? "checked" : ""%>>

app/views/projects/settings/_new_repositories.html.erb

@@ -46,9 +46,9 @@
                 <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
                 <span class="f14"><span class="c_red">*</span><%=l(:label_repository_name)%>：</span>
                 <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
-                <% unless @repository.identifier_frozen? %>
+                <%# unless @repository.identifier_frozen? %>
                     <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
-                <% end %>
+                <%# end %>
               </li>
               <div class="cl"></div>
             </ul>

app/views/repositories/_commit_details.html.erb

@@ -0,0 +1,15 @@
+<div class="commit-row-info">
+  <% if !user_commit_rep(changeset.author_email).nil? %>
+      <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
+                        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
+        <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>提交于
+      <div class="committed_ago">
+        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>前 </time>&nbsp;
+      </div>
+  <% else %>
+      <span class="commit-author-name"><%= changeset.author_email %></span>提交于
+      <div class="committed_ago">
+        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
+      </div>
+  <% end %>
+</div>

app/views/repositories/_dir_list_content.html.erb

@@ -24,10 +24,10 @@
 <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
   <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <% if @repository.report_last_commit %>
-<td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
+      <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
-<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
+      <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-<td class="author"><%= entry.author %></td>
+      <td class="author"><%= entry.author %></td>
-<td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
+      <td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
 <% end %>
 </tr>
 <% end %>

app/views/repositories/_navigation.html.erb

@@ -18,7 +18,7 @@
       <!-- Branches Dropdown -->
       <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
           <%= l(:label_branch) %>:
-          <%= select_tag :branch, options_for_select([''] + @repository.branches, @rev), :id => 'branch' %>
+          <%= select_tag :branch, options_for_select(@repository.branches, @rev), :id => 'branch' %>
       <% end -%>
 
       <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>

app/views/repositories/_revisions.html.erb

@@ -20,27 +20,13 @@
           <div class="col-md-10 col-sm-12">
             <ul class="bordered-list">
               <li class="commit js-toggle-container">
-                <div class="commit-row-info">
+                <%= render :partial => 'commit_details', :locals => {:changeset => changeset} %>
-                  <% if !user_commit_rep(changeset.author_email).nil? %>
-                      <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
-                        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
-                        <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>提交于
-                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>前 </time>&nbsp;
-                      </div>
-                  <% else %>
-                      <span class="commit-author-name"><%= changeset.author_email %></span>提交于
-                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
-                      </div>
-                  <% end %>
-                </div>
                 <div style="padding-left:30px;" class="commit-row-title">
                 <strong class="str-truncated">
                   <a class="commit-row-message"><%= textilizable(truncate_at_line_break(changeset.message)) %></a>
                 </strong>
                 <div class="pull-right" title="修订号">
-                  <%= h truncate(changeset.short_id.to_s, :length => 20) %>
+                  <%= link_to truncate(changeset.short_id.to_s, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => project.id, :changeset => changeset.id} %>
                 </div>
                 <div class="notes_count">
                 </div>

app/views/repositories/changes.html.erb

@@ -15,7 +15,7 @@
 
 <div class="mt10">
 
-  <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path ,:revisions => @commits, :entry => @entry ,:commits_pages =>@commits_pages , :commits_count => @commits_count}) unless @commits.empty? %>
+  <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path , :revisions => @commits, :entry => @entry , :commits_pages => @commits_pages , :commits_count => @commits_count}) unless @commits.empty? %>
 
 </div>
 <% content_for :header_tags do %>

app/views/repositories/commit_diff.html.erb

@@ -0,0 +1,55 @@
+<div class="project_r_h">
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+</div>
+<!--<script>-->
+<!--//    $(document).ready(function(){-->
+<!--//        $("#changed-files").click(function(){-->
+<!--//            $("#changed-files-detail").toggle();-->
+<!--//        });-->
+<!--//    });-->
+<!--</script>-->
+<div class="showing-changes-info fontGrey2"> Commit <a href="javascript:void()" class="linkGrey3">
+  <%= @commit_details.id %></a><br />
+  <li class="commit js-toggle-container">
+    <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
+  </li>
+</div>
+<div class="showing-changes-project f14"><%= @commit_details.message %></div>
+<!--<div class="showing-changes-row fontGrey2">Showing <a href="javascript:void()" class="linkGrey3" id="changed-files">3 changed files</a> with <span class="c_green">3 additions</span> and <span class="c_red">3 deletions</span>-->
+  <!--<ol class="mt10" id="changed-files-detail">-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/organizations/_org_course_homework.html.erb</a> </li>-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_course_homework.html.erb</a> </li>-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_user_homework_detail.html.erb</a> </li>-->
+  <!--</ol>-->
+<!--</div>-->
+
+<% @commit_diff.each do |cd| %>
+    <div class="showing-changes-row fontGrey2">
+      <a href="javascript:void()" class="linkGrey3" id="changed-files">
+        <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd.new_path %>
+      </a>
+    </div>
+    <div class="autoscroll">
+      <table class="filecontent syntaxhl" style="width:100%;" >
+        <tbody>
+        <% line_num = diff_line_num(cd.diff) %>
+        <% diff_content = diff_content(cd.diff) %>
+        <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
+            <tr>
+              <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
+                <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
+              </th>
+              <% if line[0,1] == "-" %>
+                  <td class="line-code diff_out"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% elsif line[0,1] == "+" %>
+                  <td class="line-code diff_in"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% else%>
+                  <td class="line-code"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% end %>
+            </tr>
+            <% line_num += 1 %>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+<% end %>

app/views/student_work/_student_work_list.html.erb

@@ -4,15 +4,16 @@
       <font class="f12 c_red">
         (<%= @student_work_count%>人已交)
       </font>
-    <% if !@is_teacher && @stundet_works.empty?%>
+    <% my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
+    <% if !@is_teacher && my_work.nil? && User.current.member_of_course?(@course) %>
        <span class="f12 c_red">您尚未提交作品</span>
-    <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
+    <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
        <span class="f12 c_red">您已提交且不可再修改，因为截止日期已过</span>
-    <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
+    <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
        <span class="f12 c_red">您已提交，您还可以修改</span>
     <% end %>
   </span>
-  <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%>
+  <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3 || @homework.is_open == 1%>
       <div class="hworkSearchBox">
         <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
         <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>

app/views/student_work/edit.html.erb

@@ -41,12 +41,12 @@
             <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>str %>
         <% end %>
         <div>
-          <input type="text" name="student_work[name]" id="student_work_name" placeholder="请简洁的概括作品的功能或特性" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
+          <input type="text" name="student_work[name]" id="student_work_name" placeholder="请输入作品名称" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
           <div class="cl"></div>
           <p id="student_work_name_span" class="c_red mb10"></p>
         </div>
         <div class="mt10">
-          <textarea  name="student_work[description]" id="student_work_description" placeholder="请介绍你的作品"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
+          <textarea  name="student_work[description]" id="student_work_description" placeholder="请输入作品描述"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
           <script>
               var text = document.getElementById("student_work_description");
               autoTextarea(text);// 调用

app/views/student_work/new.html.erb

@@ -127,12 +127,12 @@
             <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>User.current.id %>
         <% end %>
         <div>
-          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请简洁的概括作品的功能或特性", :onkeyup => "regexStudentWorkName();" %>
+          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请输入作品名称", :onkeyup => "regexStudentWorkName();" %>
           <div class="cl"></div>
           <p id="student_work_name_span" class="c_red mb10"></p>
         </div>
         <div class="mt10">
-          <%= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请介绍你的作品", :onkeyup => "regexStudentWorkDescription();"%>
+          <%= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请输入作品描述", :onkeyup => "regexStudentWorkDescription();"%>
           <script>
               var text = document.getElementById("student_work_description");
               autoTextarea(text);// 调用

app/views/users/_course_homework.html.erb

@@ -89,7 +89,7 @@
         <% end %>
         <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %>
             <div class="homepagePostDeadline">提交截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
-        <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 %>
+        <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 && activity.anonymous_comment == 0%>
             <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
         <% end %>
       </div>
@@ -114,9 +114,11 @@
       </div>
       <div class="cl"></div>
       <div>
-        <div class="homepagePostDeadline">
+        <% if activity.anonymous_comment == 0%>
-          缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
+            <div class="homepagePostDeadline">
-        </div>
+              缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
+            </div>
+        <% end %>
         <% if activity.anonymous_comment == 0%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
               匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
@@ -126,7 +128,7 @@
       <div class="cl"></div>
       <% if activity.student_works.count != 0 %>
         <% sw = activity.student_works.reorder("created_at desc").first %>
-        <div class="mt10 homepagePostDeadline">
+        <div class="mt10 homepagePostDeadline mb10">
           #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
         </div>
     <% end %>
@@ -136,30 +138,36 @@
         <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
-            <div class="mt10">
+            <div>
               <p class="mb10 fontGrey2">#&nbsp;<%=time_from_now last_score.created_at %>
                 <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
               </p>
-              <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
-              <% student_works.each_with_index do |sw, i| %>
-                  <div class="fl mr10 w100" style="text-align:center;">
-                    <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                      <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
-                    </a>
-                    <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
-                    <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
-                  </div>
-                  <% if i == 4 %>
-                    <% break %>
-                  <% end %>
-              <% end %>
-              <% if student_works.count > 5 %>
-                <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
-              <% end %>
-              <div class="cl"></div>
             </div>
         <% end %>
+        <div>
+          <% if activity.homework_type != 2 %>
+            <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
+            <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+          <% else %>
+            <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+          <% end %>
+          <% student_works.each_with_index do |sw, i| %>
+              <div class="fl mr10 w100" style="text-align:center;">
+                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
+                </a>
+                <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
+                <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
+              </div>
+              <% if i == 4 %>
+                <% break %>
+              <% end %>
+          <% end %>
+          <% if student_works.count > 5 %>
+            <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+          <% end %>
+          <div class="cl"></div>
+        </div>
     <% end %>
     <div class="cl"></div>
       <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
@@ -236,7 +244,17 @@
                   <% end %>
                   <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
                       <li>
-                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink",
+                                    :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
+                      </li>
+                  <% end %>
+                  <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
+                      <li>
+                        <%= link_to("公开作品", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% elsif activity.is_open == 1 %>
+                      <li>
+                        <%= link_to("取消公开", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
                       </li>
                   <% end %>
                 </ul>

app/views/users/_course_message.html.erb

@@ -20,7 +20,7 @@
             <% end %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->

app/views/users/_homework_detail_information.html.erb

@@ -1,9 +1,9 @@
-<div class="subjectInfo">题目信息</div>
+<div class="subject-pop-info">题目信息</div>
-<div class="subjectWrap">
+<div class="subject-pop-wrap">
   <% if homework.nil? %>
       <span class="c_red" id="homework_notice_span">请先在左侧选择作业</span>
   <% else %>
-      <div class="subjectIntro mb15">标题：<%=homework.name %><br />
+      <div class="subject-pop-intro mb15">标题：<%=homework.name %><br />
         来源：<%=homework.course.name %><br />
         <% if homework.homework_type == 2 && homework.homework_detail_programing %>
           编程语言：<%=homework.language_name %><br/>
@@ -15,15 +15,15 @@
         <br />
         描述如下：
       </div>
-      <div class="subjectContent" id="homework_description">
+      <div class="subject-pop-content" id="homework_description">
         <%=homework.description.html_safe %>
       </div>
       <% if homework.homework_type == 2 %>
-          <div class="subjectContent mt10">
+          <div class="subject-pop-content mt10">
             测试集：<%=homework.homework_tests.count %>组
           </div>
       <% elsif homework.homework_type ==3 && homework.homework_detail_group %>
-          <div class="subjectContent mt10">
+          <div class="subject-pop-content mt10">
             分组人数：<%=homework.homework_detail_group.min_num %> - <%=homework.homework_detail_group.max_num %>人
           </div>
       <% end %>

app/views/users/_homework_post_notice.html.erb

@@ -0,0 +1,12 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <p style="display: block;font-size: 14px;margin-left: 30px;margin-top: 20px;">
+      题目已发送到目标课程的作业列表，但需要您设置发布和截止时间，以激活相应作业，谢谢！
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:void(0)" class="tijiao c_white ml45" onclick="hideModal();">
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>

app/views/users/_homework_repository.html.erb

@@ -0,0 +1,39 @@
+<script type="text/javascript">
+    function show_homework_detail(url){
+        $.get(
+                url,
+                {
+
+                },
+                function (data) {
+                }
+        );
+    }
+</script>
+
+<div class="h450">
+    <% homeworks.each do |homework| %>
+      <ul class="subject-list-row">
+        <li class="subject-list-name fl hidden">
+            <label onclick="show_homework_detail('<%=show_homework_detail_user_path(@user,:homework=>homework.id,:is_import => 0) %>')">
+              <input type="radio" name="checkMenu" class="mr5" style="vertical-align:middle;" value="<%= homework.id%>"/>
+              <span title="<%= homework.name%>"><%= homework.name%></span>
+            </label>
+          </li>
+          <li class="subject-list-from fl hidden"><span title="<%=homework.course.name %>(<%=current_time_and_term(homework.course) %>)"><%=homework.course.name %>(<%=current_time_and_term_short(homework.course) %>)</span></li>
+          <li class="subject-list-type fl">
+            <% case homework.homework_type %>
+            <% when 1 %>
+                普通
+            <% when 2 %>
+                编程
+            <% when 3 %>
+                分组
+            <% end %>
+          </li>
+          <li class="subject-list-publisher fl hidden"><%= homework.user.show_name %></li>
+          <li class="subject-list-count fl" id="subject_count_homework_<%=homework.id %>"><%= homework.quotes %></li>
+          <li class="fl subject-list-date"><%=format_date homework.publish_time %></li>
+        </ul>
+    <% end %>
+</div>

app/views/users/_homework_repository_detail.html.erb

@@ -0,0 +1,33 @@
+<div class="subjectDetail fl mt10">
+  <div class="subjectInfo">题目信息</div>
+  <div class="subject-content-wrapper">
+    <% if homework.nil? %>
+        <span class="c_red" id="homework_notice_span">请先在左侧选择作业</span>
+    <% else %>
+        <div class="subjectIntro mb15">标题：<%=homework.name %><br />
+          来源：<%=homework.course.name %><br />
+          <% if homework.homework_type == 2 && homework.homework_detail_programing %>
+              编程语言：<%=homework.language_name %><br/>
+          <% end %>
+          贡献者：<%=homework.user.show_name %>
+          <% if homework.user.user_extensions.occupation && homework.user.user_extensions.occupation!="" %>
+              ，<%=homework.user.user_extensions.occupation%>
+          <% end %>
+          <br />
+          描述如下：
+        </div>
+        <div class="subjectContent" id="homework_description">
+          <%=homework.description.html_safe %>
+        </div>
+        <% if homework.homework_type == 2 %>
+            <div class="subjectContent mt10">
+              测试集：<%=homework.homework_tests.count %>组
+            </div>
+        <% elsif homework.homework_type ==3 && homework.homework_detail_group %>
+            <div class="subjectContent mt10">
+              分组人数：<%=homework.homework_detail_group.min_num %> - <%=homework.homework_detail_group.max_num %>人
+            </div>
+        <% end %>
+    <% end %>
+  </div>
+</div>

app/views/users/_homework_repository_search.html.erb

@@ -0,0 +1,29 @@
+<input type="text" name="search" placeholder="输入作业、老师姓名的关键词进行搜索" class="subject-pop-search fr" />
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_hws(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'users', :action => 'user_search_homeworks') %>'+'?name='+ e.target.value+'&type=<%=type %>&is_import=<%=is_import %>&property=<%=property %>',
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询项目
+    $("input[name='search']").on('input', function (e) {
+        throttle(search_hws,window,e);
+    });
+
+</script>

app/views/users/_homework_search_input.html.erb

@@ -1,4 +1,4 @@
-<input type="text" name="search" placeholder="输入关键词进行搜索" class="subjectSearch fr" />
+<input type="text" name="search" placeholder="输入作业、老师姓名的关键词进行搜索" class="subject-pop-search fr" />
 <script type="text/javascript">
     var lastSearchCondition = '';
     var count = 0;
@@ -9,7 +9,7 @@
         }
         lastSearchCondition = $(e.target).val().trim();
         $.ajax({
-            url: '<%= url_for(:controller => 'users', :action => 'user_search_homeworks') %>'+'?name='+ e.target.value+'&type=<%=type %>',
+            url: '<%= url_for(:controller => 'users', :action => 'user_search_homeworks') %>'+'?name='+ e.target.value+'&type=<%=type %>&is_import=<%=is_import %>',
             type:'get'
         });
     }

app/views/users/_import_resource_info.html.erb

@@ -0,0 +1,75 @@
+<script>
+    $(document).ready(function(){
+        <% if type == "1" %>
+            $("#my_resources_choose").addClass("choose-active");
+            $("#public_resources_choose").removeClass("choose-active");
+        <% end %>
+
+        $(".subject-choose").click(function(){
+            $(".subject-choose").removeClass("choose-active");
+            $(this).addClass("choose-active");
+        });
+        $(".popupClose").click(function(){
+            $(".popupWrap").hide();
+        });
+    });
+</script>
+<div class="f16 fb fontBlue mb10">选用资源库中的资源</div>
+<div class="subjectList fl mr10">
+  <% if !params[:course_id].nil? %>
+      <a href="<%= import_resources_user_path(User.current, :type => '6', :course_id => params[:course_id]) %>" id="public_resources_choose" class="subject-choose choose-active fl" data-remote="true">公共资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '1', :course_id => params[:course_id]) %>"  id="my_resources_choose"  class="subject-choose fl" data-remote="true">我的资源</a>
+  <% elsif !params[:project_id].nil? %>
+      <a href="<%= import_resources_user_path(User.current, :type => '6', :project_id => params[:project_id]) %>" id="public_resources_choose" class="subject-choose choose-active fl" data-remote="true">公共资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '1', :project_id => params[:project_id]) %>"  id="my_resources_choose"  class="subject-choose fl" data-remote="true">我的资源</a>
+  <% elsif !params[:subfield_file_id].nil? %>
+      <a href="<%= import_resources_user_path(User.current, :type => '6', :subfield_file_id => params[:subfield_file_id]) %>" id="public_resources_choose" class="subject-choose choose-active fl" data-remote="true">公共资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '1', :subfield_file_id => params[:subfield_file_id]) %>"  id="my_resources_choose" class="subject-choose fl" data-remote="true">我的资源</a>
+  <% end %>
+  <%#= form_tag( url_for(:controller => 'users', :action => 'import_resources_search', :id => User.current.id, :type => 1),
+                :remote => true , :method => 'get',  :id => 'resource_search_form') do %>
+      <!--<input type="text" name="search" placeholder="输入资源关键词进行搜索" class="subjectSearch fr" />-->
+      <%#= hidden_field_tag(:type,type.nil? ? 1 : type) %>
+  <%# end %>
+
+  <div class="cl"></div>
+
+  <div style="height:441px; min-height:441px; max-height:441px;">
+    <ul class="subjectBanner mt10">
+      <li class="subjectName fl hidden"><span style="padding-left:15px;">资源名称</span></li>
+      <li class="subjectType fl">类别</li>
+      <li class="subjectCount fl">大小</li>
+      <li class="subjectPublisher fl">上传者</li>
+      <li class="fl subjectDate">上传时间</li>
+    </ul>
+    <%= form_tag( url_for({:controller => 'users', :action => 'import_into_container',
+                        :mul_id => params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id],
+                        :mul_type => params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"}),
+                        :method => 'post',  :id => 'resource_import_container_form') do %>
+      <% @attachments.each do |attach| %>
+        <ul class="subjectRow">
+          <li class="subjectName fl hidden">
+            <label>
+              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
+              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
+            </label>
+          </li>
+          <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
+          <li class="subjectCount fl hidden"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
+        </ul>
+      <% end %>
+    <% end %>
+  </div>
+
+  <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#resource_import_container_form').submit();hideModal()">选用</a></div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
+
+  <div class="pageRoll mt0">
+    <ul class="wlist" id="pages" style="margin-top: 5px;">
+      <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+    </ul>
+  </div>
+  <div class="cl"></div>
+</div>

app/views/users/_project_issue.html.erb

@@ -18,7 +18,7 @@
           <% when 1%>
             <span class="issues fl" title="缺陷"></span>
         <% when 2%>
-            <span class="function fl" title="功能"></span>
+            <span class="issues-function fl" title="功能"></span>
         <% when 3%>
             <span class="support fl" title="支持"></span>
         <% when 4%>

app/views/users/_resource_search_form.html.erb

@@ -1,7 +1,7 @@
-<%= form_tag( url_for(:controller => 'users',:action => 'resource_search',:id=>user.id),
+<%= form_tag( url_for(:controller => 'users', :action => 'resource_search', :id => user.id),
-              :remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
+                    :remote => true , :method => 'get', :class => 'resourcesSearchloadBox mt10', :id => 'resource_search_form') do %>
     <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchResource" />
     <%= hidden_field_tag(:type,type.nil? ? 1 : type) %>
-    <%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
+    <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :style => 'border-style:none' %>
     <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
 <% end %>

app/views/users/_resources_list.html.erb

@@ -1,27 +1,374 @@
-
 <% if attachments.nil? || attachments.empty? %>
     <!--<p class="nodata">-->
     <!--<%#= l(:label_no_data) %>-->
     <!--</p>-->
 <% else %>
     <% attachments.each do |attach| %>
-        <ul class="resourcesList" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
+        <ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
-          <li class="resourcesListCheckbox fl">
+          <li class="resource-list-checkbox fl">
             <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
+            <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
-          <li class="resourcesListName fl">
+          <li class="resource-list-name fl hidden">
-            <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
+            <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack' %>
-            <%= link_to truncate(attach.filename,:length=>30), download_named_attachment_path(attach.id, attach.filename),
-                        :title => attach.filename,:class=>'resourcesBlack'%>
           </li>
-          <li class="resourcesListSize fl"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
-          <li class="resourcesListType fl"><%= get_resource_type(attach.container_type)%></li>
+          <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
-          <li class="resourcesListUploader fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="resource-list-download fr"><%= attach.downloads %></li>
           <li style="display: none"><%= attach.author_id %></li>
-          <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
+          <li class="resource-list-size fr"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
+          <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
-        <ul class="resourcesListDashLine"></ul>
+        <div class="cl"></div>
-
     <% end %>
 <% end %>
+
+<script>
+    var pageX = 0;
+    var pageY = 0;
+    //当前选中的行
+    var line;
+    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
+    var last_line;
+    //资源名称
+    var res_name;
+    //资源名称的链接
+    var res_link;
+    var id; //资源id
+    var sendType = '1';  //发送到课程 1  发送到项目 2
+    var lastSendType;  //保存上次发送的发送类型
+    $("#resources_list").mousedown(function(e) {
+        //如果是右键的话
+        if (3 == e.which) {
+            if(  $("#res_name").length != 0 || $("#ajax-indicator").is(":hidden") == false){ //其他ajax在执行的时候阻止操作
+                e.preventDefault();
+                return ;
+            }
+            document.oncontextmenu = function() {return false;}
+            pageX = e.clientX;
+            pageY = e.clientY;
+            $("#contextMenu").hide();
+            $("#contextMenu").attr("style","display: block; position: fixed; top:"
+                    + pageY
+                    + "px; left:"
+                    + pageX
+                    + "px; width: 80px;");
+            $("#contextMenu").show();
+            //当前光标所在的对象
+
+            var ele = document.elementFromPoint(pageX,pageY);
+            //转换为jquery对象
+            line = $(ele).parent();
+            //如果上一条存在被选中，那么将上一条的背景色改为白色
+            if(last_line != null){
+                last_line.children().css("background-color", 'white');
+                restore();
+                last_line == null;
+            }
+            //如果当前的tag是li，那么还要li的父级元素
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+            //将当前的元素的所有子元素的背景色改为蓝色
+            line.children().css("background-color", '#e1e1e1');
+            //将当前元素赋给 上一个对象 保存起来。
+            last_line = line;
+        }
+    });
+    //元素包含关系计算
+    var contains  = function(root, el) {
+        if (root.compareDocumentPosition)
+            return root === el || !!(root.compareDocumentPosition(el) & 16);
+        if (root.contains && el.nodeType === 1){
+            return root.contains(el) && root !== el;
+        }
+        while ((el = el.parentNode))
+            if (el === root) return true;
+        return false;
+    }
+    $(document.body).click(function(e) {
+        //在列表上的任何单击事件都要恢复原来的样子
+        //隐藏右键菜单
+        //e.preventDefault();
+        $("#contextMenu").hide();
+        if( $("#ajax-indicator").is(":hidden") == false && $("#res_name").length != 0 ){ //其他ajax在执行的时候或者res_name仍然存在阻止操作
+            return ;
+        }
+        document.oncontextmenu = function() {return true;}
+        //如果当前行为空，那么要将当前行的拿到
+        var ele;
+        if(line == null){
+            ele = document.elementFromPoint(e.clientX, e.clientY);
+            line = $(ele).parent();
+            //如果是在li上点击事件，那么要获得父组件
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+
+        }
+        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
+        if( contains($("#resources_list").get(0),line.get(0))){
+            line.children().css("background-color", 'white');
+        }
+
+        //当前行恢复编辑状态到链接状态
+        if(ele && ele.nodeName != 'INPUT') {
+            restore();
+        }
+        line = null;
+    });
+    //只要有一个选中了就是true
+    function checkboxSelected(){
+        selected = false;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == true){
+                selected = true;
+            }
+        });
+        return selected;
+    }
+    //只有全选才是true
+    function checkboxAllSelected(){
+        allSelected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == undefined){
+                allSelected = false;
+            }
+        });
+        return allSelected;
+    }
+    //只有全部不选才是true
+    function checkboxAllDeselected(){
+        allDeselected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                allDeselected = false;
+            }
+        });
+        return allDeselected;
+    }
+    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
+    function checkAllBox(checkbox){
+        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
+        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
+            $("#checkboxAll").attr('checked',true);
+        }else{
+            $("#checkboxAll").attr('checked',false);
+        }
+        $("#res_count").html(getCheckBoxSeletedCount());
+
+    }
+    //获取当前checkbox选中的数目
+    function getCheckBoxSeletedCount(){
+        var i = 0;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                i ++;
+            }
+        });
+        return i;
+    }
+    //全选反选
+    function all_select(){
+
+        if($("#checkboxAll").attr('checked')){
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',true);
+            });
+            $("#res_count").html(getCheckBoxSeletedCount());
+        }else{
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',false);
+            });
+            $("#res_count").html(0);
+        }
+    }
+
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
+        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","50%").css("left","50%").css("position","absolute");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+    //批量删除
+    function batch_delete(){
+        var data = $("#resources_list_form").serialize();
+        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
+            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
+            return;
+        }
+        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
+            alert("您只能删除自己上传的资源，请重新选择后再删除。");
+            return;
+        }
+
+        if(data != "" && confirm('确认要删除这些资源吗？')) {
+            $.post(
+                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
+                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
+                    function (data) {
+
+                    }
+            );
+        }
+    }
+
+
+
+    function show_send_(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
+            });
+        }
+    }
+
+    function batch_send(){
+        if($("#resources_list_form").serialize() == ""){
+            alert('暂时不支持多页选择，您当前页没有选择任何资源');
+            return ;
+        }
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
+            });
+
+        }
+    }
+
+    function preview(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        $.ajax({
+            type:'get',
+            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
+        });
+    }
+
+    function rename(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(user_id === '<%= User.current.id %>') {
+            res_name = line.children().eq(1).children().attr('title');
+            res_link = line.children().eq(1).html();
+            line.children().eq(1).html(
+                            '<input name="res_name" id="res_name" ' +
+                            'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                            ' onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
+                            'value="'+res_name+
+                            '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
+            $("#res_name").focus();
+            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
+        }else{
+            alert('您无法修改此资源！')
+        }
+    }
+    String.prototype.trim = function() {
+        var str = this,
+                str = str.replace(/^\s\s*/, ''),
+                ws = /\s/,
+                i = str.length;
+        while (ws.test(str.charAt(--i)));
+        return str.slice(0, i + 1);
+    }
+
+
+
+    //恢复编辑状态到链接状态
+    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
+    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
+    function restore(){
+        //上一行不为空 且链接不为空
+        if( last_line != null && res_link != null && res_link != '') {
+            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+                return;
+            }
+            if( name && name != res_name.trim()){
+
+                if(confirm('确定修改为 '+name)){
+                    $.ajax({
+                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
+                        type:'get',
+                        success:function (data)
+                        {
+                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                last_line.children().eq(1).html(res_link);
+                                last_line.children().eq(1).children().attr('title', name);
+                                last_line.children().eq(1).children().attr('href', data);
+                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
+                            } else {
+                                last_line.children().eq(1).html(res_link);
+                                res_link = null; //如果修改失败，恢复之后将res_link置空
+                            }
+                        }
+                    } );
+                }else{
+                    last_line.children().eq(1).html(res_link);
+                    res_link = null; //如果没有做修改，恢复之后将res_link置空
+                }
+            }else {
+                last_line.children().eq(1).html(res_link);
+                res_link = null;//如果没有做修改，恢复之后将res_link置空
+            }
+
+
+        }
+    }
+
+    function delete_file() {
+        $("#contextMenu").hide();
+        document.oncontextmenu = function () {
+            return true;
+        }
+        line.children().css("background-color", 'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(line.children().first().children().data('hasHistory') == 'Y'){
+            alert('该资源存在历史版本，不能删除');
+            return;
+        }
+        if(user_id === '<%= User.current.id%>') {
+            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
+                $.ajax({
+                    type: 'post',
+                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
+                });
+            }
+        }else{
+            alert('您无法删除此资源！')
+        }
+    }
+
+</script>

app/views/users/_send_homework_to_course.html.erb

@@ -0,0 +1,79 @@
+<div class="boxContainer">
+  <div>
+    <div class="sendText fl mr10" style="width: auto">发送到</div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
+  <div class="fl">
+    <!--<input type="text" name="search" placeholder="输入课程ID或者名称搜索" class="subjectSearch fr" />-->
+    <input type="text" id="search_course_input" value="<%= @search %>"  name="search" placeholder="输入课程ID或者名称搜索" class="mt10 mb10 course-search" />
+  </div>
+  <%= form_tag send_homework_to_course_user_path(user),:remote=>true,:id=>'choose_course_list_form' %>
+  <div>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <div class="courseReferContainer">
+      <% if !courses.empty?  %>
+          <% courses.each do |course| %>
+              <ul class="courseSend">
+                <li class="" style="display:inline-block">
+                  <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+                </li>
+                <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+current_time_and_term(course) + ']'%></li>
+              </ul>
+          <% end %>
+    </div>
+  </div>
+  <div class="cl"></div>
+  <span id="choose_courses_notice" class="c_red"></span>
+  <div>
+    <div class="courseSendSubmit">
+      <a href="javascript:void(0);" onfocus='this.blur();' onclick="send_submit();" class="sendSourceText">确定</a>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a>
+    </div>
+  </div>
+  <div class="cl"></div>
+  <% end %>
+</div>
+<script type="text/javascript">
+    function send_submit() {
+        var checkboxs = $("input[name='course_ids[]']:checked");
+        if(checkboxs.length == 0) {
+            $("#choose_courses_notice").text("请先选择课程");
+        } else{
+            $("#choose_courses_notice").text("");
+            $("#choose_course_list_form").submit();
+            hideModal();
+        }
+    }
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_courses(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'users', :action => 'choose_user_course') %>'+'?search='+ e.target.value+'&send_id=<%=send_id %>',
+            type:'get',
+            success: function(data){  },
+            beforeSend: function(){ $(this).addClass('ajax-loading'); },
+            complete: function(){ $(this).removeClass('ajax-loading'); }
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询项目
+    $("input[name='search']").on('input', function (e) {
+        throttle(search_courses,window,e);
+    });
+
+</script>

app/views/users/_show_user_homework_form.html.erb

@@ -1,12 +1,13 @@
 <% homeworks.each do |homework| %>
-    <ul class="subjectRow">
+    <ul class="subject-pop-row">
-      <li class="subjectName fl hidden">
+      <li class="subject-pop-name fl hidden">
-        <label onclick="show_homework_detail('<%=show_homework_detail_user_path(@user,:homework=>homework.id) %>')">
+        <label onclick="show_homework_detail('<%=show_homework_detail_user_path(@user,:homework=>homework.id,:is_import =>1) %>')">
           <input type="radio" name="checkMenu" class="mr5" style="vertical-align:middle;" value="<%= homework.id%>"/>
           <span title="<%= homework.name%>"><%= homework.name%></span>
         </label>
       </li>
-      <li class="subjectType fl">
+      <li class="subject-pop-from fl hidden"><span title="<%=homework.course.name %>(<%=current_time_and_term(homework.course) %>)"><%=homework.course.name %>(<%=current_time_and_term_short(homework.course) %>)</span></li>
+      <li class="subject-pop-type fl">
         <% case homework.homework_type %>
             <% when 1 %>
                 普通
@@ -16,9 +17,9 @@
                 分组
         <% end %>
       </li>
-      <li class="subjectCount fl"><%= homework.quotes %></li>
+      <li class="subject-pop-publisher fl hidden"><%= homework.user.show_name %></li>
-      <li class="subjectPublisher fl hidden"><%= homework.user.show_name %></li>
+      <li class="subject-pop-count fl"><%= homework.quotes %></li>
-      <li class="fl subjectDate"><%=format_date homework.publish_time %></li>
+      <li class="subject-pop-date fl"><%=format_date homework.publish_time %></li>
     </ul>
 <% end %>
 <script type="text/javascript">

app/views/users/_show_user_homeworks.html.erb

@@ -1,19 +1,20 @@
-<div class="w985"> <a href="javascript:void(0);" class="popupClose" onclick="hideModal()"></a>
+<div class="w985"> <a href="javascript:void(0);" class="popup-close" onclick="hideModal()"></a>
   <div class="f16 fb fontBlue mb10">选用题库中的题目</div>
-  <div class="subjectList fl mr10">
+  <div class="subject-list fl mr10">
-    <a href="<%= user_homework_type_user_path(@user) %>" id="public_homeworks_choose" class="subjectChoose chooseActive fl" data-remote="true">公共题库</a>
+    <a href="<%= user_homework_type_user_path(@user,:is_import => 1) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active fl" data-remote="true">公共题库</a>
-    <a href="<%= user_homework_type_user_path(@user,:type=>'2') %>" id="user_homeworks_choose" class="subjectChoose fl" data-remote="true">我的题库</a>
+    <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 1) %>" id="user_homeworks_choose" class="resource-tab fl" data-remote="true">我的题库</a>
     <div id="homework_search_input">
-        <%=render :partial=>'homework_search_input', :locals=>{:type=>@type} %>
+        <%=render :partial=>'homework_search_input', :locals=>{:type => @type,:is_import => 1} %>
     </div>
     <div class="cl"></div>
     <div>
-      <ul class="subjectBanner mt10">
+      <ul class="subject-pop-banner mt10">
-        <li class="subjectName fl hidden"><span style="padding-left:15px;">作业名称</span></li>
+        <li class="subject-pop-name fl hidden"><span style="padding-left:15px;">作业名称</span></li>
-        <li class="subjectType fl">类型</li>
+        <li class="subject-pop-from fl">来源</li>
-        <li class="subjectCount fl">引用数</li>
+        <li class="subject-pop-type fl">类别</li>
-        <li class="subjectPublisher fl">贡献者</li>
+        <li class="subject-pop-publisher fl">贡献者</li>
-        <li class="fl subjectDate">发布时间</li>
+        <li class="subject-pop-count fl">引用数</li>
+        <li class="subject-pop-date fl">发布时间</li>
       </ul>
     </div>
     <%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %>
@@ -35,18 +36,18 @@
     </div>
     <div class="cl"></div>
   </div>
-  <div class="subjectDetail fl" id="homework_detail_information">
+  <div class="subject-detail fl" id="homework_detail_information">
     <%=render :partial=>'homework_detail_information', :locals=>{:homework=>nil} %>
   </div>
   <div class="cl"></div>
 </div>
 <script type="text/javascript">
     $("#public_homeworks_choose").click(function(){
-        $(this).toggleClass("chooseActive");
+        $(this).toggleClass("resource-tab-active");
-        $("#user_homeworks_choose").toggleClass("chooseActive");
+        $("#user_homeworks_choose").toggleClass("resource-tab-active");
     });
     $("#user_homeworks_choose").click(function(){
-        $(this).toggleClass("chooseActive");
+        $(this).toggleClass("resource-tab-active");
-        $("#public_homeworks_choose").toggleClass("chooseActive");
+        $("#public_homeworks_choose").toggleClass("resource-tab-active");
     });
 </script>

app/views/users/_upload_resource.html.erb

@@ -2,7 +2,7 @@
   <span class="uploadDialogText">上传资源 </span>
   <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
   <div class="uploadBoxContainer">
-    <%= form_tag(user_resource_create_user_path, :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
+    <%= form_tag(user_resource_create_user_path(:type=>type,:status=>status), :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
         <div>
         <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
         <% if defined?(container) && container && container.saved_attachments %>
@@ -38,7 +38,7 @@
         </div>
         <div class="uploadResourceIntr">
           <div class="uploadResourceName"><span id="upload_file_count">(未选择文件)</span></div>
-          <div class="uploadResourceIntr2">您可以上传小于<span class="c_red">50MB</span>的文件</div>
+          <div class="uploadResourceIntr2"><!--您可以上传小于<span class="c_red">50MB</span>的文件--></div>
         </div>
         </div>
         <div class="cl"></div>

app/views/users/_user_homework_detail.html.erb

@@ -15,8 +15,10 @@
           </span>
 
       <% if homework_common.homework_detail_manual%>
-          <% if homework_common.homework_detail_manual.comment_status == 0 %>
+          <% if homework_common.homework_detail_manual.comment_status == 0 && homework_common.publish_time.nil? %>
-              <span class="grey_homework_btn_cir ml5">未发布</span>
+              <span class="grey_homework_btn_cir ml5">挂起</span>
+          <% elsif homework_common.homework_detail_manual.comment_status == 0 %>
+                <span class="grey_homework_btn_cir ml5">未发布</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 1%>
               <% if homework_common.anonymous_comment == 0%>
                   <span class="grey_homework_btn_cir ml5">未开启匿评</span>
@@ -84,12 +86,12 @@
               分组人数：<%=homework_common.homework_detail_group.min_num %>-<%=homework_common.homework_detail_group.max_num %> 人
             </div>
         <% end %>
-        <% if homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status < 2 %>
+        <% if homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status < 2 && !homework_common.publish_time.nil? %>
             <div class="homepagePostDeadline">提交截止时间：<%= homework_common.end_time.to_s %>&nbsp;23:59</div>
-        <% elsif homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status >= 2 %>
+        <% elsif homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status >= 2 && !homework_common.publish_time.nil? && homework_common.anonymous_comment == 0 %>
             <div class="homepagePostDeadline">匿评截止时间：<%= homework_common.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
         <% end %>
-        <% if homework_common.homework_detail_manual.comment_status == 0 %>
+        <% if homework_common.homework_detail_manual.comment_status == 0  && !homework_common.publish_time.nil? %>
             <div class="homepagePostDeadline ml15">
               <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>&nbsp;00:00
             </div>
@@ -107,7 +109,7 @@
         <div class="homepagePostDeadline">
           迟交扣分：<%= homework_common.late_penalty%>分
         </div>
-        <% if homework_common.anonymous_comment == 0%>
+        <% if homework_common.anonymous_comment == 0 && !homework_common.publish_time.nil?%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=homework_common.id %>">
               匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
             </div>
@@ -115,10 +117,12 @@
       </div>
       <div class="cl"></div>
       <div>
-        <div class="homepagePostDeadline">
+        <% if homework_common.anonymous_comment == 0 %>
-          缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
+            <div class="homepagePostDeadline">
-        </div>
+              缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
-        <% if homework_common.anonymous_comment == 0%>
+            </div>
+        <% end %>
+        <% if homework_common.anonymous_comment == 0 && !homework_common.publish_time.nil?%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=homework_common.id %>">
               匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
             </div>
@@ -127,7 +131,7 @@
       <div class="cl"></div>
       <% if homework_common.student_works.count != 0 %>
           <% sw = homework_common.student_works.reorder("created_at desc").first %>
-          <div class="mt10 homepagePostDeadline">
+          <div class="mt10 homepagePostDeadline mb10">
             #&nbsp;<%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
           </div>
       <% end %>
@@ -138,30 +142,36 @@
         <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
-            <div class="mt10">
+            <div>
               <p class="mb10 fontGrey2">#&nbsp;<%=time_from_now last_score.created_at %>
                 <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行：
               </p>
-              <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
-              <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
-              <% student_works.each_with_index do |sw, i| %>
-                  <div class="fl mr10 w100" style="text-align:center;">
-                    <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
-                      <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%></p>
-                    </a>
-                    <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
-                    <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
-                  </div>
-                  <% if i == 4 %>
-                      <% break %>
-                  <% end %>
-              <% end %>
-              <% if student_works.count > 5%>
-                <%= link_to "更多>>", student_work_index_path(:homework => homework_common.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
-              <% end %>
-              <div class="cl"></div>
             </div>
         <% end %>
+        <div>
+          <% if homework_common.homework_type != 2 %>
+              <% ids = student_work_scores.empty? ? "(-1)" : '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %>
+              <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %>
+          <% else %>
+              <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("score desc") %>
+          <% end %>
+          <% student_works.each_with_index do |sw, i| %>
+              <div class="fl mr10 w100" style="text-align:center;">
+                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
+                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%></p>
+                </a>
+                <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
+                <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score<0 ? 0 : score) %>分</span></p>
+              </div>
+              <% if i == 4 %>
+                  <% break %>
+              <% end %>
+          <% end %>
+          <% if student_works.count > 5%>
+            <%= link_to "更多>>", student_work_index_path(:homework => homework_common.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%>
+          <% end %>
+          <div class="cl"></div>
+        </div>
     <% end %>
 
     <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %>
@@ -240,7 +250,17 @@
                 <% end %>
                 <% if homework_common.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
                     <li>
-                      <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(homework_common,:is_in_course => is_in_course),:class => "postOptionLink", :remote => true)%>
+                      <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(homework_common,:is_in_course => is_in_course),:class => "postOptionLink",
+                                  :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
+                    </li>
+                <% end %>
+                <% if (homework_common.anonymous_comment == 1 && homework_common.is_open == 0) || (homework_common.anonymous_comment == 0 && comment_status == 3 && homework_common.is_open == 0) %>
+                    <li>
+                      <%= link_to("公开作品", alert_open_student_works_homework_common_path(homework_common, :is_in_course => is_in_course,:course_activity=> -1),:class => "postOptionLink", :remote => true)%>
+                    </li>
+                <% elsif homework_common.is_open == 1 %>
+                    <li>
+                      <%= link_to("取消公开", alert_open_student_works_homework_common_path(homework_common, :is_in_course => is_in_course,:course_activity=> -1),:class => "postOptionLink", :remote => true)%>
                     </li>
                 <% end %>
               </ul>

app/views/users/_user_homework_form.html.erb

@@ -185,7 +185,7 @@
   <div id="homework_editor" style="display: <%= edit_mode ? 'block':'none'%>">
     <div class="mt10">
       <% if edit_mode %>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='homework_textarea' name="homework_common[description]"><%=homework.description.html_safe %></textarea>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='homework_textarea' name="homework_common[description]"><%=homework.description %></textarea>
           <%#= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON, at_id: homework.id, at_type: homework.class.to_s %>
       <% else %>
           <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
@@ -228,7 +228,9 @@
 
 <script id="t:test-answer-list" type="text/html">
   <div class="mt10">
-    <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" name="program[input][]"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" name="program[output][]"></textarea>
+    <label class="fl mt5" name="inputs_label">&nbsp;&nbsp;&nbsp;</label>
+    <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" name="program[input][]"></textarea>
+    <textarea class="InputBox  W320  fl mr5" placeholder="测试输出" name="program[output][]"></textarea>
     <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
     <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
     <div class="cl"></div>

app/views/users/_user_homework_list.html.erb

@@ -34,7 +34,7 @@
         <%= link_to "点击展开更多",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
     <% else%>
         <!-- 在个人主页 -->
-        <%= link_to "点击展开更多",user_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+        <%= link_to "点击展开更多",student_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
     <% end%>
 <% end%>
 </div>

app/views/users/_user_homeworks_old.html.erb

@@ -0,0 +1,47 @@
+<script type="text/javascript">
+    function reset_homework(){
+        $("#homework_name").val("");
+        $("#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,:has_group => true })%>");
+        //homework_description_editor.html("");
+        $("#homework_name_span").text("");
+        $("#homework_end_time_span").text("");
+        $("#homework_end_time_span").text("");
+        $("#homework_course_id_span").text("");
+        $("#homework_editor").toggle();
+    }
+
+    // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
+    function store_seleted_resource(dom){
+        if(dom.attr('checked') == 'checked' ){
+            $.get(
+                            '<%= store_selected_resource_user_path %>'+'?save=y&res_id='+dom.val()
+            )
+        }else {
+            $.get(
+                            '<%= store_selected_resource_user_path %>'+'?save=n&res_id='+dom.val()
+            )
+        }
+    }
+</script>
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">作业</div>
+</div>
+<div class="cl"></div>
+
+<% if @is_teacher%>
+    <!-- 老师身份才可以发布作业 -->
+    <div class="HomeWork mb10" nhname='homework_common_form'>
+      <% homework = HomeworkCommon.new %>
+      <% homework.homework_detail_manual = HomeworkDetailManual.new%>
+      <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
+          <div id="HomeWorkCon">
+            <%= render :partial => 'users/user_homework_form', :locals => { :homework => homework,:f => f,:edit_mode => false } %>
+          </div>
+      <% end%>
+    </div><!----HomeWork end-->
+<% end%>
+
+<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0,:is_in_course => 0} %>