Merge branch 'develop' into linchun

Conflicts:
	db/schema.rb

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

app/controllers/files_controller.rb

@@ -406,10 +406,14 @@ class FilesController < ApplicationController
       @container_type = 2
       @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
       @organization = Organization.find(@containers.first.organization_id)
-      show_attachments @containers
+      if @organization.is_public? or User.current.admin? or User.current.member_of_org?(@organization)
-      @tag_list = attachment_tag_list @all_attachments
+        show_attachments @containers
-      @page = params[:page] || 1
+        @tag_list = attachment_tag_list @all_attachments
-      render :layout => 'base_org'
+        @page = params[:page] || 1
+        render :layout => 'base_org'
+      else
+        render_403
+      end
       # @subfield = params[:org_subfield_id]
     end
 
@@ -529,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
@@ -628,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
 
@@ -860,7 +863,15 @@ class FilesController < ApplicationController
     q = "%#{@q.strip}%"
     @result = find_org_subfield_attache q,@org_subfield,sort
     @result = visable_attachemnts @result
-    @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    if params[:other]
+      @result = @result.select{|attachment|
+        attachment.tag_list.exclude?('软件') &&
+            attachment.tag_list.exclude?('媒体') &&
+            attachment.tag_list.exclude?('代码')
+      }
+    else
+      @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    end
     @searched_attach = paginateHelper @result,10
     @tag_list = get_org_subfield_tag_list @org_subfield
 

app/controllers/org_subfields_controller.rb

@@ -33,61 +33,65 @@ class OrgSubfieldsController < ApplicationController
       domain = Secdomain.where("subname=?", request.subdomain).first
       @organization = Organization.find(domain.pid)
     end
-    @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
+    if @organization.is_public? or User.current.admin? or User.current.member_of_org?(@organization)
-        "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
+      @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
-        " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
+                                                  "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
-    if @org_subfield.field_type == 'Post'
+                                                  " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
+      if @org_subfield.field_type == 'Post'
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
         @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
         #redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id)
-    else
+      else
-      if params[:sort]
+        if params[:sort]
-        params[:sort].split(",").each do |sort_type|
+          params[:sort].split(",").each do |sort_type|
-          order_by = sort_type.split(":")
+            order_by = sort_type.split(":")
-          case order_by[0]
+            case order_by[0]
-            when "filename"
+              when "filename"
-              attribute = "filename"
+                attribute = "filename"
-            when "size"
+              when "size"
-              attribute = "filesize"
+                attribute = "filesize"
-            when "attach_type"
+              when "attach_type"
-              attribute = "attachtype"
+                attribute = "attachtype"
-            when "content_type"
+              when "content_type"
-              attribute = "created_on"
+                attribute = "created_on"
-            when "field_file_dense"
+              when "field_file_dense"
-              attribute = "is_public"
+                attribute = "is_public"
-            when "downloads"
+              when "downloads"
-              attribute = "downloads"
+                attribute = "downloads"
-            when "created_on"
+              when "created_on"
-              attribute = "created_on"
+                attribute = "created_on"
-            when "quotes"
+              when "quotes"
-              attribute = "quotes"
+                attribute = "quotes"
-            else
+              else
-              attribute = "created_on"
+                attribute = "created_on"
-          end
-          @sort = order_by[0]
-          @order = order_by[1]
-          if order_by.count == 1 && attribute
-            sort += "#{Attachment.table_name}.#{attribute} asc "
-            if sort_type != params[:sort].split(",").last
-              sort += ","
             end
-          elsif order_by.count == 2 && order_by[1]
+            @sort = order_by[0]
-            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+            @order = order_by[1]
-            if sort_type != params[:sort].split(",").last
+            if order_by.count == 1 && attribute
-              sort += ","
+              sort += "#{Attachment.table_name}.#{attribute} asc "
+              if sort_type != params[:sort].split(",").last
+                sort += ","
+              end
+            elsif order_by.count == 2 && order_by[1]
+              sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+              if sort_type != params[:sort].split(",").last
+                sort += ","
+              end
             end
           end
+        else
+          sort = "#{Attachment.table_name}.created_on desc"
         end
-      else
+        @container_type = 2
-        sort = "#{Attachment.table_name}.created_on desc"
+        @containers = [OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+        @organization = Organization.find(@containers.first.organization_id)
+        show_attachments @containers
+        @tag_list = attachment_tag_list @all_attachments
       end
-      @container_type = 2
+      @page = params[:page] || 1
-      @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+    else
-      @organization = Organization.find(@containers.first.organization_id)
+      render_403
-      show_attachments @containers
-      @tag_list = attachment_tag_list @all_attachments
     end
-    @page = params[:page] || 1
     #render :layout => 'base_org'
   end
 

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
 

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
 
@@ -2032,9 +2049,11 @@ module ApplicationHelper
         course = attachment.container
         candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
       elsif attachment.container.is_a?(OrgSubfield)
-        candown = true
+        org = attachment.container.organization
+        candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
       elsif attachment.container.is_a?(OrgDocumentComment)
-        candown = true
+        org = attachment.container.organization
+        candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
       elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
           attachment.container.board.course
         course = attachment.container.board.course
@@ -2512,7 +2531,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 =[]
@@ -121,7 +121,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
@@ -149,6 +149,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
@@ -845,7 +861,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/files_helper.rb

@@ -126,7 +126,7 @@ module FilesHelper
           (attachment.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||
           attachment.author_id == User.current.id ||
-          attachment.container_type == "OrgSubfield"
+          (attachment.container_type == "OrgSubfield" and User.current.member_of_org?(attachment.container.organization))
         result << attachment
       end
     end

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
@@ -606,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/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/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

@@ -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
 
@@ -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/latest_login_teachers.html.erb

@@ -59,17 +59,17 @@
             <%=format_time(teacher.last_login_on) %>
           </td>
           <td align="center">
-            <%=teacher.id %>
+            <%=teacher.user_id %>
           </td>
           <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if teacher.try(:realname) == ' '%><%= teacher.login%><% else %><%=teacher.try(:realname) %><% end %>'>
             <% if teacher.try(:realname) == ' '%>
-                <%= link_to(teacher.login, user_path(teacher)) %>
+                <%= link_to(teacher.login, user_path(teacher.user_id)) %>
             <% else %>
-                <%= link_to(teacher.try(:realname), user_path(teacher)) %>
+                <%= link_to(teacher.try(:realname), user_path(teacher.user_id)) %>
             <% end %>
           </td>
           <td align="center">
-            <%=link_to(teacher.login, user_path(teacher)) %>
+            <%=link_to(teacher.login, user_path(teacher.user_id)) %>
           </td>
           <td align="center">
             老师

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/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;
@@ -147,7 +154,7 @@
   <% 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

@@ -8,7 +8,7 @@
 <% end %>
 <% if show_nav?(@course.news.count) %>
     <div class="subNav">
-      <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f12 c_blue02 ml10 fn" %>
+      <%= link_to "通知", course_news_index_path(@course), :class => "f12 c_blue02 ml10 fn" %>
       <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
     </div>
 <% end %>
@@ -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/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

@@ -1,70 +1,72 @@
 <% delete_allowed = User.current.admin? %>
 
 <% org_subfield_attachments.each do |file| %>
-  <div class="resources mt10" id="container_files_<%= file.id %>">
+  <% if file.is_public == 1 or User.current.member_of_org?(file.container.organization) %>
-    <div class="homepagePostBrief">
+    <div class="resources mt10" id="container_files_<%= file.id %>">
-      <div class="homepagePostPortrait">
+        <div class="homepagePostBrief">
-        <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
+          <div class="homepagePostPortrait">
-      </div>
+            <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
-      <div class="homepagePostDes">
+          </div>
-        <div class="homepagePostTitle break_word mt-4">
+          <div class="homepagePostDes">
-          <%= link_to truncate(file.filename,length: 35, omission: '...'),
+            <div class="homepagePostTitle break_word mt-4">
-                      download_named_attachment_path(file.id, file.filename),
+              <%= link_to file.is_public? ? truncate(file.filename, length: 70) : truncate(file.filename,length: 50, omission: '...'),
-                      :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"  %>
+                          download_named_attachment_path(file.id, file.filename),
-          <%= file_preview_eye(file, class: 'preview') %>
+                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14 f_l"  %>
-          <span id="image_private_<%= file.id%>">
+              <%= file_preview_eye(file, class: 'preview') %>
-            <% if file.is_public? == false%>
+              <span id="image_private_<%= file.id%>">
-               <span class="img_private ml5">私有</span>
+                <% if file.is_public? == false%>
-            <%end %>
+                   <span class="img_private ml5">私有</span>
-          </span>
+                <%end %>
-          <br/>
+              </span>
-        </div>
+              <br/>
-        <div class="mt5">
+            </div>
-          <span class="fontGrey2 mr15 fl">上传时间：<%= format_date(file.created_on)%></span>
+            <div class="mt5">
-          <% if file.tag_list.length > 0%>
+              <span class="fontGrey2 mr15 fl">上传时间：<%= format_date(file.created_on)%></span>
-              <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
+              <% if file.tag_list.length > 0%>
-          <% end %>
+                  <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
-          <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>
-        <div class="cl"></div>
-        <div class="tag_h">
-          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
-          <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
-        </div>
-        <div class="homepagePostSetting">
-          <ul>
-            <li class="homepagePostSettingIcon">
-              <% if User.current.logged? %>
-                 <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield"  %>
-                    <ul class="homepagePostSettiongText">
-                      <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
-                        <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
-                        <li>
-                          <span id="is_public_<%= file.id %>">
-                            <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
-                          </span>
-                        </li>
-                        <li>
-                          <%= link_to( '删除资源', attachment_path(file),
-                                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" && file.destroyable %>
-                        </li>
-                    </ul>
-                  <%else%>
-                      <ul class="resourceSendO">
-                        <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
-                      </ul>
-                  <% end %>
               <% end %>
-            </li>
+              <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
-          </ul>
+              <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<span id="reference_number_<%= file.id %>"><%= file.quotes.nil? ? 0:file.quotes  %></span></p>
+            </div>
+            <div class="cl"></div>
+            <div class="tag_h">
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+              <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
+            </div>
+            <div class="homepagePostSetting">
+              <ul>
+                <li class="homepagePostSettingIcon">
+                  <% if User.current.logged? %>
+                     <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield"  %>
+                        <ul class="homepagePostSettiongText">
+                          <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
+                            <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
+                            <li>
+                              <span id="is_public_<%= file.id %>">
+                                <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
+                              </span>
+                            </li>
+                            <li>
+                              <%= link_to( '删除资源', attachment_path(file),
+                                               :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" && file.destroyable %>
+                            </li>
+                        </ul>
+                      <%else%>
+                          <ul class="resourceSendO">
+                            <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
+                          </ul>
+                      <% end %>
+                  <% end %>
+                </li>
+              </ul>
 
+            </div>
+          </div>
+          <div class="cl"></div>
         </div>
-      </div>
-      <div class="cl"></div>
-    </div>
 
   </div><!---re_con_box end-->
+  <% end %>
 <% end %>
 
 <% if org_subfield_attachments.count == 10 %>

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-->
@@ -53,7 +54,7 @@
           <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
         </div>
         <div class="cl"></div>
-        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count %></span>&nbsp;个资源</p>
+        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= User.current.member_of_org?(@org_subfield.organization) ? @all_attachments.count : @all_attachments.select{|attach| attach.is_public == 1 }.count %></span>&nbsp;个资源</p>
         <p class="f_r" style="color: #808080">
           <% if @order == "asc" %>
               按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;

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/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

@@ -7,7 +7,7 @@
     <% 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>
@@ -85,7 +85,7 @@
         <% end %>
         <% unless show_nav?(@course.news.count) %>
         <div class="subNav">
-          <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>
+          <%= link_to "通知", course_news_index_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.news.count})", course_news_index_path(@course), :class => "subnav_num c_orange"%>
           <%= link_to( "", new_course_news_path(@course,:is_new=>1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
         </div>
@@ -104,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) %>
@@ -142,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 %>
@@ -176,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="作业总分：<%= format("%.1f",student_score.score<0 ? 0 : student_score.score) %>"><%= student_score.score<0 ? 0 : 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 %>
@@ -300,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

@@ -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/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>
@@ -128,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 %>
@@ -139,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.to_i<0 ? 0 : score.to_i) %>分</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 %>
@@ -239,7 +245,8 @@
                   <% 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) %>

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/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>
@@ -128,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 %>
@@ -138,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.to_i<0 ? 0 : score.to_i) %>分</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 %>
@@ -238,7 +244,8 @@
                   <% 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) %>

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/_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>
@@ -120,7 +122,7 @@
               缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
             </div>
         <% end %>
-        <% 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_end_time_<%=homework_common.id %>">
               匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
             </div>
@@ -129,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 %>
@@ -140,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.to_i<0 ? 0 : score.to_i) %>分</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 %>
@@ -242,7 +250,8 @@
                 <% 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) %>

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} %>

app/views/users/_user_programing_attr.html.erb

@@ -7,12 +7,13 @@
       <%= options_for_select({"C语言"=>1, "C++"=>2, "Python"=>3, "Java"=>4}, (edit_mode && homework.is_program_homework?) ? homework.language : 1) %>
     </select>
   </div>
-  <div style="height: 320px; overflow-y:auto; width:730px;">
+  <div style="height: 320px; overflow-y:auto; width:756px;">
   <% if edit_mode && homework.is_program_homework? %>
       <% homework.homework_tests.each_with_index do |test, index| %>
           <div class="mt10">
-            <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"><%= test.input %></textarea>
+            <label class="fl mt5" name="inputs_label"><%=index+1 %>&nbsp;&nbsp;</label>
-            <textarea class="InputBox  W320  fl mr5" placeholder="测试输出"  id="textarea_output_test"><%= test.output %></textarea>
+            <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" name="program[input][]"><%= test.input %></textarea>
+            <textarea class="InputBox  W320  fl mr5" placeholder="测试输出" name="program[output][]"><%= test.output %></textarea>
             <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
             <% if index != 0 %>
                 <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
@@ -22,8 +23,9 @@
       <% end %>
   <% else %>
       <div class="mt10">
-        <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea>
+        <label class="fl mt5" name="inputs_label">1&nbsp;&nbsp;</label>
-        <textarea class="InputBox  W320  fl mr5" placeholder="测试输出" id="textarea_output_test"></textarea>
+        <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" name="program[input][]" id="textarea_input_test"></textarea>
+        <textarea class="InputBox  W320  fl mr5" placeholder="测试输出" name="program[output][]" id="textarea_output_test"></textarea>
         <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
         <div class="cl"></div>
       </div>
@@ -39,8 +41,10 @@
 </div><!----HomeWorkCon end-->
 
 <script>
-    var text = document.getElementById("textarea_input_test");
+    <% if !edit_mode %>
-    var text2 = document.getElementById("textarea_output_test");
+        var text = document.getElementById("textarea_input_test");
-    autoTextarea2(text,text2);
+        var text2 = document.getElementById("textarea_output_test");
-    autoTextarea2(text2,text);
+        autoTextarea2(text,text2);
+        autoTextarea2(text2,text);
+    <% end %>
 </script>

app/views/users/_user_resource_info.html.erb

@@ -0,0 +1,60 @@
+<div id="users_setting">
+  <div class="resourcesUploadBox mt10"><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+  <div id="search_div">
+    <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type} %>
+  </div>
+  <div style="float: left; margin-top: 7px; font-size: 14px; margin-left: 15px;"><span style="align:center ;font-size: 14px;color: gray;">为您找到<span id="res_all_count"><%= @atta_count %></span>个资源</span></div>
+</div>
+<div class="cl"></div>
+<ul class="resource-list-tab mt10">
+  <li class="resource-list-checkbox fl"> </li>
+  <li class="resource-list-name fl">资源名称</li>
+  <li class="resource-list-time fr">上传时间</li>
+  <li class="resource-list-quote fr">引用数</li>
+  <li class="resource-list-download fr">下载数</li>
+  <li class="resource-list-size fr">大小</li>
+  <li class="resource-list-uploader fr">上传者</li>
+  <li class="resource-list-type fr">类别</li>
+  <li class="resource-list-from fr">来源</li>
+</ul>
+<div class="cl"></div>
+<form id="resources_list_form">
+  <div id="resources_list">
+    <%= render :partial => 'users/resources_list' , :locals => { :attachments => @attachments} %>
+  </div>
+  <div class="cl"></div>
+
+
+  <div class="resource-list-option fl">
+    <div class="resource-check-all">
+      <input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" />
+    </div>
+    <a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a> <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> </div>
+  <div class="cl"></div>
+  <div class="resourcesSelectSend mt10 fl">
+    <div class="resourcesSelectSendButton fl mr15 inactive-border"  onclick="batch_send();">
+      <a href="javascript:void(0);" class="sendButtonBlue db inactive-text"  data-remote="true">发送至</a>
+    </div>
+    <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
+  </div>
+
+</form>
+<div>
+  <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 id="upload_box" style="display: none">-->
+<!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
+<!--</div>-->
+<ul class="resource-list">
+  <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
+    <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
+    <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
+    <!--  data-remote="true" 这个属性会让ajax请求状态标志就在当前按钮的上方显示，就不会滚动浏览器，因而弹出框也会在当前窗口中央展示-->
+    <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send_();" data-remote="true" onfocus="this.blur()" >发送</a></li>
+    <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)delete_file();" onfocus="this.blur()">删除</a></li>
+  </ul>
+</ul>

app/views/users/add_exist_file_to_course.js.erb

@@ -4,7 +4,8 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
+$("#reference_number_<%= @ori.id %>").text("<%= @ori.quotes %>");
 hideModal();
-alert("发送成功")
+alert("发送成功");
 <% else%>
 <% end %>

app/views/users/add_exist_file_to_org.js.erb

@@ -4,7 +4,10 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
+<% if @ori.present? and @ori.quotes.present? %>
+    $("#reference_number_<%= @ori.id %>").text("<%= @ori.quotes %>");
+<% end %>
 hideModal();
-alert("发送成功")
+alert("发送成功");
 <% else%>
 <% end %>

app/views/users/add_exist_file_to_project.js.erb

@@ -4,7 +4,10 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
+<% if @ori and @ori.quotes.present? %>
+    $("#reference_number_<%= @ori.id %>").text("<%= @ori.quotes %>");
+<% end %>
 hideModal();
-alert("发送成功")
+alert("发送成功");
 <% else%>
 <% end %>

app/views/users/choose_user_course.js.erb

@@ -0,0 +1,7 @@
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>');
+showModal('ajax-modal', '452px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");

app/views/users/import_into_container.js.erb

@@ -0,0 +1,3 @@
+<% if @flag == true%>
+alert("发送成功")
+<% end %>

app/views/users/import_resources.js.erb

@@ -0,0 +1,18 @@
+<% if params[:project_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :project_id => params[:project_id]} ) %>');
+<% elsif params[:course_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :course_id => params[:course_id]} ) %>');
+<% elsif params[:subfield_file_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :subfield_file_id => params[:subfield_file_id]} ) %>');
+<% end %>
+showModal('ajax-modal', '615px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+<% if params[:project_id] %>
+$('#ajax-modal').parent().css("top","10%").css("left","34%").css("border","3px solid #269ac9");
+<% else %>
+$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9");
+<% end %>
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+

app/views/users/import_resources_search.js.erb

@@ -0,0 +1,25 @@
+//$("#resources_list").html('<%#= escape_javascript( render :partial => 'users/import_resource_info' ,:locals=>{ :attachments => @attachments, :type => @type})%>');
+//$("#pages").html('<%#= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+//$("#res_all_count").html(<%#= @atta_count%>);
+//$("#res_count").html(0);
+//$("#checkboxAll").attr('checked',false);
+
+
+<% if params[:project_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :project_id => params[:project_id]} ) %>');
+<% elsif params[:course_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :course_id => params[:course_id]} ) %>');
+<% elsif params[:subfield_file_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :subfield_file_id => params[:subfield_file_id]} ) %>');
+<% end %>
+showModal('ajax-modal', '615px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+<% if params[:project_id] %>
+$('#ajax-modal').parent().css("top","10%").css("left","34%").css("border","3px solid #269ac9");
+<% else %>
+$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9");
+<% end %>
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+

app/views/users/new_user_commit_homework.html.erb

@@ -97,7 +97,7 @@
             <div class="mt10">
               <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>
               <% if @is_test %>
-                <%=link_to '返  回',course_path(@course),:class=>'fr mt6' %>
+                <%=link_to '返  回',homework_common_index_path(:course => @course.id),:class=>'fr mt6' %>
               <% else @is_test %>
                 <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
               <% end %>

app/views/users/send_homework_to_course.js.erb

@@ -0,0 +1,9 @@
+$("#subject_count_homework_<%=@homework.id %>").html(<%= @homework.quotes %>);
+$("#ajax-modal").html("<%=escape_javascript(render :partial => 'homework_post_notice') %>");
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");

app/views/users/show_homework_detail.js.erb

@@ -1 +1,5 @@
-$("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>@homework}) %>")
+<% if @is_import.to_i == 1 %>
+    $("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>@homework}) %>");
+<% else %>
+    $("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>@homework}) %>");
+<% end %>

app/views/users/student_homeworks.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} %>

app/views/users/student_homeworks.js.erb

@@ -0,0 +1 @@
+$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page,:is_in_course => 0} )%>");

app/views/users/user_homework_type.js.erb

@@ -1,4 +1,15 @@
+<% if @is_import.to_i == 1 %>
 $("#homework_list_form_show").html('<%= escape_javascript(render :partial => 'users/show_user_homework_form', :locals => {:homeworks => @homeworks})%>');
 $("#homewrok_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>nil}) %>");
-$("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_search_input', :locals=>{:type=>@type}) %>");
+$("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_search_input', :locals=>{:type=>@type,:is_import=>@is_import}) %>");
+<% else %>
+$("#homework_repository").html('<%= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');
+$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
+$("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_repository_search', :locals=>{:type=>@type,:is_import=>@is_import,:property=>@property}) %>");
+$("#homework_type_all").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 0) %>');
+$("#homework_type_nor").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>');
+$("#homework_type_pro").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 2) %>');
+$("#homework_type_gro").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 3) %>');
+<% end %>

app/views/users/user_homeworks.html.erb

@@ -1,47 +1,97 @@
-<script type="text/javascript">
+<%= stylesheet_link_tag  'pleft','header','new_user','repository','org', 'public' %>
-  function reset_homework(){
+<script>
-      $("#homework_name").val("");
+    $(document).ready(function(){
-      $("#homework_publish_time").val("");
+        $(".resource-switch").click(function(){
-      $("#homework_end_time").val("");
+            $(".resource-switch").children().removeClass("resource-tab-active");
-      $("#course_id").val($("#option_select").val());
+            $(this).children().addClass("resource-tab-active");
-      $("#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("");
+        $("input[name='subject-list-name']").click(function(){
-      $("#homework_name_span").text("");
+            if($("input[name='subject-list-name']:checked").length >= 1){
-      $("#homework_end_time_span").text("");
+                $(".resourcesSelectSendButton").removeClass("inactive-border");
-      $("#homework_end_time_span").text("");
+                $(".sendButtonBlue").removeClass("inactive-text");
-      $("#homework_course_id_span").text("");
+            }else {
-      $("#homework_editor").toggle();
+                $(".resourcesSelectSendButton").addClass("inactive-border");
-  }
+                $(".sendButtonBlue").addClass("inactive-text");
-
+            }
-  // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
+        });
-  function store_seleted_resource(dom){
+    });
-      if(dom.attr('checked') == 'checked' ){
+    function choose_course(user_id) {
-          $.get(
+        var check = $('input[name="checkMenu"]:checked');
-                  '<%= store_selected_resource_user_path %>'+'?save=y&res_id='+dom.val()
+        if(check.length == 0) {
-          )
+            $("#choose_homework_notice").text("请先选择一个作业");
-      }else {
+        } else {
-          $.get(
+            var hw_id = $('input[name="checkMenu"]:checked').val();
-                          '<%= store_selected_resource_user_path %>'+'?save=n&res_id='+dom.val()
+            $("#choose_homework_notice").text("");
-          )
+            $.ajax({
-      }
+                type: 'get',
-  }
+                url: '/users/' + user_id + '/choose_user_course?homework='+hw_id,
+                data:{send_id:$('input[name="checkMenu"]:checked').val()}
+            });
+        }
+    }
 </script>
-<div class="homepageRightBanner mb10">
-  <div class="NewsBannerName">作业</div>
-</div>
-<div class="cl"></div>
 
-<% if @is_teacher%>
+<div class="homepageContentContainer">
-    <!-- 老师身份才可以发布作业 -->
+  <div class="homepageContent">
-    <div class="HomeWork mb10" nhname='homework_common_form'>
+    <div class="resource-wrapper mt10">
-      <% homework = HomeworkCommon.new %>
+        <ul class="resource-banner">
-      <% homework.homework_detail_manual = HomeworkDetailManual.new%>
+          <li class="fl resource-switch">
-      <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
+            <a href="<%= user_homework_type_user_path(@user,:is_import => 0) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">公共题库</a>
-          <div id="HomeWorkCon">
+          </li>
-            <%= render :partial => 'users/user_homework_form', :locals => { :homework => homework,:f => f,:edit_mode => false } %>
+          <li class="fl resource-switch">
-          </div>
+            <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 0) %>" id="user_homeworks_choose" class="resource-tab" data-remote="true">我的题库</a>
-      <% end%>
+          </li>
-    </div><!----HomeWork end-->
+          <li class="fl w770 border-bottom h34">&nbsp;</li>
-<% end%>
+          <li class="fr resource-banner-li border-bottom h34">
-
+            <ul class="resourcesSelect">
-<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0,:is_in_course => 0} %>
+              <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+                <ul class="resourcesType">
+                  <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 0) %>" id="homework_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部</a> </li>
+                  <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>" id="homework_type_nor" class="homepagePostTypeAssignment postTypeGrey" data-method="get" data-remote="true">普通作业</a> </li>
+                  <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 2) %>" id="homework_type_pro" class="program-btn postTypeGrey" data-method="get" data-remote="true" style="white-space:nowrap;">编程作业</a> </li>
+                  <li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 3) %>" id="homework_type_gro" class="group-btn resourcesGrey" data-method="get" data-remote="true">分组作业</a> </li>
+                </ul>
+              </li>
+            </ul>
+          </li>
+          <div class="cl"></div>
+        </ul>
+        <div class="cl"></div>
+        <div id="homework_search_input" class="mt10 fl">
+        <%=render :partial=>'homework_repository_search', :locals=>{:type => @type,:is_import => 0,:property => @property} %>
+        </div>
+        <!--<form class="resourcesSearchloadBox mt10">
+          <input type="text" name="serach" placeholder="输入题库关键词进行搜索" class="searchResource" />
+          <a href="javascript:void(0);" class="homepageSearchIcon"></a>
+        </form>-->
+        <div class="cl"></div>
+        <div class="w583 fl mr10 mt10">
+        <ul class="subject-list-banner">
+            <li class="subject-list-name fl hidden"><span style="padding-left:15px;">作业名称</span></li>
+            <li class="subject-list-from fl">来源</li>
+            <li class="subject-list-type fl">类别</li>
+            <li class="subject-list-publisher fl">贡献者</li>
+            <li class="subject-list-count fl">引用数</li>
+            <li class="fl subject-list-date">发布时间</li>
+        </ul>
+        <div id="homework_repository">
+            <%=render :partial => 'homework_repository', :locals => {:homeworks => @homeworks} %>
+        </div>
+    </div>
+    <div id="homework_repository_detail">
+      <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil} %>
+    </div>
+    <div class="cl"></div>
+    <div>
+      <ul class="wlist mt10" id="homework_pository_ref_pages" style="margin-top: 5px;margin-right: 395px">
+        <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+      </ul>
+    </div>
+      <div class="fl resourcesSelectSendButton mr15 inactive-border mt10">
+        <a href="javascript:void(0)" onclick="choose_course('<%=User.current.id %>');" class="sendButtonBlue db inactive-text" data-remote="true">发送至</a>
+      </div>
+      <span class="c_red fl mt15" id="choose_homework_notice"></span>
+    </div>
+    </div>
+  </div>
+</div>

app/views/users/user_homeworks.js.erb

@@ -1,2 +1,3 @@
-$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page,:is_in_course => 0} )%>");
+$("#homework_repository").html('<%= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');
-
+$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");

app/views/users/user_resource.html.erb

@@ -1,4 +1,3 @@
-
 <%= javascript_include_tag 'bootstrap'%>
 <%= stylesheet_link_tag 'project' %>
 <%= stylesheet_link_tag 'leftside' %>
@@ -12,18 +11,22 @@
     function remote_get_resources(user_id,type){
 
     }
+    $(document).ready(function(){
+           $(".resource-switch").click(function(){
+                $(".resource-switch").children().removeClass("resource-tab-active");
+                $(this).children().addClass("resource-tab-active");
+            });
+        });
     function remote_search(){
         $("#resource_search_form").submit();
     }
 
-    function show_upload(){
+    function show_public_resource(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>@user})%>');
+        $("#resource_remote").html('<%= escape_javascript( render :partial => 'user_resource_info' ,:locals => { :tpye => 6}) %>');
-        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>");
+    function show_public_resource(){
-        $('#ajax-modal').parent().css("top","50%").css("left","50%");
+        $("#resource_remote").html('<%= escape_javascript( render :partial => 'user_resource_info' ,:locals => { :tpye => 1}) %>');
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }
 
     function closeModal()
@@ -56,429 +59,51 @@
         }
     }
 </script>
-<div class="homepageRightBanner">
+<div>
-    <div class="NewsBannerName">资源库</div>
+  <ul class="resource-banner">
-    <ul class="resourcesSelect">
+    <li class="fl resource-switch">
-      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <a href="<%= user_resource_user_path(@user, :type => '6', :status => @status) %>" class="resource-tab resource-tab-active" id="public_resource_list" data-remote="true">公共资源</a>
-        <ul class="resourcesType">
+    </li>
-          <li>
+    <li class="fl resource-switch">
-            <%= link_to '全部' ,user_resource_user_path(:id=>@user.id,:type=>1),:remote=>true,:method => 'get',:class=>'resourcesTypeAll resourcesGrey' %>
+      <a href="<%= user_resource_user_path(@user, :type => '1', :status => @status) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
-          </li>
+    </li>
-          <li>
+    <li class="fl w770 border-bottom h34">&nbsp;</li>
-            <%= link_to '课程资源' ,user_resource_user_path(:id=>@user.id,:type=>2),:remote=>true,:method => 'get',:class=>'homepagePostTypeAssignment postTypeGrey' %>
+    <li class="fr resource-banner-li border-bottom h34">
-          </li>
+      <ul class="resourcesSelect">
-          <li>
+        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-            <%= link_to '项目资源' ,user_resource_user_path(:id=>@user.id,:type=>3),:remote=>true,:method => 'get',:class=>'homepagePostTypeQuiz postTypeGrey' %>
+          <ul class="resourcesType">
-          </li>
+            <li>
-          <li>
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 1)%>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
-            <%= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5),:remote=>true,:method => 'get',:class=>'resourcesTypeUser resourcesGrey' %>
+            </li>
-          </li>
+            <li>
-          <li>
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 2) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
-            <%= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
+              <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
-          </li>
+            </li>
-        </ul>
+            <li>
-      </li>
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 3) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
-    </ul>
+              <%#= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), id="resource_type_project", :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
-  </div>
+            </li>
-
+            <li>
-<div class="resources mt10" id="users_setting">
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 5) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
-  <div class="resourcesSearchBanner mt10">
+              <%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
-    <div class="resourcesUploadBox">
+            </li>
-      <a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+            <li>
-    <div id="search_div">
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 4) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
-      <%= render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} %>
+              <%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
-    </div>
+            </li>
-    <div style="
+          </ul>
-    float: left;
+        </li>
-            margin-top: 7px;
+      </ul>
-            font-size: 14px;
+    </li>
-            margin-left: 15px;
+    <div class="cl"></div>
-    "><span style="align:center ;font-size: 14px;color: gray;">为您找到<span id="res_all_count"><%= @atta_count%></span>个资源</span></div>
+  </ul>
-  </div>
-  <div class="resourcesListBanner">
-    <ul class="resourcesListTab">
-      <li class="resourcesListCheckbox fl"> </li>
-      <li class="resourcesListName fl">资源名称</li>
-      <li class="resourcesListSize fl">大小</li>
-      <li class="resourcesListType fl">类别</li>
-      <li class="resourcesListUploader fl">上传者</li>
-      <li class="resourcesListTime fl">上传时间</li>
-    </ul>
-  </div>
-  <form id="resources_list_form">
-    <div id="resources_list">
-
-      <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
-
-    </div>
-    <div class="resourcesListOption">
-      <div class="resourcesCheckAll">
-        <input id="checkboxAll" type="checkbox" value="" onclick="all_select();"  class="resourcesCheckbox" />
-      </div>
-      <a href="javascript:void(0);" class="replyGrey1 mr15" onclick="all_select();">全选</a>
-      <a href="javascript:void(0);" class="replyGrey1" onclick="batch_delete();">删除</a>
-      <div class="resourcesSelectSend">
-        <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
-        <div class="resourcesSelectSendButton" onclick="batch_send();">
-          <a href="javascript:void(0);" class="sendButtonBlue db" data-remote="true" >发送</a>
-        </div>
-      </div>
-    </div>
-  </form>
   <div class="cl"></div>
-  <div>
+  <div id ="resource_remote">
-    <ul class="wlist" id="pages" style="margin-top: 5px;">
+    <%= render :partial => 'user_resource_info' %>
-      <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
-    </ul>
   </div>
 </div>
-
 <div class="cl"></div>
-<!--<div id="upload_box" style="display: none">-->
-<!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
-<!--</div>-->
-<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
-  <!--  data-remote="true" 这个属性会让ajax请求状态标志就在当前按钮的上方显示，就不会滚动浏览器，因而弹出框也会在当前窗口中央展示-->
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send_();" data-remote="true" onfocus="this.blur()" >发送</a></li>
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)delete_file();" onfocus="this.blur()">删除</a></li>
-</ul>
-
-<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 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)%>',
-                    $("#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)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(@user)%>' + '?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)%>' + '?' +  $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#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)%>'+"?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) %>'+  "?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)%>' + '?resource_id=' + id + '&type=' + $('#type').val()
-                });
-            }
-        }else{
-            alert('您无法删除此资源！')
-        }
-    }
-
-</script>
 

app/views/users/user_resource.js.erb

@@ -1,6 +1,15 @@
-$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form', :locals => {:user => @user, :type => @type} ) %>');
-$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' , :locals => { :attachments => @attachments}) %>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
-$("#res_all_count").html(<%= @atta_count%>);
+$("#res_all_count").html(<%= @atta_count %>);
+
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6', :status => @status) %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1', :status => @status) %>');
+
+$("#resource_type_all").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 1) %>');
+$("#resource_type_course").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 2) %>');
+$("#resource_type_project").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 3) %>');
+$("#resource_type_user").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 5) %>');
+$("#resource_type_file").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 4) %>');

app/views/users/user_search_homeworks.js.erb

@@ -1,3 +1,9 @@
+<% if @is_import.to_i == 1 %>
 $("#homework_list_form_show").html('<%= escape_javascript(render :partial => 'users/show_user_homework_form', :locals => {:homeworks => @homeworks})%>');
 $("#homewrok_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>nil}) %>");
+<% else %>
+$("#homework_repository").html('<%= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');
+$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
+<% end %>

config/locales/courses/zh.yml

@@ -15,7 +15,7 @@ zh:
   label_course_new: 新建课程
   label_course_name: 课程名称
 
-  label_homework: 课程作业
+  label_homework: 作业
   label_course_news: 课程通知
   label_course_mail_news_reply: 课程通知回复
   label_main_teacher: 主讲教师

config/locales/zh.yml

@@ -617,7 +617,7 @@ zh:
   label_homework_info: 提交情况  #huang
 
   label_course_news_description: '课程必须是高校正式开设的课程，或是围绕特定主题定期发布课程资料的公共开放课程；<br/>如果您想创建一个协作研究空间，请您前往“我的项目”页面创建项目，谢谢！'
-  label_course_board: 讨论区
+  label_course_board: 问答区
   label_version: 版本
   label_version_new: 新建版本
 
@@ -1734,7 +1734,7 @@ zh:
   label_newbie_faq: '新手指引 & 问答'
   label_hot_project: '热门项目'
   label_borad_project: 项目讨论区
-  label_borad_course: 课程讨论区
+  label_borad_course: 课程问答区
   label_borad_org_subfield: 资源栏目讨论区
   view_borad_course: 课程讨论
   label_memo_create_succ: 发布成功

config/routes.rb

@@ -505,8 +505,10 @@ RedmineApp::Application.routes.draw do
       match 'user_feedback4show', :to => 'users#user_feedback4show', :via => :get
       match 'user_visitorlist', :to => 'users#user_visitorlist', :via => :get
       match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
+      match 'student_homeworks', :to => 'users#student_homeworks', :via => :get
       get 'user_import_homeworks'
       get 'user_search_homeworks'
+      get 'choose_user_course'
       get 'user_import_resource'
       match 'watch_projects', :to => 'users#watch_projects', :via => :get
       #
@@ -535,10 +537,14 @@ RedmineApp::Application.routes.draw do
       match 'user_act_issue_assign_to', :to => 'users#user_act_issue_assign_to', :via => [:get, :post]
       get 'edit_brief_introduction'
       get "user_resource"
+      get "import_resources"
+      get "import_resources_search"
+      post "import_into_container"
       get "resource_search"
       post "user_resource_create"
       post "user_resource_delete"
       get "search_user_course"
+      post "send_homework_to_course"
       post "add_exist_file_to_course"
       post "add_exist_file_to_project"
       post 'add_exist_file_to_org'

db/migrate/20160303103231_add_homework_journal_to_course_contributor_scores.rb

@@ -0,0 +1,5 @@
+class AddHomeworkJournalToCourseContributorScores < ActiveRecord::Migration
+  def change
+    add_column :course_contributor_scores, :homework_journal_num, :integer, :default => 0
+  end
+end

db/migrate/20160304154005_add_news_num_to_course_contributor_scores.rb

@@ -0,0 +1,5 @@
+class AddNewsNumToCourseContributorScores < ActiveRecord::Migration
+  def change
+    add_column :course_contributor_scores, :news_num, :integer , :default => 0
+  end
+end

db/migrate/20160304234903_uodapte_contributor_course.rb

@@ -0,0 +1,51 @@
+class UodapteContributorCourse < ActiveRecord::Migration
+  def up
+    Course.all.each do |course|
+      if course.course_activities.count > 1
+        course.members.each do |s|
+          puts course.id
+          puts course.name
+          puts s.user_id
+          # board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2
+          # 发帖数
+          board_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is null;").count
+          # 回帖数
+          message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is not null").count * 1
+          # 新闻回复
+          common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.user_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1
+          # 通知
+          common_count = News.find_by_sql("select n.* from news n where n.author_id = #{s.user_id} and n.course_id = #{course.id} ").count * 1
+          # attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5
+          # 附件数
+          attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.user_id} and container_type ='Course'").count
+          # 课程留言数
+          journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.user_id, course.id, "Course").count * 1
+          # 作业留言
+          journal_homework_count = JournalsForMessage.find_by_sql("SELECT jfm.* FROM `journals_for_messages` jfm, homework_commons hc where hc.id = jfm.jour_id and hc.course_id =#{course.id} and jfm.user_id =#{s.user_id} and jfm.jour_type ='HomeworkCommon';").count * 1
+          # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1
+          # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1
+          total =   board_count + message_reply_count + common_reply_count + attachment_count + journal_count
+          course_contributor = CourseContributorScore.where("course_id =? and user_id =?", course.id, s.user_id).first
+          if course_contributor.nil?
+            CourseContributorScore.create(:course_id => course.id, :user_id => s.user_id, :message_num => board_count, :message_reply_num => message_reply_count,
+                                          :news_reply_num => common_reply_count, :news_num => common_count, :resource_num => attachment_count, :journal_num => journal_count,
+                                          :homework_journal_num => journal_homework_count, :journal_reply_num => 0, :total_score => total)
+          else
+            course_contributor.message_num = board_count
+            course_contributor.message_reply_num = message_reply_count
+            course_contributor.news_reply_num = common_reply_count
+            course_contributor.news_num = common_count
+            course_contributor.resource_num = attachment_count
+            course_contributor.journal_num = journal_count
+            course_contributor.homework_journal_num = journal_homework_count
+            course_contributor.save
+          end
+
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

public/javascripts/homework.js

@@ -127,7 +127,15 @@ $(function(){
             $("a.CloseBtn").on('click', function(){
                 $("#BluePopupBox" ).dialog("close");
             });
-            $('#textarea_input_test').focus();
+            var inputs = document.getElementsByName("program[input][]");
+            var outputs = document.getElementsByName("program[output][]");
+            if (inputs.length == outputs.length) {
+                for (var i=0; i<inputs.length; i++) {
+                    autoTextarea2(inputs[i], outputs[i]);
+                    autoTextarea2(outputs[i], inputs[i]);
+                }
+            }
+            $(inputs[0]).focus();
         } else if($("input[name=homework_type]").val() == "2") {
             $("#NoticePopupBox" ).dialog("close");
             $("input[name=homework_type]").val(1);
@@ -151,7 +159,7 @@ $(function(){
             modal: true,
             autoOpen: false,
             dialogClass: 'BluePopupBox',
-            minWidth: 753
+            minWidth: 771
     });
     $('#BluePopupBox').parent().resizable("disable");
     $('#BluePopupBox').parent().removeClass("ui-state-disabled");
@@ -168,7 +176,7 @@ $(function(){
             $("#cancel_switch").on('click', function(){
                 $("#NoticePopupBox" ).dialog("close");
             });
-            $("#switch_homework_type_notice").text("您的作业类型将改为“分组作业”，并且您的编程设置将被清除。请问是否继续？");
+            $("#switch_homework_type_notice").text("您的作业类型将改为“编程作业”，并且您的分组设置将被清除。请问是否继续？");
         }
         else {
             $("#BluePopupBox").dialog("open");
@@ -176,7 +184,15 @@ $(function(){
             $("a.CloseBtn").on('click', function(){
                 $("#BluePopupBox" ).dialog("close");
             });
-            $('#textarea_input_test').focus();
+            var inputs = document.getElementsByName("program[input][]");
+            var outputs = document.getElementsByName("program[output][]");
+            if (inputs.length == outputs.length) {
+                for (var i=0; i<inputs.length; i++) {
+                    autoTextarea2(inputs[i], outputs[i]);
+                    autoTextarea2(outputs[i], inputs[i]);
+                }
+            }
+            $(inputs[0]).focus();
         }
     });
 
@@ -243,6 +259,10 @@ $(function(){
         $(this).parent('.mt10').after(html);
         var inputs = document.getElementsByName("program[input][]");
         var outputs = document.getElementsByName("program[output][]");
+        var inputs_labels = document.getElementsByName("inputs_label");
+        for(var j= 0; j<inputs_labels.length; j++){
+            $(inputs_labels[j]).html(j + 1 + "&nbsp;&nbsp;" );
+        }
         if (inputs.length == outputs.length) {
             for (var i=0; i<inputs.length; i++) {
                 autoTextarea2(inputs[i], outputs[i]);
@@ -276,7 +296,7 @@ $(function(){
             $("#cancel_switch").on('click', function(){
                 $("#NoticePopupBox" ).dialog("close");
             });
-            $("#switch_homework_type_notice").text("您的作业类型将改为“编程作业”，并且您的分组设置将被清除。请问是否继续？");
+            $("#switch_homework_type_notice").text("您的作业类型将改为“分组作业”，并且您的编程设置将被清除。请问是否继续？");
         }
         else {
             $("#GroupPopupBox").dialog("open");

public/stylesheets/courses.css

@@ -1263,3 +1263,30 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .mh18 {max-height: 18px;}
 .relatePWrap{max-height: 210px;overflow:hidden;}/*160114课程推荐*/
 .courseR {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;}
+
+/*导入题库样式*/
+.popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
+.subjectList {width:585px;}
+.subjectDetail {width:385px;}
+a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
+a.chooseActive {background-color:#269ac9; color:#ffffff;}
+.subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subjectBanner li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectName {width:270px; padding-left:10px; padding-right:10px;}
+.subjectPublisher {width:80px; text-align:center;}
+.subjectDate {width:80px; text-align:center;}
+.subjectRow {width:585px; height:40px; color:#7a7a7a; font-size:12px;}
+.subjectRow li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
+.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
+.subjectIntro {color:#585858; line-height:18px; font-size:12px;}
+.subjectContent {color:#888888; line-height:18px; font-size:12px;}
+.popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
+.subjectType {width:70px; text-align:center;}
+.subjectCount {width:65px; text-align:center;}
+a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: normal;}
+.contributor_course_innor{font-size: 12px;color: #888;padding-left: 36px;}
+.hero_course_innor{font-size: 12px;color: #888;padding-left:77px;}
+.contributor_course_calculate{padding-left: 54px; font-size: 12px;color: #888}
+.color_888{color: #888}

public/stylesheets/new_user.css

@@ -420,7 +420,7 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
 .resourcesSelectSend {float:right;}
 /*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/
-.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #269ac9; border-radius:5px; float:right;}
+.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; }
 a.sendButtonBlue {color:#269ac9;}
 a.sendButtonBlue:hover {color:#ffffff;}
 .resourcesSelectSendButton:hover {background-color:#297fb8;}
@@ -1438,27 +1438,44 @@ span.at a{color:#269ac9;text-decoration: none;}
 .proInfoP{color:#000000 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 
 /*导入题库样式*/
-.popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
+.popup-wrapper {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
-.subjectList {width:585px;}
+.subject-list {width:585px;}
-.subjectDetail {width:385px;}
+.subject-detail {width:385px;}
-a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
+a.subject-choose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
-a.chooseActive {background-color:#269ac9; color:#ffffff;}
+a.choose-active {background-color:#269ac9; color:#ffffff;}
-.subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subject-pop-banner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
-.subjectBanner li {height:40px; line-height:40px; vertical-align:middle;}
+.subject-pop-banner li {height:40px; line-height:40px; vertical-align:middle;}
-.subjectName {width:270px; padding-left:10px; padding-right:10px;}
+.subject-pop-name {width:200px; padding-left:10px; padding-right:10px;}
-.subjectPublisher {width:80px; text-align:center;}
+.subject-pop-publisher {width:80px; text-align:center;}
-.subjectDate {width:80px; text-align:center;}
+.subject-pop-date {width:75px; text-align:center;}
-.subjectType {width:70px; text-align:center;}
+.subject-pop-row {width:585px; height:30px; color:#7a7a7a; font-size:12px;}
-.subjectCount {width:65px; text-align:center;}
+.subject-pop-row li {height:30px; line-height:30px; vertical-align:middle;}
-.subjectRow {width:585px; height:30px; color:#7a7a7a; font-size:12px;}
+.subject-pop-search {border:1px solid #dddddd; height:32px; width:250px;}
-.subjectRow li {height:30px; line-height:30px; vertical-align:middle;}
+.subject-pop-info {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
-.subjectSearch {border:1px solid #dddddd; height:32px; width:250px;outline: none;}
+.subject-pop-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:475px; overflow-y:auto;}
-.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subject-pop-intro {color:#585858; line-height:18px; font-size:12px;}
-.subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:470px; overflow-y:auto;}
+.subject-pop-content {color:#888888; line-height:18px; font-size:12px;}
-.subjectIntro {color:#585858; line-height:18px; font-size:12px;}
+.popup-close {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
-.subjectContent {color:#888888; line-height:18px; font-size:12px;}
+.subject-pop-type {width:50px; text-align:center;}
-.popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
+.subject-pop-count {width:60px; text-align:center;}
+.subject-pop-from {width:100px; text-align:center;}
 .subjectContent p,.subjectContent div,.subjectContent em, .subjectContent span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important; color:#888888 !important; font-size:12px !important;}
 
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
+
+/*20160301新题库样式*/
+.subject-list-banner {width:585px; height:34px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subject-list-banner li {height:34px; line-height:34px; vertical-align:middle;}
+.subject-list-name {width:200px; padding-left:10px; padding-right:10px;}
+.subject-list-publisher {width:80px; text-align:center;}
+.subject-list-date {width:70px; text-align:center;}
+.subject-list-row {width:585px; height:30px; color:#7a7a7a; font-size:12px;}
+.subject-list-row li {height:30px; line-height:30px; vertical-align:middle;}
+.subject-list-search {border:1px solid #dddddd; height:32px; width:250px;}
+.subject-list-info {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subject-list-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
+.subject-content-wrapper {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:430px; overflow-y:auto;}
+.subject-list-type {width:50px; text-align:center;}
+.subject-list-count {width:60px; text-align:center;}
+.subject-list-from {width:105px; text-align:center;}

public/stylesheets/org.css

@@ -118,3 +118,32 @@ div.flash {margin-top :0px !important}
 .lh18 { line-height: 18px;}
 
 a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
+/*导入题库样式*/
+.popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
+.subjectList {width:585px;}
+.subjectDetail {width:385px;}
+a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
+a.chooseActive {background-color:#269ac9; color:#ffffff;}
+.subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subjectBanner li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectName {width:270px; padding-left:10px; padding-right:10px;}
+.subjectPublisher {width:80px; text-align:center;}
+.subjectDate {width:80px; text-align:center;}
+.subjectRow {width:585px; height:40px; color:#7a7a7a; font-size:12px;}
+.subjectRow li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
+.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
+.subjectIntro {color:#585858; line-height:18px; font-size:12px;}
+.subjectContent {color:#888888; line-height:18px; font-size:12px;}
+.popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
+.subjectType {width:70px; text-align:center;}
+.subjectCount {width:65px; text-align:center;}
+a.blue-btn {
+    padding: 4px 7px;
+    color: #FFF;
+    border: none;
+    background-color: #269ac9;
+    cursor: pointer;
+    text-align: center;
+}

public/stylesheets/polls.css

@@ -152,4 +152,6 @@ a:hover.btn_pu{ background:#3cb761;}
 .polls_alert_upload_box{ width:120px; margin:15px auto;}
 .polls_alert_box_p{ font-size:14px; padding-left: 45px;padding-top: 10px;}
 
+.w56 { width: 56px;}
+